[Commits] [SCM] claws branch, master, updated. 4.1.1-119-g6b848994b

paul at claws-mail.org paul at claws-mail.org
Mon Nov 20 11:07:46 UTC 2023


The branch, master has been updated
       via  6b848994b8fa26ab5f84bc75bfe1a60b9bad1125 (commit)
      from  10e6aa1255f706bff2bb2bf8b87e9e26b9c67d73 (commit)

Summary of changes:
 po/ca.po    | 3593 ++++++++++++++++++++++++++-----------------------------
 po/cs.po    | 3555 +++++++++++++++++++++++++-----------------------------
 po/pl.po    | 3838 ++++++++++++++++++++++++++++-------------------------------
 po/pt_BR.po | 3475 +++++++++++++++++++++++++----------------------------
 po/pt_PT.po | 1281 ++++++++++----------
 po/ru.po    | 3430 +++++++++++++++++++++++++---------------------------
 po/sk.po    | 3593 +++++++++++++++++++++++++------------------------------
 po/sv.po    | 3427 +++++++++++++++++++++++++---------------------------
 po/tr.po    | 3562 ++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 3561 +++++++++++++++++++++++++-----------------------------
 10 files changed, 15626 insertions(+), 17689 deletions(-)


- Log -----------------------------------------------------------------
commit 6b848994b8fa26ab5f84bc75bfe1a60b9bad1125
Author: Paul <paul at claws-mail.org>
Date:   Mon Nov 20 11:07:36 2023 +0000

    updated translations by David Medina, David Vachulka, Łukasz Wojniłowicz, Frederico Goncalves Guimaraes, Hugo Carvalho, Mikhail Kurinnoi, Slavko, Andreas Rönnquist, Numan Demirdöğen, and Mark Chang

diff --git a/po/ca.po b/po/ca.po
index 656b9fbf9..79e1a44b2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 # Miquel Oliete i Baliarda <ktalanet at yahoo.es>, 2006, 2010.
 # David Medina <opensusecatala at gmail.com>, revisió i correcció, febrer de 2016; actualització per a la versió 3.14.0, agost de 2016.
 # David Medina <opensusecatala at gmail.com>, actualització per a la versió 3.16, desembre de 2017.
-# David Medina <opensusecatala at gmail.com>, actualització per a la versió nova, agost i desembre de 2018, febrer i setembre de 2020, juliol de 2021, abril i octubre de 2022.
+# David Medina <opensusecatala at gmail.com>, actualització per a la versió nova, agost i desembre de 2018, febrer i setembre de 2020, juliol de 2021, abril i octubre de 2022, novembre de 2023.
 # Very special THANKS to the translator team of Softcatalà for:
 #  https://www.softcatala.org/recull.html
 #
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-11 10:26+0100\n"
-"PO-Revision-Date: 2022-10-13 11:07+0200\n"
+"POT-Creation-Date: 2023-11-13 16:14+0000\n"
+"PO-Revision-Date: 2023-11-14 10:45+0100\n"
 "Last-Translator: David Medina <opensusecatala at gmail.com>\n"
 "Language-Team: David Medina <opensusecatala at gmail.com>\n"
 "Language: ca\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 3.4.1\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-SearchPath-0: .\n"
 
@@ -62,8 +62,8 @@ msgstr "_Nou"
 msgid "Create a new account"
 msgstr "Crea un compte nou"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -75,8 +75,8 @@ msgstr "Editeu les preferències del compte seleccionat"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -92,8 +92,8 @@ msgstr "Suprim_eix"
 msgid "Delete the selected account from the list"
 msgstr "Suprimeix el compte seleccionat de la llista"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copia"
@@ -134,26 +134,26 @@ msgstr "Desplaça el compte seleccionat amunt"
 msgid " _Set as default account "
 msgstr " E_stableix com a compte predeterminat."
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "Tan_ca"
@@ -167,53 +167,52 @@ msgstr "Els comptes amb carpetes remotes no es poden copiar."
 msgid "Copy of %s"
 msgstr "Còpia de %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Realment voleu suprimir el compte \"%s\"?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Sense títol)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Suprimeix el compte"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -222,88 +221,88 @@ msgstr "Suprimeix el compte"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "S_uprimeix"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "\"Rep missatges\" recupera els missatges des dels comptes seleccionats"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Servidor"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "No s'ha pogut obtenir el fitxer de missatge %d"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "No s'ha pogut obtenir la secció del missatge."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "No es pot obtenir la secció del missatge multisecció: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -312,11 +311,11 @@ msgstr ""
 "L'acció seleccionada no es pot usar a la finestra d'escriptura\n"
 "perquè conté %%f, %%F, %%as o %%p."
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "No hi ha cap acció de filtratge establerta."
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -325,7 +324,7 @@ msgstr ""
 "Accions de filtratge no vàlides:\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -336,44 +335,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Completat"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Executant: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Acabat: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Entrada i sortida de l'acció"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "_Executa"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "Atu_ra"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -384,11 +383,11 @@ msgstr ""
 "(\"%%h\" es substituirà per l'argument)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Argument amagat de l'usuari per a l'acció"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -399,26 +398,26 @@ msgstr ""
 "(\"%%u\" es substituirà per l'argument)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Argument d'usuari per a l'acció"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
 "No es pot copiar una carpeta a si mateixa o a una de les seves subcarpetes."
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "No es pot copiar una llibreta d'adreces a si mateixa."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "No es pot desplaçar una carpeta a si mateixa o a una de les seves "
 "subcarpetes."
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Grup"
@@ -491,40 +490,40 @@ msgstr ""
 "Realment voleu reemplaçar tots els noms d'atribut\n"
 "pels valors per defecte?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_No"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Sí"
 
@@ -563,31 +562,30 @@ msgstr "_Afegeix"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "D'ac_ord"
@@ -619,7 +617,7 @@ msgstr ""
 "El Claws Mail cercarà ara adreces de correu electrònic duplicades a la "
 "llibreta d'adreces."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Tro_ba"
@@ -633,7 +631,7 @@ msgid "Duplicate email addresses"
 msgstr "Adreces de correu duplicades"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adreça"
@@ -642,11 +640,11 @@ msgstr "Adreça"
 msgid "Address book path"
 msgstr "Camí de la llibreta d'adreces"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "Suprimeix les adreces"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "Voleu suprimir realment aquestes adreces?"
 
@@ -654,7 +652,7 @@ msgstr "Voleu suprimir realment aquestes adreces?"
 msgid "Delete address"
 msgstr "Suprimeix l'adreça"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Aquestes dades d'adreça són només de lectura i no es poden suprimir."
 
@@ -666,7 +664,7 @@ msgstr "Afegeix a la llibreta d'adreces"
 msgid "Contact"
 msgstr "Contacte"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Observacions"
@@ -675,7 +673,7 @@ msgstr "Observacions"
 msgid "Select Address Book Folder"
 msgstr "Seleccioneu la carpeta de la llibreta d'adreces"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "Afegeix adreces"
 
@@ -683,50 +681,50 @@ msgstr "Afegeix adreces"
 msgid "Can't add the specified address"
 msgstr "No s'ha pogut afegir l'adreça especificada"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "Adreça de correu"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "Lli_breta"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "E_ines"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Lli_breta nova"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "_Carpeta nova"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "_vCard nou"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "_JPilot nou"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "_Servidor LDAP nou"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "_Edita la llibreta"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "S_uprimeix la llibreta"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -734,189 +732,189 @@ msgstr "S_uprimeix la llibreta"
 msgid "_Save"
 msgstr "De_sa"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "_Selecciona-ho tot"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "T_alla"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Enganxa"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "_Adreça nova"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "_Grup nou"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "_Missatge per a"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "Fusio_na"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "Importa un fitxer _LDIF..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "Importa un fitxer M_utt..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "Importa un fitxer _Pine..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "Exporta _HTML..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "Exporta LDI_F..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Busca duplicats..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Edita els atributs personalitzats..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "_Navega per l'entrada"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Correcte"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Arguments incorrectes"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "No s'ha especificat el fitxer."
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Error obrint el fitxer"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Error llegint el fitxer"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "S'ha trobat el final del fitxer."
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Error d'assignació de memòria"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Format de fitxer erroni"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Error escrivint al fitxer"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Error obrint el directori"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "No s'ha especificat cap camí."
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "Error connectant al servidor LDAP"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "Error iniciant LDAP"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "Error de vincle amb el servidor LDAP"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "Error buscant a la base de dades LDAP"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "S'ha esgotat el temps d'espera fent l'operació LDAP."
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "Error als criteris de cerca d'LDAP."
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "No s'han trobat entrades d'LDAP per al criteri de cerca."
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "S'ha sol·licitat concloure la cerca d'LDAP."
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "Error iniciant la connexió STARTTLS"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta el nom distingit (dn)."
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Falta informació necessària."
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "Existeix un altre contacte amb aquesta clau."
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "Cal una autenticació més forta."
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Fonts"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Llibreta d'adreces"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Cerca"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Suprimeix el grup"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -924,27 +922,27 @@ msgstr ""
 "Realment voleu suprimir el/s grup/s?\n"
 "Les adreces que hi hagi es perdran."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr ""
 "No es pot enganxar. La llibreta d'adreces de destinació és només de lectura."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "No es pot enganxar dins d'un grup d'adreces."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Voleu suprimir els resultats de la consulta i les adreces a \"%s\" ?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -953,20 +951,20 @@ msgstr ""
 "Voleu suprimir \"%s\"? Si només se suprimeix la carpeta, les adreces que "
 "conté es desplaçaran a la carpeta mare."
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Suprimeix la carpeta"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Suprimeix només la _carpeta"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Suprimeix la carpeta i les _adreces"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -975,7 +973,7 @@ msgstr ""
 "Voleu suprimir \"%s\"?\n"
 "Les adreces que conté no es perdran."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -984,28 +982,28 @@ msgstr ""
 "Voleu suprimir \"%s\"?\n"
 "Les adreces que conté es perdran."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Cerca \"%s\""
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Contactes nous"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Usuari nou, no s'ha pogut desar el fitxer d'índex."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Usuari nou, no s'han pogut desar els fitxers de la llibreta d'adreces."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "La llibreta d'adreces antiga s'ha convertit correctament."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -1013,7 +1011,7 @@ msgstr ""
 "Llibreta d'adreces convertida.\n"
 "No s'ha pogut desar el nou fitxer d'índex."
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1021,7 +1019,7 @@ msgstr ""
 "No s'ha pogut convertir la llibreta d'adreces,\n"
 "però s'han creat fitxers buits de la llibreta d'adreces nova."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1029,7 +1027,7 @@ msgstr ""
 "No s'ha pogut convertir la llibreta d'adreces.\n"
 "No s'ha pogut desar el nou fitxer d'índex d'adreces."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1037,52 +1035,52 @@ msgstr ""
 "No s'ha pogut convertir la llibreta d'adreces\n"
 "i no s'han pogut crear els fitxers de la nova."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Error de conversió de la llibreta d'adreces"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Error de la llibreta d'adreces"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "No s'ha pogut llegir l'índex d'adreces."
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Ocupat cercant..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interficie"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Llibretes d'adreces"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "Servidors LDAP"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 
@@ -1167,42 +1165,42 @@ msgstr "Recopila les adreces de correu dels missatges seleccionats"
 msgid "Collect email addresses from folder"
 msgstr "Recopila les adreces de correu de la carpeta"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Adreces comunes"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Adreces personals"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Adreça comuna"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Adreça personal"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Actualització d'adreces"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "Actualització fallida. Canvis no escrits al directori."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Anunci"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Avís"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Error"
@@ -1323,7 +1321,7 @@ msgstr ""
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "La vostra versió del Claws Mail és massa antiga per al connector."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "Negociació TLS fallida\n"
 
@@ -1343,7 +1341,7 @@ msgstr "resposta SMTP incorrecta\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hi ha hagut un error a la sessió SMTP\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "hi ha hagut un error d'autenticació\n"
 
@@ -1352,7 +1350,7 @@ msgstr "hi ha hagut un error d'autenticació\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "El missatge és massa gros (Mida màxima: %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "no s'ha pogut iniciar la sessió STARTTLS\n"
 
@@ -1493,212 +1491,212 @@ msgstr "%d.%02d MiB"
 msgid "%.2fGiB"
 msgstr "%.2f GiB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Dilluns"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Dijous"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Divendres"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Gener"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Febrer"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Març"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maig"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Juny"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Juliol"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agost"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembre"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Octubre"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembre"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Desembre"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "dg."
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "dl."
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "dt."
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "dc."
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "dj."
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "dv."
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "ds."
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "gen."
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "febr."
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "març"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "abr."
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "maig"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "juny"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul."
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "ag."
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "set."
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "nov."
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "des."
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a. m."
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p. m. "
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a. m."
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p. m."
@@ -1715,372 +1713,372 @@ msgstr ""
 "\n"
 "S'han inhabilitat les opcions de signar i encriptar per a aquest missatge."
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "_Afegeix..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Missatge"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "_Ortografia"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "_Opcions"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "_Envia"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Envia'_l després"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "_Adjunta-hi un fitxer"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "_Insereix-hi un fitxer"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "Insereix-hi una si_gnatura"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "_Reemplaça'n la signatura"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "Im_primeix"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "Des_fés"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Refés"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Talla"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "Enganxat e_special"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Com a _citació"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "A_justa"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "Desaj_ustat"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Seleccion_a-ho tot"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "A_vançat"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "Ves al caràcter anterior"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "Ves al caràcter següent"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "Ves a la paraula anterior"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "Ves a la paraula següent"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "Ves a l'inici de la línia"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "Ves al final de la línia"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "Ves a la línia anterior"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "Ves a la línia següent"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Suprimeix el caràcter anterior"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Suprimeix el caràcter següent"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Suprimeix la paraula anterior"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Suprimeix la paraula següent"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Suprimeix la línia"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Suprimeix fins al final de la línia"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "A_justa el paràgraf actual"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Ajusta totes les _línies llargues"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "Edita amb un editor e_xtern"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "_Comprova-ho tot o la selecció"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "_Ressalta tots els errors ortogràfics"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "Comprova els errors d'ortografia cap _enrere"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "Avança fins a la  _falta d'ortografia següent"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "_Mode de resposta"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "_Sistema de privacitat"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "_Prioritat"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Codificació d_e caràcters"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Europeu occidental"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Bàltic"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Àrab"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonès"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Xinès"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Coreà"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tailandès"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "Llibret_a d'adreces"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Accio_ns"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "Qu_ant a"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "Ajusta aut_omàticament"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Sa_gnat automàtic"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "Si_gna"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "_Encripta"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "Demana una confirmació de _recepció"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "Suprimei_x les referències"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Mostra el gestor de _regles"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Tothom"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Remitent"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "_Llista de correu"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "Més _alta"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "A_lta"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "Bai_xa"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "Més _baixa"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automàtic"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centreeuropeu (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Error de format al \"Des de\" del missatge nou."
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Error de format a l'assumpte del missatge nou."
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Missatge nou\" té un error a la línia %d."
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "No es pot respondre. Probablement el missatge original no existeix."
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "El camp \"Des de\" de la plantilla \"Respon\" conté una adreça no vàlida."
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Respon\" té un error a la línia %d."
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -2088,56 +2086,56 @@ msgstr ""
 "El camp \"Des de\" de la plantilla \"Reenvia\" conté una adreça de correu no "
 "vàlida."
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Reenvia\" conté un error a la línia %d."
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Fw: missatges múltiples"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "El cos de la plantilla \"Redirecciona\" conté un error a la línia %d."
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "A/c:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "C/o:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Respon a:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Grups de notícies:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Envia a:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Com a resposta a:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Per a:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "No s'ha pogut adjuntar el fitxer (conversió de joc de caràcters fallida)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2152,16 +2150,16 @@ msgstr[1] ""
 "S'han adjuntat els fitxers següents:\n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "El símbol de cometes de la plantilla és erroni."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "No s'ha pogut obtenir la mida del fitxer \"%s\"."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2170,57 +2168,57 @@ msgstr ""
 "Esteu a punt d'inserir un fitxer de %s al cos del missatge. Segur que ho "
 "voleu fer?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "N'esteu segur?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "El fitxer %s és buit."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Fitxer buit"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "_Adjunta-ho tanmateix"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "No es pot llegir %s."
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "Missatge: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editat]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Escriu missatge%s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sense assumpte] - Escriu missatge%s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Escriu un missatge"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2228,63 +2226,63 @@ msgstr ""
 "No heu especificat cap compte per a l'enviament.\n"
 "Seleccioneu algun compte abans d'enviar."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "L'únic destinatari és l'adreça per defecte \"%s\". Voleu enviar-lo tanmateix?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Envia"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Envia"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "No heu especificat el destinatari."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "L'assumpte és buit. %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Voleu enviar-lo tanmateix?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Voleu posar-lo a la cua tanmateix?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "Envia'l després"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "A la _cua"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviant-ho a %d destinataris. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "No s'ha pogut posar el missatge a la cua."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2295,7 +2293,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2306,7 +2304,7 @@ msgstr ""
 "\n"
 "Signatura fallida: %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2317,7 +2315,7 @@ msgstr ""
 "\n"
 "Ha fallat l'encriptació: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2327,7 +2325,7 @@ msgstr ""
 "\n"
 "Conversió de joc de caràcters fallida."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2337,7 +2335,7 @@ msgstr ""
 "\n"
 "No s'ha pogut obtenir la clau d'encriptació del receptor."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2346,17 +2344,17 @@ msgstr ""
 "Useu \"Envia els missatges de la cua\" de la finestra principal per tornar-"
 "ho a intentar."
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Useu \"Envia els missatges de la cua\" de la finestra principal per tornar-"
-"ho a intentar."
+"Podeu provar de tornar a clicar a Enviar o posar el missatge a la cua amb "
+"Envia'l després."
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2367,7 +2365,7 @@ msgstr ""
 "al joc de caràcters %s especificat.\n"
 "Voleu enviar-lo com a %s?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2380,101 +2378,105 @@ msgstr ""
 "\n"
 "Voleu enviar-lo tanmateix?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Avís d'encriptació"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "C_ontinua"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "No hi ha cap compte disponible per enviar correus!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 "El compte seleccionat no és de tipus NNTP: la publicació no és possible."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'adjunt %s ja no existeix. Voleu ignorar-lo?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Cancel·la l'esborrany"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Cancel·la l'enviament"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Ignora l'adjunt"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Secció %s original"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Afegeix a la lli_breta d'adreces"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Suprimeix el contingut de l'entrada"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Useu <tab> per a l'autocompleció des de la llibreta d'adreces"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Mida"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "Desa el missatge a "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "Na_vega"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "Seleccioneu una carpeta per desar-hi el missatge"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Ca_pçalera"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Adjunts"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "Alt_res"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Ass_umpte:"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2483,19 +2485,19 @@ msgstr ""
 "No s'ha pogut iniciar el corrector ortogràfic.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "_De:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Compte a usar per a aquest correu electrònic"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Adreça del remitent per usar"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2504,50 +2506,50 @@ msgstr ""
 "El sistema de privacitat \"%s\" no s'ha pogut carregar. No podreu signar o "
 "encriptar aquest missatge."
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "_Cap"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "El cos de la plantilla té un error a la línia %d."
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Error de format de la plantilla \"%s\"."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Tipus MIME no vàlid."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "El fitxer no existeix o és buit."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Codificació"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Camí"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2556,13 +2558,13 @@ msgstr ""
 "No s'ha pogut escriure el cos al fitxer:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr ""
 "La comunicació de sòcol amb un editor extern no està disponible a Windows."
 
-#: src/compose.c:9710
+#: src/compose.c:9702
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2573,21 +2575,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "L'editor extern s'ha aturat amb un error: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "Id del procés: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "Id. del procés: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2598,19 +2595,19 @@ msgstr ""
 "Voleu forçar l'acabament del procés?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "El Claws Mails necessita accés a la xarxa per enviar aquest correu."
 
-#: src/compose.c:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "No s'ha pogut desar l'esborrany."
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "No s'ha pogut desar l'esborrany"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2618,24 +2615,24 @@ msgstr ""
 "No s'ha pogut desar l'esborrany.\n"
 "Voleu cancel·lar la sortida o descartar aquest missatge?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "_Cancel·la la sortida"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "_Descarta el missatge"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "Selecciona un fitxer"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir el ftxer \"%s\"."
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2644,59 +2641,50 @@ msgstr ""
 "El fitxer \"%s\" contenia caràcters no vàlids per a\n"
 "la codificació actual, la inserció pot ser incorrecta."
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "Descarta el missatge"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Descarta"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "De_sa a la carpeta d'esborranys"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Desa els canvis"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Aquest missatge ha estat modificat. Voleu desar-ne els últims canvis?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "No ho _desis"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voleu aplicar la plantilla \"%s\"?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "Aplica la plantilla"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"La mida del text enganxat supera el límit (%dKiB) per enganxar.\n"
-"Adjunteu-lo com a fitxer."
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2711,20 +2699,20 @@ msgstr[1] ""
 "Voleu inserir el contingut dels %d fitxers dins el cos del missatge o "
 "adjuntar-los al correu?"
 
-#: src/compose.c:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "Inserir o adjuntar?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "_Adjunta-ho"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de format de la cita a la línia %d."
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2943,7 +2931,7 @@ msgid " Check File "
 msgstr " Comprova el fitxer "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Fitxer"
 
@@ -2988,12 +2976,12 @@ msgid "Input the new name of folder:"
 msgstr "Nom nou de la carpeta:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Carpeta nova"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Nom de la carpeta nova:"
 
@@ -3021,13 +3009,13 @@ msgstr "Afegeix una nova entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Edita l'LDAP - Seleccioneu la base de cerca"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Nom d'amfitrió"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3089,7 +3077,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3219,11 +3207,11 @@ msgstr "Coincideix amb noms que continguin el terme cercat"
 
 #: src/editldap.c:636
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using \"begins-"
+"with\" or \"contains\" search term. Check this option to perform a "
+"\"contains\" search; this type of search usually takes longer to complete. "
+"Note that for performance reasons, address completion uses \"begins-with\" "
+"for all searches against other address interfaces."
 msgstr ""
 "Les cerques de noms i adreces es poden fer usant o bé \"comença per\" o bé "
 "\"conté \" i el terme a cercar. Marqueu aquesta opció per fer una cerca "
@@ -3255,8 +3243,8 @@ msgstr "Contrasenya de vincle"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "La contrasenya per usar en connectar com a usuari \"Vincle DN\"."
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Mostra la contrasenya"
@@ -3280,11 +3268,11 @@ msgstr ""
 "El número mínim d'entrades que s'haurien de retornar als resultats de la "
 "cerca."
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Bàsiques"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Estesa"
 
@@ -3302,8 +3290,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr " Modifica les etiquetes"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -3432,15 +3420,15 @@ msgstr "Fitxer HTML de sortida"
 msgid "B_rowse"
 msgstr "Nave_ga"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Full d'estils"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Cap"
 
@@ -3689,7 +3677,7 @@ msgstr "Exporta la llibreta d'adreces a un fitxer LDIF"
 msgid "Distinguished Name"
 msgstr "Nom distingit"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "Exporta a fitxer de bústia"
 
@@ -3873,8 +3861,8 @@ msgstr "la regla està subjecta al compte; no coincideix amb el compte actual\n"
 #: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account "
+"[id=%d, name='%s']\n"
 msgstr ""
 "la regla està subjecta al compte [id=%d, name='%s']; no coincideix amb el "
 "compte actual [id=%d, name='%s']\n"
@@ -3967,61 +3955,61 @@ msgstr ""
 "filtrant missatge (%s%s%s)\n"
 "%sfitxer del missatge: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Enviats"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Cua"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Paperera"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Esborranys"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processant (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiant %s a %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movent %s a %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualitzant memòria cau per a %s ..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "Processant missatges..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronitzant %s per usar sense connexió...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Un nom de carpeta no pot començar o acabar amb un punt."
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "Un nom de carpeta no pot acabar amb un espai."
 
@@ -4030,110 +4018,114 @@ msgid "Select folder"
 msgstr "Selecciona una carpeta"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
 #: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
-msgstr "Hereta les propietats i les regles de processament de la carpeta mare"
+msgstr "Hereta les propietats i les regles de processament de la carpeta mare."
 
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No es pot incloure \"%c\" al nom de la carpeta."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta '%s' ja existeix."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No s'ha pogut crear la carpeta \"%s\"."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "Marc_a-ho tot com a llegit"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Marca tots els _no llegits"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Marca tots els llegits recursi_vament"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Marca tots els no llegits recursi_vament"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
-msgstr "Exec_uta regles de processament"
+msgstr "Exec_uta les regles de processament"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Cerca a la carpeta..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Obre en iniciar"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "Pr_ocessament..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "Buida la _paperera..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Envia de la _cua..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Estableix les columnes visibles"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Nous"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Sense llegir"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Establint informació de carpeta..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Marca-ho tot com a llegit"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4141,16 +4133,16 @@ msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta i les seves "
 "subcarpetes com a llegits?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Realment voleu marcar tots els correus d'aquesta carpeta com a llegits?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Marca'ls tots com a no llegits"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
@@ -4158,96 +4150,96 @@ msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta i de les "
 "subcarpetes com a no llegits?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta com a no llegits?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "S'explora la carpeta %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Explorant la carpeta %s..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Reconstrueix l'arbre de carpetes"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Refer l'arbre de directoris suprimirà les memòries cau locals. Voleu "
 "continuar?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruint l'arbre de carpetes..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Explorant l'arbre de carpetes..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "No s'ha pogut explorar la carpeta %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Comprovant si hi ha missatges nous a totes les carpetes..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Tancant la carpeta %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Obrint la carpeta %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Buida la paperera"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Voleu suprimir tots els missatges de la paperera?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "Buida la pap_erera"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Esteu treballant sense connexió. Ho voleu anul·lar?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Envia els missatges de la cua"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Voleu enviar tots els missatges de la cua?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "S'han produït alguns errors enviant els missatges de la cua."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4256,64 +4248,64 @@ msgstr ""
 "S'han produït alguns errors enviant els missatges de la cua:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Realment voleu copiar la carpeta \"%s\" a \"%s\"?"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Realment voleu convertir la carpeta \"%s\" en subcarpeta de \"%s\"?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Copia la carpeta"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Desplaça la carpeta"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiant %s a %s..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movent %s a %s..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "La destinació i l'origen són iguals."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "No es pot copiar la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "No es pot desplaçar la carpeta a una de les seves subcarpetes."
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "No es poden desplaçar carpetes entre bústies diferents."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "La còpia ha fallat!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "El desplaçament ha fallat!"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Processant la configuració per a la carpeta %s"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 "La carpeta de destinació només es pot usar per emmaguetzemar subcarpetes."
@@ -4359,8 +4351,8 @@ msgid "read-only"
 msgstr "només de lectura"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "desconegut"
 
@@ -4401,13 +4393,13 @@ msgstr ""
 "El Claws Mail és programari lliure publicat d'acord amb la llicència GPL. Si "
 "voleu fer donacions al projecte del Claws Mail, ho podeu fer a..."
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "L'equip del Claws Mail\n"
 "i en Hiroyuki Yamamoto"
 
@@ -4442,7 +4434,7 @@ msgstr ""
 "Llengua: %s (caràcters: %s)\n"
 "Sistema operatiu: desconegut"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "L'equip del Claws Mail"
 
@@ -4565,73 +4557,78 @@ msgstr ""
 "Hauríeu d'haver rebut una còpia de la GNU General Public License juntament "
 "amb aquest programa; en cas contrari, mireu "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Estadístiques de la sessió\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciat: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Trànsit d'entrada\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Missatges rebuts: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "Missatges brossa: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Trànsit de sortida\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Missatges nous / redireccionats: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Missatges resposts: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Missatges reenviats: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de missatges sortints: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "Quant al Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Autors"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "_Característiques"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Llicència"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "Notes de la ve_rsió"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "E_stadístiques"
 
@@ -4840,7 +4837,7 @@ msgid "Configuring..."
 msgstr "Configurant..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Data"
@@ -4849,9 +4846,9 @@ msgstr "Data"
 msgid "Date:"
 msgstr "Data:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "Des de"
@@ -4872,9 +4869,9 @@ msgstr "Remitent:"
 msgid "Reply-To"
 msgstr "Respon a"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Per a"
@@ -4910,9 +4907,9 @@ msgstr "Referències"
 msgid "References:"
 msgstr "Referències:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Assumpte"
@@ -4922,7 +4919,7 @@ msgstr "Assumpte"
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Comentaris"
 
@@ -5036,8 +5033,8 @@ msgid "Seen:"
 msgstr "Vist:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Estat"
@@ -5110,7 +5107,7 @@ msgstr "Procedència"
 msgid "Precedence:"
 msgstr "Procedència:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Organizació"
 
@@ -5430,9 +5427,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5446,7 +5442,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5461,7 +5457,7 @@ msgstr "_Carrega..."
 msgid "_Unload"
 msgstr "_Descarrega"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Descripció"
 
@@ -5484,8 +5480,8 @@ msgid "Loaded plugins"
 msgstr "Connectors carregats"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "_Aplica"
 
@@ -5498,10 +5494,10 @@ msgid "_Hide"
 msgstr "Ama_ga"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Compte"
@@ -5575,17 +5571,17 @@ msgid "forwarded messages"
 msgstr "missatges reenviats"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "missatges que tenen fitxers adjunts"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "els missatges que continguin S en qualsevol nom o valor de capçalera"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "els missatges que contenen S al valor de qualsevol capçalera"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "missatges que tenen fitxers adjunts"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "missatges que contenen S a la capçalera ID del missatge"
@@ -5675,19 +5671,19 @@ msgid "unread messages"
 msgstr "missatges sense llegir"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "missatges que contenen V a la capçalera H"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "missatges que contenen S a la capçalera Referències"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "missatges que retornen 0 en pasar-los a l'ordre - %F és un fitxer de missatge"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "missatges que contenen S a la capçalera Etiqueta-X"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "lògic I operador"
@@ -5736,55 +5732,55 @@ msgstr ""
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Quelcom ha fallat durant la cerca. Es recomana consultar el registre."
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "De/Per a/Cc/Assumpte/Etiqueta"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Recursiu"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Enganxós"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Escriptura anticipada"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Executa sobre la selecció"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "_Neteja"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Neteja la cerca actual"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Edita els criteris de cerca"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Informació"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Informació sobre símbols ampliats"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "E_dita"
 
@@ -5963,16 +5959,16 @@ msgstr "(Sense assumpte)"
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Mida del fitxer:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Carrega la imatge"
 
@@ -6164,7 +6160,7 @@ msgstr "Error de TLS"
 msgid "Unknown error [%d]"
 msgstr "Error desconegut [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6176,7 +6172,7 @@ msgstr ""
 "Les entrades CRAM-MD5 només funcionen si libetpan ha compilat amb suport "
 "SASL i el connector CRAM-MD5 SASL està instal·lat."
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6188,7 +6184,7 @@ msgstr ""
 "Les entrades DIGEST-MD5 només funcionen si libetpan ha estat compilat amb "
 "suport SASL i el connector DIGEST-MD5 SASL està instal·lat."
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6200,7 +6196,55 @@ msgstr ""
 "Les entrades SCRAM-SHA-1 només funcionen si libetpan s'ha compilat amb "
 "suport SASL i el connector SCRAM SASL està instal·lat."
 
-#: src/imap.c:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Els inicis de sessió amb SCRAM-SHA-224 només funcionen si libetpan s'ha "
+"compilat amb suport SASL i el connector SCRAM SASL està instal·lat."
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Els inicis de sessió  amb SCRAM-SHA-256 només funcionen si libetpan s'ha "
+"compilat amb suport SASL i el connector SCRAM SASL està instal·lat."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Els inicis de sessió amb SCRAM-SHA-384 només funcionen si libetpan s'ha "
+"compilat amb suport SASL i el connector SCRAM SASL està instal·lat."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Els inicis de sessió amb SCRAM-SHA-512 només funcionen si libetpan s'ha "
+"compilat amb suport SASL i el connector SCRAM SASL està instal·lat."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6212,7 +6256,7 @@ msgstr ""
 "Les entrades PLAIN només funcionen si libetpan s'ha compilat amb suport de "
 "SASL i hi ha instal·lat el connector PLAIN SASL."
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6224,7 +6268,7 @@ msgstr ""
 "Les entrades LOGIN només funcionen si libetpan s'ha compilat amb suport de "
 "SASL i hi ha instal·lat el connector PLAIN SASL."
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6234,36 +6278,36 @@ msgstr ""
 "\n"
 "Error d'OAuth2. Comproveu i corregiu les preferències del compte d'OAuth2."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Ha fallat la connexió amb %s: entrada refusada.%s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Ha fallat la connexió a %s: entrada %s refusada.\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexió amb %s fa fallat"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexió IMAP amb %s s'ha desconnectat. Es torna a connectar...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "El Claws Mail necessita accés a la xarxa per accedir al servidor IMAP."
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Connexió no segura"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6277,108 +6321,108 @@ msgstr ""
 "Voleu continuar connectant a aquest servidor? La comunicació pot no ser "
 "segura."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Con_tinua connectant"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Compte: \"%s\": connectant al servidor IMAP: %s:%d ..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "No es pot connectar amb el servidor IMAP: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "No es pot connectar amb el servidor IMAP: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "No es pot iniciar la sessió STARTTLS.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "No s'ha pogut fer l'entrada al servidor IMAP %s.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "No s'ha pogut fer l'entrada al servidor IMAP %s."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "La cerca ha fallat a causa d'un error del servidor."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els indicadors suprimits\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "no es pot suprimir\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscant carpetes no subscrites a %s..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscant subcarpetes de %s..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "no es pot crear la bústia\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no s'ha pogut canviar el nom de la bústia: %s a %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "no es pot suprimir la bústia\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "LIST ha fallat\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "Marcant missatges..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "El servidor requereix STARTTLS per accedir-hi.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "No es poden refrescar les capacitats.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6387,20 +6431,24 @@ msgstr ""
 "La connexió a %s ha fallat: el servidor requereix STARTTLS, però el Claws "
 "Mail s'ha compilat sense suport per a STARTTLS.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "Les entrades al servidor estan inhabilitades.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "Obtenint el missatge..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Se suprimeixen els missatges esborrats..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els indicadors suprimits: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6431,7 +6479,7 @@ msgid "Cop_y folder..."
 msgstr "Cop_ia la carpeta..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "S_uprimeix la carpeta..."
 
@@ -6451,7 +6499,7 @@ msgstr "S_ubscripcions"
 msgid "_Subscribe..."
 msgstr "_Subscriviu-vos-hi..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "Dona-te'n de bai_xa..."
 
@@ -6483,21 +6531,21 @@ msgstr ""
 "i no correus, afegiu \"/\" al nom de la carpeta)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introduïu el nom nou per a \"%s\":"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Canvia el nom de la carpeta"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6516,7 +6564,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "Seleccioneu una carpeta per copiar-hi la carpeta \"%s\""
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6530,8 +6578,8 @@ msgstr ""
 "Realment voleu suprimir-ho?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No es pot suprimir la carpeta \"%s\"."
@@ -6841,8 +6889,8 @@ msgstr "Connexió fallida"
 msgid "Auth failed"
 msgstr "Auth fallida"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Bloquejat"
 
@@ -7013,8 +7061,8 @@ msgstr "Incorporació cancel·lada\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "segons"
 
@@ -7077,7 +7125,7 @@ msgstr "Error d'LDAP (de cerca): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Motiu (nick)"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7086,7 +7134,7 @@ msgstr ""
 "El fitxer \"%s\" ja existeix.\n"
 "No s'ha pogut crear la carpeta."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7095,7 +7143,7 @@ msgstr ""
 "Trobada la configuració per a %s.\n"
 "Voleu migrar aquesta configuració?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7108,11 +7156,11 @@ msgstr ""
 "Les vostres regles de filtratge de Sylpheed poden ser convertides\n"
 "per un script disponible a %s."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Mantén la configuració anterior."
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7122,27 +7170,27 @@ msgstr ""
 "però pot trigar una mica si teniu dades de notícies o IMAP a la memòria cau, "
 "i ocuparà espai addicional al vostre disc."
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Migració de configuració"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiant la configuració... Pot trigar una estona..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Migració fallida!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Migrant la configuració..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(o anterior)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7161,7 +7209,7 @@ msgstr[1] ""
 "dels connectors per a més informació:\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7172,7 +7220,7 @@ msgstr ""
 "l'arbre de carpetes\" del menú contextual de la carpeta mare de la bústia "
 "per intentar arreglar-ho."
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7183,77 +7231,77 @@ msgstr ""
 "desactualitzat. Si us plau, reinstal·leu el connector i intenteu-ho una "
 "altra vegada."
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Falta el nom del fitxer\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "No s'ha pogut obrir el fitxer per llegir-lo\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Capçalera mal formada\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Capçalera \"Per a:\" duplicada\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "No s'ha trobat la capçalera requerida \"Per a\":\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Proveu -h o --help per a l'ús.\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Manca l'argument del fitxer per a l'opció %s."
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Manca o és buit l'argument d'uri per a l'opció %s."
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Manca l'argument d'uri per a l'opció %s."
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "Manca com a mínim un argument de fitxer no buit per a l'opció %s."
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr ""
 "Manquen la carpeta, el tipus i els arguments de sol·licitud per a l'opció %s."
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Manquen el tipus i els arguments de sol·licitud per a l'opció %s."
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Manca l'argument de sol·licitud per a l'opció %s."
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ús: %s [OPCIÓ]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adreça]  obre la finestra d'escriptura"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7273,12 +7321,12 @@ msgstr ""
 "                          línia buida, llavors el cos del correu fins al "
 "final del fitxer."
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe uri         us subscriu a l'URI proporcionat si és possible"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7288,7 +7336,7 @@ msgstr ""
 "                         obre la finestra d'escriptura amb els fitxers\n"
 "                         especificats com a adjunts"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7298,23 +7346,23 @@ msgstr ""
 "                         obre la finestra d'escriptura amb els fitxers\n"
 "                         especificats inserits"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive              rep els missatges nous"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          rep missatges nous per a tots els comptes"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancel·la la recepció de missatges"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancel·la l'enviament dels missatges"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7332,15 +7380,15 @@ msgstr ""
 "                        petició: cadena de cerca\n"
 "                        recursiva: fals si arg. comença amb 0, n, N, f o F"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia tots els missatges de la cua"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  mostra el nombre total de missatges"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7348,15 +7396,15 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         mostra l'estat de cada carpeta"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           mostra estadístiques de la sessió"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     estadístiques del reinici de la sessió"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7366,46 +7414,46 @@ msgstr ""
 "                         La carpeta és un ID de carpeta com ara \"carpeta/"
 "subcarpeta', un uri de fitxer:// o bé un camí absolut."
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online               canvia a mode de treball amb connexió"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               canvia a mode de treball sense connexió"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       surt del Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             mode de depuració"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         commuta el mode de depuració"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              mostra aquesta ajuda"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           mostra la informació de la versió"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      mostra la informació de la versió i de les funcions "
 "integrades"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           mostra el directori de la configuració"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7413,7 +7461,7 @@ msgstr ""
 "  --alternate-config-dir directori\n"
 "                         usa el directori de configuració especificat"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7421,48 +7469,48 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         Estableix la geometria per a la finestra principal."
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Manca l'argument de directori per a l'opció %s."
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Manca l'argument de geometria per a l'opció %s."
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Manca l'argument de carpeta per a l'opció %s."
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Opció desconeguda: %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processant (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "carpeta superior"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Missatges a la cua"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hi ha missatges sense enviar a la cua. Voleu sortir ara?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: la xarxa està connectada.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la xarxa està desconnectada.\n"
 
@@ -7646,11 +7694,11 @@ msgstr "Directori sense llegir següent"
 msgid "F_older..."
 msgstr "Car_peta..."
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Secció següent"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Secció anterior"
 
@@ -7893,7 +7941,7 @@ msgstr "Eti_quetes"
 msgid "Re-_edit"
 msgstr "Re_edita"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "Comprova'n la signatura"
 
@@ -7923,7 +7971,7 @@ msgstr "_Filtra els missatges _seleccionats"
 
 #: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
-msgstr "Executa regles de pr_ocessament"
+msgstr "Executa les regles de pr_ocessament de carpetes"
 
 #: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
@@ -8098,7 +8146,7 @@ msgstr "Capçaleres de columna"
 msgid "Th_read view"
 msgstr "Vista pe_r fil"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Amaga els fils llegits"
 
@@ -8106,7 +8154,7 @@ msgstr "Amaga els fils llegits"
 msgid "_Hide read messages"
 msgstr "Ama_ga els missatges llegits"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Amaga els missatges suprimits"
 
@@ -8219,11 +8267,11 @@ msgstr "Per bloquejat"
 msgid "D_on't sort"
 msgstr "N_o classifiquis"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "Ascendent"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "Descendent"
 
@@ -8231,7 +8279,7 @@ msgstr "Descendent"
 msgid "_Auto detect"
 msgstr "Detecta _automàticament"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Modifica les etiquetes..."
 
@@ -8273,7 +8321,7 @@ msgstr "registre de filtratge inhabilitat\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Sense títol"
 
@@ -8281,19 +8329,19 @@ msgstr "Sense títol"
 msgid "none"
 msgstr "cap"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Voleu suprimir tots els missatges de la paperera?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "No en surtis"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Afegeix una bústia"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8307,18 +8355,18 @@ msgstr ""
 "Si s'especifica la ubicació d'una bústia de correu que ja existeix,\n"
 "s'escanejarà automàticament."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La bústia '%s' ja existeix."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Bústia de correu"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8328,58 +8376,58 @@ msgstr ""
 "Pot ser que ja existeixin els fitxers o que no tingueu els permisos per "
 "escriure-hi."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Cap correu permès"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "La importació de bústia ha fallat."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "L'exportació a bústia ha fallat."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Surt"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Voleu sortir del Claws Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "_Surt"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Sincronització de carpetes"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voleu sincronitzar les carpetes ara?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "_Sincronitza"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Suprimint missatges duplicats..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "No s'ha trobat cap missatge duplicat a la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "S'ha suprimit %d missatge duplicat a la carpeta seleccionada.\n"
 msgstr[1] "S'han suprimit %d missatges duplicats a la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, 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"
@@ -8388,114 +8436,114 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han marcat %d missatges duplicats per suprimir a la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Suprimint missatges duplicats a totes les carpetes..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "S'ha suprimit %d missatge duplicat a %d carpetes.\n"
 msgstr[1] "S'han suprimit %d missatges duplicats a %d carpetes.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "No s'ha trobat cap missatge duplicat a %d carpetes.\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Seleccioneu una carpeta per anar-hi"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Regles de processament per aplicar abans de les regles de les carpetes"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 "Regles de processament per aplicar després de les regles de les carpetes"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Configuració del filtratge"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "No s'ha pogut establir com a client per defecte: impossible obtenir el camí "
 "de l'executable."
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "El Claws Mail s'ha registrat com a client per defecte."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "No s'ha pogut registrar com a client per defecte: impossible escriure al "
 "registre."
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Explorant la carpeta %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d contrasenya oblidada en %d comptes.\n"
 msgstr[1] "%d contrasenyes oblidades en %d comptes.\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "capçalera %s"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "capçalera"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "línia de capçalera"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "Línia de cos del missatge"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Distigeix maj. i min."
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "No distingeixis maj. i min."
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "comprovant si el missatge concorda [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "el missatge concorda\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "el missatge no concorda\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(cap)"
 
@@ -8532,7 +8580,7 @@ msgstr "Sobreescriu el fitxer de bústia"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Aquest fitxer ja existeix. Voleu sobreescriure'l?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
@@ -8766,8 +8814,8 @@ msgstr ""
 "\n"
 "  El missatge s'ha suprimit o desplaçat a una altra carpeta."
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
 
@@ -8807,64 +8855,68 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Suprimeix la bústia"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Obre"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "Obre _amb..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Copia"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "Envia a..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "_Mostra-ho com a text"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "De_sa com a..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "Des_a-ho tot..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Desa tots els adjunts..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "Tipus MIME"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Mostra la informació completa"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Comprova-ho un altre cop"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Cliqueu a la icona per comprovar-ho."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Cliqueu a la icona o premeu \"%s\" per comprovar-ho."
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "S'ha esgotat el temps comprovant la signatura. Cliqueu a la icona per "
 "reintentar-ho."
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8872,39 +8924,39 @@ msgstr ""
 "S'ha esgotat el temps comprovant la signatura. Cliqueu a la icona o premeu "
 "la tecla \"%s\" per reintentar-ho."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr ""
 "Error en comprovar la signatura. Cliqueu a la icona per tornar-ho a provar."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Error en comprovar la signatura. Cliqueu a la icona o premeu %s per tornar-"
 "ho a provar."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "Comprovant signatura..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "Torna al correu"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No s'ha pogut desar la secció del missatge multisecció: %s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Se sobreescriu el fitxer existent \"%s\"?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
 #, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
@@ -8913,59 +8965,59 @@ msgstr ""
 "Hi ha hagut un error mentre es desava la part del missatge %d. Voleu "
 "cancel·lar l'operació o ometre l'error i continuar?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "Error desant la part del missatge"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "Ignora"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "Ignora-ho tot"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fitxer desat correctament."
 msgstr[1] "%d fitxers desats correctament."
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fitxer desat correctament."
 msgstr[1] "%d fitxers desats correctament."
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fitxer fallat."
 msgstr[1] "%s, %d fitxers fallats."
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Selecciona una carpeta de destinació"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "\"%s\" no és un directori."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Desa com a"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Obre amb"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8974,7 +9026,7 @@ msgstr ""
 "Teclegeu l'ordre per obrir el fitxer:\n"
 "(\"%s\" es substituirà pel nom del fitxer)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8985,11 +9037,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Voleu executar un binari que no és de confiança?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -9001,20 +9053,20 @@ msgstr ""
 "\n"
 "Voleu executar aquest fitxer?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "Executa el binari"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Mida:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9127,80 +9179,80 @@ msgstr "Dona't de baixa del grup de notícies"
 msgid "Rename newsgroup folder"
 msgstr "Canvia el nom de la carpeta del grup de notícies"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "Falta el codi d'autorització OAuth2.\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "Error de connexió d'OAuth2\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "Error de connexió de TLS OAuth2\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "S'ha obtingut el testimoni d'accés d'OAuth2.\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "No s'ha obtingut el testimoni d'accés d'OAuth2.\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "S'ha obtingut el testimoni d'actualització d'OAuth2\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "No s'ha obtingut el testimoni d'actualització d'OAuth2\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr ""
 "S'ha proporcionat un testimoni d'actualització de substitució d'OAuth2.\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr ""
 "No s'ha proporcionat el testimoni d'actualització de substitució d'OAuth2.\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "Error d'escriptura del sòcol d'OAuth2\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "Error de temps d'espera del sòcol d'OAuth2\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "El testimoni d'accés d'OAuth2 encara està actualitzat.\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr ""
 "L'OAuth2 obté un testimoni d’accés mitjançant un testimoni d’actualització.\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "L'OAuth2 prova un testimoni d'accés nou amb codi d'autorització.\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "Accés d'OAuth2 i testimoni d'actualització actualitzats\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 original: %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 codificat: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9209,11 +9261,11 @@ msgstr ""
 "OAuth2 descodificat: %s\n"
 "\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Introduïu la contrasenya principal."
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Contrasenya principal incorrecta."
 
@@ -9495,7 +9547,7 @@ msgid ""
 "the archiving process:\n"
 "%s%s"
 msgstr ""
-"Algunes dades no inicialitzades eviten iniciar\n"
+"Algunes dades no iniciades eviten iniciar\n"
 "el procés d'arxivament:\n"
 "%s%s"
 
@@ -9523,22 +9575,22 @@ msgstr "%s: existeix. Voleu continuar tanmateix?"
 #: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
-msgstr "%s: és un enllaç. No es pot continuar"
+msgstr "%s: és un enllaç. No es pot continuar."
 
 #: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
-msgstr "%s: és un directori. No es pot continuar"
+msgstr "%s: és un directori. No es pot continuar."
 
 #: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
-msgstr "%s: permisos no trobats. No es pot continuar"
+msgstr "%s: permisos no trobats. No es pot continuar."
 
 #: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
-msgstr "%s: error desconegut. No es pot continuar"
+msgstr "%s: error desconegut. No es pot continuar."
 
 #: src/plugins/archive/archiver_gtk.c:574
 #: src/plugins/archive/archiver_gtk.c:621
@@ -9636,7 +9688,7 @@ msgstr "Sí"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Cap"
 
@@ -9653,7 +9705,7 @@ msgid "Delete selected files"
 msgstr "Suprimeix els fitxers seleccionats"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Selecciona els missatges anteriors"
 
@@ -9667,99 +9719,99 @@ msgstr ""
 "Selecciona un nom de fitxer per arxivar [el sufix hauria de reflectir "
 "l'arxiu, com ara .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Crea un arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Introduïu els arguments de l'arxivador"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Carpeta per arxivar"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Carpeta que és l'arrel de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Premeu aquest botó per seleccionar la carpeta que serà l'arrel de l'arxiu."
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Nom per a l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Nom i ubicació de l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 "Premeu aquest botó per seleccionar un nom i una ubicació per a l'arxiu."
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Trieu la compressió"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Trieu aquesta opció per usar compressió %s per a l'arxiu."
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Trieu el format"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Trieu aquesta opció per usar %s com a format per a l'arxiu."
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Opcions diverses"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Recursiu"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Trieu aquesta opció per incloure subcarpetes a l'arxiu"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9770,11 +9822,11 @@ msgstr ""
 "Aneu amb compte, això incrementarà substancialment el temps usat\n"
 "per crear l'arxiu."
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "Canvia'n _el nom"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9786,7 +9838,7 @@ msgstr ""
 "Esquema de nomenclatura: data_des_de at a@assumpte.\n"
 "Els noms es truncaran a un màxim de 96 caràcters."
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9794,11 +9846,11 @@ msgstr ""
 "Trieu aquesta opció per suprimir els missatges després d'arxivar-los\n"
 "En aquest punt només es gestionen IMAP4, la bústia local (mbox) i POP3."
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Opcions de selecció"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9892,7 +9944,7 @@ msgstr "Suprimeix els adjunts"
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Adjunt"
@@ -10059,19 +10111,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Exclou"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -10081,15 +10133,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Qualsevol"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: recuperant cossos de missatge..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrant missatges..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -10102,30 +10154,30 @@ msgstr ""
 "entrenar el Bogofilter amb uns quants centenars de missatges brossa i "
 "missatges bons."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 msgstr ""
-"El connector Bogofilter no ha pogut filtrar un missatge. L'ordre \"%s %s %s"
-"\" no s'ha pogut executar."
+"El connector Bogofilter no ha pogut filtrar un missatge. L'ordre \"%s %s "
+"%s\" no s'ha pogut executar."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprenent del missatge..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Aprenentatge fallit; `%s` ha retornat l'estat %d."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprenent dels missatges..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10134,7 +10186,7 @@ msgstr ""
 "Aprenentatge fallit; `%s %s %s` ha retornat l'error següent:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10163,13 +10215,13 @@ msgstr ""
 "Les opcions les podeu trobar a /Configuració/Preferències/Connectors/"
 "Bogofilter."
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Detecció de correu brossa"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Aprenentatge del correu brossa"
 
@@ -10193,7 +10245,7 @@ msgstr "Els missatges més grossos d'això no es comprovaran"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "KiB"
 
@@ -10302,19 +10354,19 @@ msgstr "Camí de l'executable de bogofilter"
 msgid "Mark spam as read"
 msgstr "Marca el correu brossa com a llegit"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "BSFilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "BSFilter: recuperant cos..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "BSFilter: filtrant missatge..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10327,7 +10379,7 @@ msgstr ""
 "entrenar el Bsfilter amb uns quants centenars de missatges brossa i "
 "missatges bons."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -10336,11 +10388,11 @@ msgstr ""
 "El connector Bsfilter no ha pogut filtrar el missatge. L'ordre \"%s\"no s'ha "
 "pogut executar."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: aprenent del missatge..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10361,8 +10413,8 @@ msgstr ""
 "\n"
 "Abans que Bsfilter pugui reconèixer missatges com a correus brossa, l'heu "
 "d'entrenar marcant uns quants centenars de correus brossa i correus bons amb "
-"l'ús de \"/Marca/Marca com a correu brossa\" i \"/Marca/Marca com a correu bo"
-"\".\n"
+"l'ús de \"/Marca/Marca com a correu brossa\" i \"/Marca/Marca com a correu "
+"bo\".\n"
 "\n"
 "Quant un missatge és identificat com a correu brossa pot ser suprimit o "
 "desat en una carpeta especialment designada per fer-ho.\n"
@@ -10690,65 +10742,52 @@ msgstr ""
 "\n"
 "No és realment útil."
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Mostra les imatges."
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Mostra les imatges incastades."
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Executa Javascript."
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Executa javascript encastat."
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Executa miniaplicacions Java."
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Executa miniaplicacions Java encastades."
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Representa els objectes usant connectors."
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Representa els objectes encastats usant connectors."
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Obre-ho al visualitzador (el contingut remot està activat)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "No facis res (el contingut remot està inhabilitat)."
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Servidor intermediari"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "Usa la configuració del servidor intermediari del GNOME"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "Usa un servidor intermediari"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Recursos remots"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10763,115 +10802,120 @@ msgstr ""
 "miniaplicacions de Java poden encara estar habilitats per al contingut\n"
 "que s'adjunta al correu."
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Habilita la càrrega de contingut remot"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "En fer clic en un enllaç, per defecte"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Obre-ho al navegador extern"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "El CSS en aquest fitxer s'aplicarà a totes les seccions d'HTML."
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Na_vega"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Selecciona el full d'estil."
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "La càrrega de contingut remot està inhabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Carrega les imatges."
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Habilita el contingut remot."
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Habilita Javascript."
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Habilita els connectors."
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Habilita el Java."
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Obre els enllaços amb un navegador extern."
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ha ocorregut un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s està malformat o no és un canal d'informació suportat."
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Obre al visualitzador"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Obre al navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Obre imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Copia l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Descarrega l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Desa la imatge com a"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Copia la imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Importa un canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Elegant"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "No s'ha pogut trobar l'extensió de WebKit complementària %s"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Visualitzador atractiu d'HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10973,196 +11017,6 @@ msgstr ""
 "Afegeix la capçalera X-FETCH-TIME amb la data i hora d'extracció de missatge "
 "en format RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "Connector GData: autorització requerida"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"Necessiteu autoritzar que el Claws Mail accedeixi a la llista de contactes "
-"de Google per usar el connector de GData.\n"
-"\n"
-"Visiteu la pàgina d'autorització de Google prement el botó de sota. Després "
-"de confirmar l'autorització, rebreu un codi d'autorització. Introduïu-lo al "
-"camp de sota per concedir l'accés al Claws Mail a la llista de contactes de "
-"Google."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "Pas 1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
-"Feu clic aquí per obrir la pàgina d'autorització de Google en un navegador"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "Pas 2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Introduïu el codi:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "Connector GData: error en consultar els contactes: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "Afegit %d de"
-msgstr[1] "Afegits %d de"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "1 contacte a la memòria cau"
-msgstr[1] "%d contactes a la memòria cau"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "Connector GData: iniciant la consulta de contactes asíncrona.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "Connector GData: error en consultar els grups: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "Connector GData: grups rebuts.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "Connector GData: iniciant la consulta de grups asíncrona.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "Connector GData: error d'autorització: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "Connector GData: autorització correcta.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Connector GData: iniciant l'autenticació interactiva.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr ""
-"Connector GData: s'ha rebut un codi d'autorització, es demana "
-"l'autorització.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"Connector GData: no s'ha rebut cap codi d'autorització, cancel·lada la "
-"sol·licitud d'autorització\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"Connector de GData: l'autorització interactiva encara s'executa, no hi ha "
-"cap sessió addicional iniciada.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Connector GData: error d'actualització de l'autorització: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Connector GData: actualització de l'autorització correcta.\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"Connector GData: el temps transcorregut des de l'última actualització: %d "
-"minuts, s'actualitza ara\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Connector GData: intentant actualitzar l'autorització.\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Autenticació"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Nom d'usuari:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Interval de sondeig (segons):"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Nombre màxim de resultats:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Ha fallat el registre del ganxo per a l'interruptor sense connexió del "
-"connector GData"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr ""
-"Ha fallat el registre del ganxo per a l'interruptor sense connexió del "
-"connector GData"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Aquest connector proporciona accés al protocol GData del Claws Mail.\n"
-"\n"
-"El protocol GData és una interfície per als serveis de Google .\n"
-"Actualment, l'única funcionalitat  implementada és incloure els contactes de "
-"Google a la compleció de Pestanya-adreça .\n"
-"\n"
-"Les opinions són benvingudes a <berndth at gmx.de>."
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "Integració de GData"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11330,8 +11184,8 @@ msgid "Cache refresh interval"
 msgstr "Interval d'actualització de la memòria cau"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hores"
 
@@ -11480,11 +11334,11 @@ msgstr "Mida de la memòria cau d'imatges en megabytes"
 msgid "Default font"
 msgstr "Lletra per defecte"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Obre l'enllaç"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Copia la ubicació de l'enllaç"
 
@@ -11587,7 +11441,7 @@ msgstr "Mètode d'autenticació no disponible"
 msgid "sending error on Sieve session: %s\n"
 msgstr "error d'enviament a la sessió de Sedàs: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Filtratge"
 
@@ -11723,7 +11577,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Habilita el Sedàs"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Informació del servidor"
 
@@ -11760,8 +11614,12 @@ msgstr "Usa STARTTLS quan estigui disponible."
 msgid "Require STARTTLS"
 msgstr "Requereix STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Autenticació"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Sense autenticació"
 
@@ -11775,28 +11633,28 @@ msgstr "Especifiqueu l'autenticació"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "ID de l'usuari"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Contrasenya"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Automàtic"
 
@@ -12115,7 +11973,7 @@ msgid "Never"
 msgstr "Mai"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Sempre"
 
@@ -12266,7 +12124,7 @@ msgstr "Habilita la icona de safata"
 
 #: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
-msgstr "Amaga a l'inici"
+msgstr "Amaga en iniciar."
 
 #: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
@@ -12724,9 +12582,9 @@ msgstr "Caduca després de"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Si s'estableix a 0 es desa la contrasenya per a tota la sessió."
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuts"
 
@@ -12938,109 +12796,109 @@ msgstr "Signatura incorrecta de \"%s\""
 msgid "The signature has not been checked"
 msgstr "La signatura no s'ha comprovat."
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "Error comprovant la signatura: sense estat\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Error comprovant la signatura: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signatura feta el %s usant %s ID de clau %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signatura vàlida des de l'uid \"%s\" (Validesa: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Caducada l'uid de la clau \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Signatura caducada des de l'uid \"%s\" (Validesa: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Uid de la clau revocada: \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Signatura INVÀLIDA de \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Validesa: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "Revocada"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confiança de propietari: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Sense clau!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Empremta digital de clau primària:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVÍS: l'adreça del signant «%s» no coincideix amb l'entrada DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'adreça verificada del signant és \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "No s'han pogut obtenir dades del missatge, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
-msgstr "No s'han pogut inicialitzar les dades, %s"
+msgstr "No s'han pogut iniciar les dades, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "L'especificació de la clau secreta és ambigua."
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Clau secreta no trobada (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Error establint la clau secreta: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "El protocol gpgme \"%s\" no és usable: el motor \"%s\" no està instal·lat "
 "correctament."
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13049,12 +12907,12 @@ msgstr ""
 "El protocol gpgme \"%s\" no és usable: el motor \"%s\", versió %s, està "
 "instal·lat; però és necessària la versió %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "El protocol gpgme \"%s\" no és usable (problema desconegut)."
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13062,7 +12920,7 @@ msgstr ""
 "GnuPG no està adequadament instal·lat o necessita actualitzar-se.\n"
 "Suport d'OpenPGP inhabilitat."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13070,11 +12928,11 @@ msgstr ""
 "Heu de desar la informació del compte amb \"D'acord\" abans de poder generar "
 "el parell de claus.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "No s'ha trobat una clau PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -13084,12 +12942,12 @@ msgstr ""
 "podeu signar missatges o rebre missatges encriptats.\n"
 "Voleu crear un nou parell de claus ara?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "No s'ha pogut generar un nou parell de claus: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13097,11 +12955,11 @@ msgstr ""
 "Generant el vostre nou parell de claus... Si us plau, moveu el ratolí per "
 "ajudar a generar entropia..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "No s'ha pogut generar un nou parell de claus: error desconegut."
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13114,15 +12972,15 @@ msgstr ""
 "\n"
 "Voleu exportar-la a un servidor de claus?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Clau generada"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Clau exportada."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "No s'ha pogut exportar la clau."
 
@@ -13330,12 +13188,12 @@ msgid "Show Python console..."
 msgstr "Mostra la consola de Python"
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Navega"
@@ -13457,30 +13315,30 @@ msgstr ""
 "No s'ha pogut llegir el contingut del fitxer antic feeds.xml:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 "RSSyl: error durant l'escriptura de \"%s\" a la llista d'exportació de "
 "canals.\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: no s'ha pogut suprimir el fitxer OPML antic \"%s\": %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: no s'ha pogut obrir el fitxer \"%s\" per a l'exportació de llista de "
 "canals: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: error durant l'escriptura del fitxer d'exportació del canal.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13493,7 +13351,7 @@ msgstr ""
 "\n"
 "No es permet el nom de carpeta \"%s\"."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13508,142 +13366,142 @@ msgstr ""
 "obtingudes des de la xarxa. Podeu llegir-les, suprimir-les o mantenir les "
 "entrades antigues."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "Canal RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(buit)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Refresca tots els canals"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Subscriviu-vos al canal"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Introduïu l'URL dels canals de notícies a què us voleu subscriure:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "No es pot usar \"%c\" en un nom de carpeta."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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] "El Claws Mail necessita accés a la xarxa per actualitzar el canal."
 msgstr[1] ""
 "El Claws Mail necessita accés a la xarxa per actualitzar els canals."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Realment voleu suprimir l'arbre del canal \"%s\"?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Suprimeix l'arbre del canal"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "Selecciona un fitxer OPML"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: subcrivint-se al canal nou: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: nou canal subscrit: \"%s\" (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: actualitzant el canal: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: actualització del canal acabada: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: no s'ha pogut obtenir el canal \"%s\": %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: no s'ha trobat un canal vàlid a \"%s\"\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: no s'ha pogut processar el canal \"%s\"\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 "RSSyl: l'aplicació està sortint, no ha pogut acabar l'actualització del "
 "canal a \"%s\"\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "Autenticació basica HTTP"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Usa l'interval de refresc per defecte"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Mantén els elements antics"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "Re_talla"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 "Actualitza el canal, i suprimeix els elements que ja no es troben a la font "
 "del canal."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Obtén els comentaris si és possible."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Sempre marca-ho com a nou."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "Marca-ho com a nou només si el text ha canviat."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "No ho marquis mai com a nou."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "Afegeix el títol de l'element a dalt de tot del missatge."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Ignora el canvi del títol."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13651,94 +13509,94 @@ msgstr ""
 "Activeu això per mantenir el nom de la carpeta actual, fins i tot si l'autor "
 "canvia el títol del canal."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "Verifica la validesa del certificat de TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Nom d'usuari"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "URL de la font"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "Obtén els comentaris d'articles de menys de "
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dies"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "Establiu-ho a -1 per obtenir tots els comentaris"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Si canvia un element"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Elements"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Interval d'actualització"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Establiu-ho a 0 per inhabiltar-ne el refresc automàtic."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Estableix les propietats del canal"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "_Refresca els canals"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "Pr_opietats del Canal"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "Canvia'n el no_m..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "Actualitza r_ecursivament"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "Subscriu-te al canal _nou..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "Crea una carpeta _nova..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Importa una llista de canals..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Suprimeix l'arbre"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "Afegeix un arbre de carpetes RSS"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Introduïu un nom per a un nou arbre de carpetes d'RSS."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13748,58 +13606,58 @@ msgstr ""
 "Potser alguns fitxers ja existeixen o potser no teniu permisos per escriure-"
 "hi?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Els meus canals"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Selecciona el fitxer de galetes"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Interval d'actualització per defecte"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "Refresca tots els canals en iniciar l'aplicació"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
+msgstr "Refresca tots els canals en iniciar"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Verifica la validesa dels certificats de TLS per als canals nous"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Camí del fitxer de les galetes"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 "Camí del fitxer de les galetes d'estil Netscape, cookies.txt, que conté les "
 "vostres galetes."
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Actualitzant"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Seguretat i privadesa"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "No s'ha pogut crear la carpeta per al canal nou \"%s\"."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Voleu subscriure-us a un canal nou?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Carpeta de canal:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
@@ -13807,35 +13665,35 @@ msgstr ""
 "En lloc d'usar el títol oficial, podeu fer servir un nom de carpeta diferent "
 "per al canal."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "_Edita les propietats del canal després de subscriure-us-hi"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Actualitzant els comentaris per a \"%s\"..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Cal autorització)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Prohibit)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (No trobat)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Error %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13849,7 +13707,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13858,21 +13716,21 @@ msgstr ""
 "No s'ha trobat un canal vàlid a\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Canal sense títol"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: possible canal no vàlid sense títol a %s\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Actualitzant el canal \"%s\"..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13886,13 +13744,13 @@ msgstr ""
 "Si us plau, poseu-vos en contacte amb els desenvolupadors, això no hauria de "
 "succeir."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr ""
 "El Claws Mail necessita tenir accés a la xarxa per tal d'actualitzar els "
 "canals."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13997,42 +13855,46 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "Denúncia de correu brossa"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Reenvia a:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Spamassassin no pot connectar amb spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Ha fallat el filtratge del mòdul SpamAssassin.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 "El connector Spamassassin està inhabilitat segons les seves preferències.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrant missatge..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -14042,7 +13904,7 @@ msgstr ""
 "de l'error és que no s'hagi pogut arribar al dimoni spamd. Si us plau, "
 "assegureu-vos que spamd s'està executant i és accessible."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -14050,17 +13912,17 @@ msgstr ""
 "El Claws Mail necessita accés a la xarxa per tal de passar el correu a "
 "l'aprenent remot."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Ha fallat la recepció del nom d'usuari"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "El connector Spamassassin està carregat però inhabilitat segons les seves "
 "preferències.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14526,63 +14388,68 @@ msgstr "Assitents:"
 msgid "Action:"
 msgstr "Acció:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "Reunió _nova..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Exporta el calendari..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "_Subscriviu-vos a Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "Can_via'n el nom..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "Actualitza les subscri_pcions"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "Vista de _llista"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "_Vista setmanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "Vista _mensual"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Reunions"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[sense resum]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "al passat"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "avui"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "demà"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "aquesta setmana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "més tard"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14591,21 +14458,21 @@ msgstr ""
 "\n"
 "Aquests són els esdeveniments previstos %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Excedit el temps (%d segons) connectant a %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (No autoritzat)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Error %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14618,7 +14485,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14629,112 +14496,112 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "No s'ha pogut crear el directori %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "El Claws Mail necessita accés a la xarxa per actualitzar el canal Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Actualitzant el calendari per a %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "Subscripció nova"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "El Claws Mail necessita accés a la xarxa per actualitzar la subscripció."
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Subscriviu-vos a Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "Introduïu l'URL de Webcal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "No s'ha pogut processar l'URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Realment voleu donar-vos-en de baixa?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Suprimeix la subscripció"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "acceptat"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "acceptada provisionalment"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "refusada"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "no va respondre"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "individual"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "grup"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "recurs"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "lloc"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "Passat"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Avui"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Demà"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "Aquesta setmana"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "Més tard"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Acceptada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Refusada: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Acceptada provisionalment:"
 
@@ -15146,95 +15013,95 @@ msgstr "Error de sintaxi al segell de temps a la salutació\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Error de sintaxi del segell de temps a la salutació (no ascii)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "Error del protocol POP\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL no vàlida: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: se suprimeix el missatge caducat %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: s'omet el missatge %d [%s](%d bytes)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "la bústia està bloquejada\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "Excedit el temps d'espera de la sessió\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "ordre no suportada\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "hi ha hagut un error a la sessió POP\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "ordre TOP no suportada\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Notícies (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Fitxer de bústia local"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Cap (només SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Nom del compte"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Estableix com a predeterminat"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Informació personal"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "Adreça de correu"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Configura automàticament"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15242,81 +15109,81 @@ msgstr ""
 "Avís: aquesta versió del Claws Mail\n"
 "ha estat compilada sense suport IMAP ni suport per a grups de notícies."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Aquest servidor requereix autenticació."
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "Autentica en connectar."
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "Servidor de notícies"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Servidor de recepció"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Bústia local"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "Usa una ordre de correu enlloc del servidor SMTP."
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "ordre per enviar els correus"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "Bústia d'entrada per defecte"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Els missatges sense filtrar es desaran en aquesta carpeta."
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "Autentiqueu-vos abans de la connexió POP"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "_Selecciona"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "Suprimeix els missatges del servidor quan s'hagin rebut."
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Suprimeix després de"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dies i 0 hores: suprimeix immediatament"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Límit de la mida de recepció"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15324,94 +15191,98 @@ msgstr ""
 "Els missatges que sobrepassin aquest límit es recuperaran parcialment. Quan "
 "els seleccioneu podreu descarregar-los completament o supimir-los."
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Nombre màxim d'articles per descarregar"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "sense límit si s'especifica 0"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Text pla"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(normalment buït)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Mostra només les carpetes subscrites."
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mode d'ample de banda eficient (evita recuperar etiquetes remotes)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Aquest mode usa menys ample de banda, però pot ser més lent amb alguns "
 "servidors..."
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Mida del lot"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificació automàtica"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Usa els paràmetres globals"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Comprova si hi ha missatges nous cada"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "Filtra els missatges durant la recepció."
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permet filtrar usant connectors durant la recepció."
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "\"Rep missatges\" comprova si hi ha missatges nous en aquest compte"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Capçalera"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "Genera Missatge-ID"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "Envia l'adreça de correu dins l'ID del missatge"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Afegeix un capçalera d'agent d'usuari"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Afegeix capçaleres d'usuari"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticació SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15419,219 +15290,219 @@ msgstr ""
 "Si deixeu aquests camps buits, s'usarà el mateix ID d'usuari i contrasenya "
 "usats per a la recepció."
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "Autentica amb POP abans d'enviar."
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "Esgotament del temps d'espera de l'autenticació de POP"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Autorització"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Seleccioneu el proveïdor de serveis de correu electrònic d'OAuth2"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "ID del client"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "Secrets del client"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Obteniu el codi d’autorització"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "Obre el navegador per defecte amb la sol·licitud"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Copia l'enllaç"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Codi d'autorització"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
 "Enganxeu l'URL complet del navegador o el testimoni d'autorització "
 "proporcionat"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Autorització completa"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Autoritza"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "Signatura"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "Insereix la signatura automàticament."
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "Separador de signatura"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Sortida de l'ordre"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Estableix les adreces següents automàticament."
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "Diccionaris de correcció ortogràfica"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Diccionari per defecte"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Diccionari alternatiu per defecte"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Escriu"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Respon"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Reenvia"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Sistema de privacitat per defecte"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Sempre missatges signats"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Sempre missatges encriptats"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signa sempre els missatges quan se'n respongui un de signat."
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Encripta sempre els missatges quan se'n respongui un d'encriptat."
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Encripta els missatges enviats amb la vostra clau a més de la del "
 "destinatari."
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Desa els missatges encriptats enviats com a text clar."
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "No usis TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usa l'ordre d'STARTTLS per obrir la sessió encriptada"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Envia (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "No usis TLS (però usa STARTTLS si cal)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "Certificats del client"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Certificat per a la recepció"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificat de client com a fitxer PKCS12 o PEM"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Certificat per enviar"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Accepta automàticament els certificats de TLS vàlids."
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Usa TLS sense bloqueig"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Desactiveu això si teniu problemes de connexió de TLS."
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Usa un servidor intermediari"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Usa la configuració per defecte"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Usa els paràmetres globals del servidor intermediari."
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Usa autenticació."
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Usa el servidor intermediari per a l'enviament."
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15640,27 +15511,27 @@ msgstr ""
 "servidor de sortida configurat, ignorant qualsevol servidor intermediari "
 "configurat."
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "Port POP"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "Port IMAP"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Nom del domini"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15668,174 +15539,178 @@ msgstr ""
 "El nom del domini s'usarà al Message-ID generat i en connectar a servidors "
 "SMTP."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Usa una ordre per comunicar-se amb el servidor"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marca els missatges creuats com a llegits i acoloreix-los:"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Posa els missatges enviats a"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Posa els missatges de la cua a"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Posa els esborranys a"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Posa els missatges suprimits a"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "No s'ha especificat el nom del compte."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "No s'ha especificat l'adreça de correu."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "No s'ha especificat el servidor SMTP."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "No s'ha especificat l'usuari."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "No s'ha especificat el servidor POP."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "La bústia d'entrada per defecte no existeix."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "No s'ha especificat el servidor IMAP."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "No s'ha especificat el servidor NNTP."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "no s'ha especificat el nom del fitxer de la bústia local."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "no s'ha especificat l'ordre de correu."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "L'ID d'usuari no pot contenir un caràcter de salt de línia."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "La contrasenya no pot contenir un caràcter de salt de línia."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "L'ID d'usuari d'SMTP no pot contenir un caràcter de salt de línia."
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "La contrasenya d'SMTP no pot contenir un caràcter de salt de línia."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "no se n'ha especificat el domini."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "no s'ha seleccionat la capeta d'enviats."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de cua."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "no s'ha seleccionat la carpeta d'esborranys."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de paperera."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "Rep"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "Envia"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantilles"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Privacitat"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Servidor intermediari"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Preferències per a un compte nou"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferències del compte"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Ha fallat (adreça incorrecta)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "Selecciona un fitxer de signatura"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Selecciona un fitxer de certificat"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (mòdul no carregat)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "Autorització completada"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "El Claws Mail ha rebut el vostre codi d'autorització d'OAuth2."
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "Autorització NO completada"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "El Claws Mail no ha rebut el vostre codi d'autorització d'OAuth2."
 
@@ -15885,7 +15760,7 @@ msgstr "A dal_t"
 
 #: src/prefs_actions.c:389
 msgid "Move the selected action to the top"
-msgstr "Desplaça l'acció seleccionada a l'inici"
+msgstr "Desplaça l'acció seleccionada a dalt de tot"
 
 #: src/prefs_actions.c:399
 msgid "Move the selected action up"
@@ -16072,7 +15947,7 @@ msgstr "aplica accions de filtratge entre {} als missatges seleccionats"
 msgid "for a literal %"
 msgstr "per a literal %"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Accions"
 
@@ -16121,12 +15996,12 @@ msgstr "El %d\\n%f va escriure el següent:\\n\\n%q\\n%X"
 
 #: src/prefs_common.c:322 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"
+"\\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"
 msgstr ""
 "\\n\\nInici del missatge reenviat:\\n\\n?d{Data: %d\\n}?f{Des de: %f\\n}?"
-"t{Per a: %t\\n}?c{Cc: %c\\n}?n{Grups de notícies: %n\\n}?s{Assumpte: %s"
-"\\n}\\n\\n%M"
+"t{Per a: %t\\n}?c{Cc: %c\\n}?n{Grups de notícies: %n\\n}?s{Assumpte: "
+"%s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
@@ -16384,7 +16259,7 @@ msgstr "Marcadors de missatge"
 # RML I think this is ambiguous:
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Marca"
@@ -16410,7 +16285,7 @@ msgstr "Marca com a bo"
 msgid "Execute"
 msgstr "Executa"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Etiqueta de color"
 
@@ -16425,7 +16300,7 @@ msgstr "Redirigeix"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Punts"
@@ -16605,7 +16480,7 @@ msgstr "Suprimeix la regla seleccionada de la llista"
 
 #: src/prefs_filtering.c:516
 msgid "Move the selected rule to the top"
-msgstr "Desplaça la regla seleccionada a l'inici"
+msgstr "Desplaça la regla seleccionada a dalt de tot"
 
 #: src/prefs_filtering.c:519
 msgid "Page u_p"
@@ -16700,8 +16575,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Columnes amagades"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Columnes visibles"
 
@@ -16767,11 +16642,11 @@ msgstr "Trieu un color per a la carpeta."
 
 #: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
-msgstr "Executa \"Processa regles\" a l'inici."
+msgstr "Executa les regles de processament en iniciar."
 
 #: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
-msgstr "Executa \"Processa regles\" en obrir."
+msgstr "Executa les regles de processament en obrir."
 
 #: src/prefs_folder_item.c:505
 msgid "Scan for new mail"
@@ -16906,7 +16781,7 @@ msgstr "Usa una lletra diferent per imprimir."
 msgid "Message Printing"
 msgstr "Missatge d'impressió"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Visualització"
@@ -17165,11 +17040,11 @@ msgstr "missatge complet"
 # RML I think this is ambiguous:
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "Marcat"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Suprimit"
 
@@ -17177,11 +17052,11 @@ msgstr "Suprimit"
 msgid "Replied"
 msgstr "Respost"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Reenviat"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Correu brossa"
@@ -17190,7 +17065,7 @@ msgstr "Correu brossa"
 msgid "Has attachment"
 msgstr "Té adjunts"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "Signat"
 
@@ -17702,7 +17577,7 @@ msgstr "Trieu un color per als blocs de línies."
 msgid "Hunk lines"
 msgstr "Bloc de línies"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Llista de carpetes"
 
@@ -17721,8 +17596,9 @@ msgid ""
 "Target folder is used when the option 'Execute immediately when moving or "
 "deleting messages' is turned off"
 msgstr ""
-"La carpeta de destinació s'usa quan l'opció \"Executa immediatament quan es "
-"desplacin o se suprimeixin missatges\" està desactivada."
+"Trieu un color per a la carpeta de destinació. Aquesta carpeta s'usa quan "
+"l'opció \"Executa immediatament quan es desplacin o se suprimeixin "
+"missatges\" està desactivada."
 
 #: src/prefs_msg_colors.c:370
 msgctxt "Tooltip and Dialog title"
@@ -17912,7 +17788,7 @@ msgstr "Usa un programa extern per rebre correu."
 
 #: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
-msgstr "Comprova si hi ha missatges nous a l'inici."
+msgstr "Comprova si hi ha missatges nous en iniciar."
 
 #: src/prefs_receive.c:218
 msgid "Dialogs"
@@ -18190,112 +18066,116 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "Correcció ortogràfica"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "el dia de la setmana abreviat"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "el dia de la setmana complet"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "el nom del mes abreviat"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "el nom del mes complet"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "la data i hora preferida per a la llengua actual"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "el número de segle (any/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes com a número decimal"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'hora com a número usant el rellotge de 24 hores"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'hora com a número usant el rellotge de 12 hores"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "el dia de l'any com a número decimal"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "el mes com a número decimal"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "el minut com a número decimal"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "el segon com a número decimal"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la setmana com a número decimal"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "la data preferida per a la llengua actual"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "els dos últims dígits de l'any"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "l'any com a número decimal"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "zona horària, nom o abreviatura"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Format de data"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Mostra el compte de missatges al costat del nom de la carpeta."
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Missatge sense llegir"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Missatges totals i sense llegir"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
-msgstr "Obre l'última carpeta oberta a l'inici"
+msgstr "Obre l'última carpeta oberta en iniciar."
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "Obre la carpeta seleccionada en iniciar."
+
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18303,99 +18183,99 @@ msgstr ""
 "Executa les regles de processament abans de marcar tots els missatges d'una "
 "carpeta com a llegits o no llegits."
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abrevia els noms de grup amb més de"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "lletres"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "Llista de missatges"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Bloqueja les capçaleres de les columnes"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Es mostra a la columna Des de"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Nom i adreça"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Ajuda del format de data"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Estableix la selecció de missatge en entrar en una carpeta."
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Obre sempre els missatges quan se seleccionin"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "Quan s'obri una carpeta"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "Quan es mostrin els resultats de la cerca"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Quan se seleccioni el missatge següent o l'anterior usant dreceres"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "Quan se suprimeixin o es desplacin missatges"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "Quan s'usin tecles direccionals"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Marca el missatge com a llegit"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "quan se seleccioni, després"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "només en obrir-lo o en respondre'l en una finestra nova"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostra el diàleg \"missatges no llegits (o nous)\""
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "Assumeix \"Sí\""
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "Assumeix \"No\""
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Mostra el remitent segons la llibreta d'adreces"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "Jerarquitza usant l'assumpte a més a més de les capçaleres estàndard"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executa immediatament quan es desplacin o se suprimeixin missatges"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18403,55 +18283,55 @@ msgstr ""
 "Quan no està seleccionat, desplaçar, copiar i suprimir missatges s'ajorna "
 "fins que useu Eines / Executa."
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr "Confirma marcar tots els missatges com a llegits o com a no llegits."
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Confirma canviar el color de les etiquetes."
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Mostra ajuda d'eines"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Predeterminats"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Carpetes noves"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Classifica per"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Nombre"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "Data del fil"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "No classifiquis"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Vista per fil"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Replega tots els fils"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Amaga els missatges llegits"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Sumaris"
 
@@ -18547,7 +18427,7 @@ msgstr "Mostra informació en configurar plantilles"
 
 #: src/prefs_template.c:362
 msgid "Move the selected template to the top"
-msgstr "Desplaça la plantilla seleccionada a l'inici"
+msgstr "Desplaça la plantilla seleccionada a dalt de tot"
 
 #: src/prefs_template.c:372
 msgid "Move the selected template up"
@@ -18629,7 +18509,7 @@ msgstr "Plantilles actuals"
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Tema intern per defecte"
 
@@ -18637,21 +18517,16 @@ msgstr "Tema intern per defecte"
 msgid "Themes"
 msgstr "Temes"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Suprimeix el tema de sistema \"%s\""
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Suprimeix el tema \"%s\""
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Segur que voleu suprimir aquest tema?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18660,24 +18535,24 @@ msgstr ""
 "Ha fallat el fitxer %s\n"
 "mentre se suprimia el tema."
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Ha fallat suprimir el directori del tema."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Tema suprimit correctament."
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Seleccioneu una carpeta de tema"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instal·la el tema \"%s\""
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18685,15 +18560,11 @@ msgstr ""
 "Sembla que aquesta carpeta no és de temes.\n"
 "Ho voleu instal·lar tanmateix?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "Voleu instal·lar el tema per a tots els usuaris?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "El tema ja existeix."
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18705,25 +18576,25 @@ msgstr ""
 "\n"
 "Voleu sobreescriure'l?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "No s'ha pogut suprimir el tema antic a %s."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "No s'ha pogut crear el directori de destinació %s."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "Tema instal·lat correctament."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "Ha fallat instal·lar el tema."
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18732,78 +18603,78 @@ msgstr ""
 "El fitxer %s ha fallat\n"
 "en instal·lar el tema."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Mostra totes les icones del tema"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d temes disponibles (%d d'usuari, %d de sistema, 1 d'intern)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "El tema intern té %d icones."
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "No hi ha cap fitxer d'informació per a aquest tema."
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Error: no es pot obtenir l'estat del tema"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d fitxers (%d icones), mida: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Selector"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Instal·la nou..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Obteniu-ne més..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Informació"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Autor"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Previsualitza"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Mostra-ho tot"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "Representació SVG"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "Habilita el canal alfa"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Força l'escalat"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "Píxels per polzada (PPI)"
 
@@ -18952,7 +18823,7 @@ msgstr "No s'ha establert cap clau de receptor."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error descodificant BASE64]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "No s'ha pogut descodificar la part"
 
@@ -19406,22 +19277,6 @@ msgstr ""
 "Hi ha hagut un error enviant el missatge:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Configuració de bústia"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Primer establiu la localització de la bústia.\n"
-"Podeu usar una bústia existent en format MH\n"
-"si ja en teniu una.\n"
-"Si no n'esteu segur, seleccioneu Accepta."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Font del missatge"
@@ -19700,92 +19555,92 @@ msgstr "Des de: %s, %s"
 msgid "To: %s, on %s"
 msgstr "Per a: %s, %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "No sou l'autor de l'article."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Realment voleu suprimir el missatge seleccionat?"
 msgstr[1] "Realment voleu suprimir els %d missatges seleccionats?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Suprimeix el missatge"
 msgstr[1] "Suprimeix els missatges"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "La destinació és la mateixa que la carpeta actual."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Seleccioneu una carpeta per desplaçar-hi el missatge seleccionat."
 msgstr[1] ""
 "Seleccioneu una carpeta per desplaçar-hi els missatges seleccionats."
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "La destinació de la còpia és la mateixa carpeta actual."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Seleccioneu una carpeta per copiar-hi el missatge seleccionat."
 msgstr[1] "Seleccioneu una carpeta per copiar-hi els missatges seleccionats."
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "Afegeix o sobreescriu"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Voleu afegir o sobreescriure el fitxer existent?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "_Afegeix"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "_Sobreescriu"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "No s'ha pogut desar el fitxer \"%s\"."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Esteu a punt d'imprimir %d missatges, un a un. Voleu continuar?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Construint els fils..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Salta't aquestes regles"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplica aquestes regles independentment del compte a què pertanyin"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplica aquestes regles si s'apliquen al compte actual"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Filtratge"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19793,75 +19648,75 @@ msgstr ""
 "Hi ha algunes regles de filtratge que pertanyen a un compte.\n"
 "Si us plau, trieu què s'ha de fer amb aquestes regles:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Filtrant..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Configuració de processament"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Realment voleu restablir l'etiqueta de color de tots els missatges "
 "seleccionats?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Realment voleu aplicar aquesta etiqueta de color a tots els missatges "
 "seleccionats?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Restableix el color de l'etiqueta"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Estableix l'etiqueta de color"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Fil ignorat"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Fil vist"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respost però també reenviat. Cliqueu per veure'n la resposta."
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Respost. Cliqueu per veure'n la resposta."
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "Per desplaçar"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "Per copiar"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "Signat, té adjunt(s)"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "Encriptat, té adjunt(s)"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Encriptat"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "Té adjunt(s)"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19870,11 +19725,11 @@ msgstr ""
 "Error de l'expressió regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Torna a la llista de carpetes (Teniu missatges sense llegir)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Torna a la llista de carpetes"
 
@@ -20593,8 +20448,8 @@ msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
-"Podeu especificar un camí absolut, per exemple: \"/home/joan/Documents/Correu"
-"\"."
+"Podeu especificar un camí absolut, per exemple: \"/home/joan/Documents/"
+"Correu\"."
 
 #: src/wizard.c:1106
 msgid ""
@@ -20733,127 +20588,3 @@ msgid ""
 msgstr ""
 "El Claws Mail ja està a punt.\n"
 "Feu clic a Desa per començar."
-
-#~ msgid "Move Email Addresses to or from Group with arrow buttons"
-#~ msgstr ""
-#~ "Desplaceu les adreces de correu des de / cap al grup amb les fletxes de "
-#~ "desplaçament."
-
-#~ msgid "Search the Web"
-#~ msgstr "Carca a la xarxa"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text"
-#~ msgstr "Trieu un color per al text de 1r nivell."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text"
-#~ msgstr "Trieu un color per al text de 2n nivell."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text"
-#~ msgstr "Trieu un color per al text de 3r nivell."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text background"
-#~ msgstr "Trieu el color per al fons del text de 1r nivell."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text background"
-#~ msgstr "Trieu el color per al fons del text de 2n nivell."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text background"
-#~ msgstr "Trieu el color per al fons del text de 3r nivell."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for links"
-#~ msgstr "Trieu un color per als enllaços."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for signatures"
-#~ msgstr "Trieu un color per a les signatures."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for folder"
-#~ msgstr "Trieu un color per a la carpeta."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for inserted lines"
-#~ msgstr "Trieu un color per a les línies inserides."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for removed lines"
-#~ msgstr "Trieu un color per a les línies suprimides."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for hunk lines"
-#~ msgstr "Trieu un color per als blocs de línies."
-
-#~ msgid "Select preset:"
-#~ msgstr "Selecciona la preconfiguració:"
-
-#~ msgid ""
-#~ "You can also modify each menu shortcut by pressing\n"
-#~ "any key(s) when focusing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Podeu modificar també cada drecera del menú prement\n"
-#~ "alguna/es tecla/es en situar el punter sobre l'element."
-
-#~ msgid "Enable customisable keyboard shortcuts"
-#~ msgstr "Habilita les dreceres de teclat personalitzables."
-
-#~ 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"
-#~ "Uncheck this option if you want to lock all existing keyboard shortcuts."
-#~ msgstr ""
-#~ "Si està marcat, podeu canviar les tecles de drecera de la majoria dels "
-#~ "elements del menú centrant-vos en l'element del menú i prement una "
-#~ "combinació de tecles.\n"
-#~ "Desmarqueu aquesta opció si voleu blocar totes les dreceres de teclat "
-#~ "existents."
-
-#~ msgid "A_dd"
-#~ msgstr "A_fegeix"
-
-#, c-format
-#~ msgid ""
-#~ "rule is account-based [id=%d, name='%s'], current account [id=%d, "
-#~ "name='%s']\n"
-#~ msgstr ""
-#~ "la regla està subjecta al compte [id=%d, name='%s']; compte actual [id="
-#~ "%d, name='%s']\n"
-
-#~ msgctxt "IPv6"
-#~ msgid ""
-#~ "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-#~ msgstr ""
-#~ "Afegeix support per a adreces IPv6, el nou protocol d'adreçament "
-#~ "d'Internet.\n"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be permanently deleted. Recovery "
-#~ "will not be possible.\n"
-#~ "\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Se suprimiran totes les carpetes i missatges que pengen de \"%s\". No es "
-#~ "podran recuperar.\n"
-#~ "\n"
-#~ "Voleu suprimir-ho definitivament?"
-
-#~ msgid "Skip"
-#~ msgstr "Omet"
-
-#~ msgid "Skip all"
-#~ msgstr "Omet-ho tot"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be deleted.\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Se suprimiran totes les carpetes i missatges sota \"%s\".\n"
-#~ "Realment voleu suprimir-ho?"
diff --git a/po/cs.po b/po/cs.po
index 2a2a68c80..a20964ff5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.10.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-11 10:26+0100\n"
-"PO-Revision-Date: 2022-10-11 19:52+0200\n"
+"POT-Creation-Date: 2023-11-13 16:14+0000\n"
+"PO-Revision-Date: 2023-11-14 16:45+0100\n"
 "Last-Translator: David Vachulka <archdvx at dxsolutions.org>\n"
 "Language-Team: Czech <cs at li.org>\n"
 "Language: cs\n"
@@ -53,8 +53,8 @@ msgstr "_Nový"
 msgid "Create a new account"
 msgstr "Vytvořit nový účet"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -66,8 +66,8 @@ msgstr "Nastavení pro vybraný účet"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -83,8 +83,8 @@ msgstr "_Smazat"
 msgid "Delete the selected account from the list"
 msgstr "Odstranit vybraný účet ze seznamu"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovat"
@@ -125,26 +125,26 @@ msgstr "Přesunout vybraný účet nahoru"
 msgid " _Set as default account "
 msgstr " Nastavit účet jako _výchozí "
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Zavřít"
@@ -159,53 +159,52 @@ msgstr ""
 msgid "Copy of %s"
 msgstr "Kopie %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Opravdu chcete odstranit účet '%s'?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Nepojmenovaný)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Odstranit účet"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -214,90 +213,90 @@ msgstr "Odstranit účet"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "_Odstranit"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 "Funkce 'Přijmout poštu ze všech účtů' načte zprávy z účtů označených "
 "zaškrtnutím"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Nelze načíst soubor %d se zprávou"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "Nelze načíst část zprávy."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Nemohu získat část ze zprávy o více částech: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -306,11 +305,11 @@ msgstr ""
 "V okně pro psaní zprávy nelze použít akci,\n"
 "která obsahuje %%f, %%F, %%as nebo %%p."
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "Není nastavena žádná akce filtrování"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -319,7 +318,7 @@ msgstr ""
 "Neplatná(é) filtrovací akce:\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -330,44 +329,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Spuštěno: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončeno: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Vstup/výstup akce"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "_Spustit"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "_Zastavit"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -378,11 +377,11 @@ msgstr ""
 "('%%h' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Skrytý uživatelský parametr akce"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -393,23 +392,23 @@ msgstr ""
 "('%%u' bude nahrazeno parametrem)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Uživatelský parametr akce"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Nelze kopírovat složku do sebe sama nebo do své vlastní podsložky."
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "Nelze kopírovat knihu adres do sebe sama."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Nelze přesunout složku do sebe sama nebo do své vlastní podsložky."
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Skupina"
@@ -482,40 +481,40 @@ msgstr ""
 "Opravdu chcete nahradit všechna jména atributů\n"
 "výchozím nastavením?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_Ne"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Ano"
 
@@ -554,31 +553,30 @@ msgstr "_Přidat"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_OK"
@@ -608,7 +606,7 @@ msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr "Claws Mail teď vyhledá duplikované emailové adresy v knize adres."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Najít"
@@ -622,7 +620,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplikovat emailovou adresu(y)"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adresa"
@@ -631,11 +629,11 @@ msgstr "Adresa"
 msgid "Address book path"
 msgstr "Cesta ke knize adres"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "Odstranit adresu(y)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete odstranit tuto adresu(y)?"
 
@@ -643,7 +641,7 @@ msgstr "Opravdu chcete odstranit tuto adresu(y)?"
 msgid "Delete address"
 msgstr "Odstranit adresu(y)"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Tato data jsou pouze pro čtení a nelze je odstranit."
 
@@ -655,7 +653,7 @@ msgstr "Přidat do knihy adres"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Poznámky"
@@ -664,7 +662,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro knihu adres"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "Přidat adresu(y)"
 
@@ -672,50 +670,50 @@ msgstr "Přidat adresu(y)"
 msgid "Can't add the specified address"
 msgstr "Nebylo možno přidat zadanou adresu"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "E-mail"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "_Kniha"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Nová _kniha"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "Nová _složka"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "Nová _vCard"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "Nový _JPilot"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "Přidat nový LDAP _server"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "Up_ravit knihu"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "_Odstranit knihu"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -723,189 +721,189 @@ msgstr "_Odstranit knihu"
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "Vybrat vš_e"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "Nová _adresa"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "Nová _skupina"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "Napsat novou _zprávu"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "Spo_jit"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "Importovat _LDIF soubor..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "Importovat _Mutt soubor..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "Importovat _Pine soubor..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "Exportovat _HTML..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "Exportovat LDI_F..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Najít duplikované..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Upravit uživatelské atributy..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "_Prohlížet záznam"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Neznámá(ý)"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Úspěch"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Špatné argumenty"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "Není zadán soubor"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Chyba při otevírání souboru"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Chyba při čtení souboru"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Byl dosažen konec souboru"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Chyba při alokaci paměti"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Špatný formát souboru"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Chyba při zápisu do souboru"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Chyba při otevírání adresáře"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "Není zadána cesta"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "Chyba při připojování na LDAP server"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "Chyba při inicializaci LDAP"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "Chyba při napojování na LDAP server"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "Chyba hledání v LDAP databázi"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "Při provádění operací s LDAP vypršel čas"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "Chyba ve vyhledávacích kritériích pro LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "Pro vyhledávací kritéria nebyly nalezeny žádné položky"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "Prohledávání ukončeno na žádost"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "Chyba při vytváření STARTTLS spojení"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Rozlišovací jméno (dn) chybí"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Schází požadované informace"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "Pod tímto klíčem je již existující kontakt"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "Vyžadována silnější autentizace"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Zdroje adres"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Hledání"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Odstranit skupinu"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -913,26 +911,26 @@ msgstr ""
 "Chcete odstranit skupinu (skupiny)?\n"
 "Adresy v ní (v nich) obsažené budou ztraceny."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Nelze vložit. Cílová kniha adres je pouze pro čtení."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Nelze provést vložení do skupiny adres."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Opravdu chcete odstranit výsledky vyhledávání a adresy v '%s'?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -941,20 +939,20 @@ msgstr ""
 "Chcete odstranit '%s'? Pokud odstraníte pouze složku, adresy v ní obsažené "
 "budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Odstranit složku"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Odstranit pouze _složku"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Odstranit složku a _adresy"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -963,7 +961,7 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -972,28 +970,28 @@ msgstr ""
 "Chcete odstranit '%s'?\n"
 "Adresy v ní obsažené budou ztraceny."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Hledání '%s'"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Nový kontakt"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit index soubor."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s knihou adres."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Konverze staré knihy adres proběhla úspěšně."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -1001,7 +999,7 @@ msgstr ""
 "Stará kniha adres zkonvertována,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1009,7 +1007,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "ale byl vytvořen nové prázdné soubory knihy adres."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1017,7 +1015,7 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres,\n"
 "nepodařilo se uložit nový soubor s indexem adres."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1025,52 +1023,52 @@ msgstr ""
 "Nepodařilo se provést konverzi knihy adres\n"
 "a nepodařilo se vytvořit nové soubory knihy adres."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Chyba při konverzi knihy adres"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Chyba v knize adres"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Prohledávám..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Kniha adres"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "LDAP servery"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "LDAP dotaz"
 
@@ -1154,42 +1152,42 @@ msgstr "Získat adresy z vybraných zpráv"
 msgid "Collect email addresses from folder"
 msgstr "Získat adresy ze složky"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Obecné adresy"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Osobní adresy"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Obecná adresa"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Aktualizace adres"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizace selhala. Změny do slovníku nebyly zapsány."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Chyba"
@@ -1308,7 +1306,7 @@ msgstr "Vaše verze Claws Mail je příliš stará na použití s modulem '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaše verze Claws Mail je příliš stará na použití s tímto modulem."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "TLS vyjednávání selhalo\n"
 
@@ -1328,7 +1326,7 @@ msgstr "špatná SMTP odpověď\n"
 msgid "error occurred on SMTP session\n"
 msgstr "nastala chyba v SMTP relaci\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "nastala chyba v autentizaci\n"
 
@@ -1337,7 +1335,7 @@ msgstr "nastala chyba v autentizaci\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Zpráva je příliš velká (maximální velikost je %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "nelze spustit STARTTLS relaci\n"
 
@@ -1474,212 +1472,212 @@ msgstr "%d.%02dMiB"
 msgid "%.2fGiB"
 msgstr "%.2fGiB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondělí"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Leden"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Únor"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Březen"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Duben"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Květen"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Červen"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Červenec"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Srpen"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Září"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Říjen"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Prosinec"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Út"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Čt"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pá"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Led"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Úno"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Bře"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Dub"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Kvě"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Čen"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Čvc"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Srp"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Zář"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Říj"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Lis"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Pro"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp"
@@ -1696,426 +1694,426 @@ msgstr ""
 "\n"
 "Podepisování a šifrování není povoleno pro tuto zprávu."
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "_Pravopis"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "Nastav_ení"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "_Odeslat"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Poslat _později"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "Připojit _soubor"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "_Vložit soubor"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "Vložit p_odpis"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "Na_hradit podpis"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "_Tisk"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Z_novu"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "_Vložit jinak"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Jako _citaci"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vybrat vš_e"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "Po_kročilé"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "Přesun o znak zpět"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "Přesun o znak dále"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "Přesun o slovo zpět"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "Přesun o slovo dále"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "Přesun na začátek řádku"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "Přesun na konec řádku"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "Přesun na předchozí řádek"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "Přesun na další řádek"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Smazat znak zpět"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Smazat znak vpřed"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Smazat slovo zpět"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Smazat slovo vpřed"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Smazat řádek"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Smazat do konce řádku"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "_Zalomit aktuální odstavec"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Zalomit všechny _dlouhé řádky"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "Upravit e_xterním editorem"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "_Zkontrolovat vše nebo výběr"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "Z_výraznit nesprávná slova"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "Přejít na _předchozí chybu"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "Přejít na _následující chybu"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "_Mód odpovědi"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "Systém _zabezpečení"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Kniha adres"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_O programu"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamování"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Automatické _odsazení"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "Po_depsat"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "Ši_frovat"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "_Vyžadovat potvrzení o doručení"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "Odstranit reference"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Zobrazit _pravítko"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Odesílateli"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "Kon_ference"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "_Nejvyšší"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "Vy_soká"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "Ní_zká"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bitové ASCII (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Chyba ve formátu pole Od nové zprávy."
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Chyba v předmětu šablony nové zprávy."
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Napsat\" na řádku %d."
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Není možno odpovědět. Originální email pravděpodobně neexistuje."
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "Pole \"Od\" v šabloně \"Odpovědět\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Odpovědět\" na řádku %d."
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" v šabloně \"Předat\" obsahuje neplatnou emailovou adresu."
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Předat\" na řádku %d."
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Fw: vice zprav"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Chyba v těle šablony \"Přesměrovat\" na řádku %d."
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračování:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovědi komu:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nepodařilo se připojit soubor (konverze znakové sady se nezdařila)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2133,73 +2131,73 @@ msgstr[2] ""
 "Následující soubory byly připojeny: \n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Značka pro citaci\" v šabloně je neplatná."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemohu získat velikost souboru '%s'."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Prázdný soubor"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "_Přesto přiložit"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[žádný předmět] - Psaní zprávy%s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napsat zprávu"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2207,62 +2205,62 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Jediný adresát je výchozí %s příjemce. Opravdu odeslat?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Předmět je prázdný.  %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Přesto odeslat?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Opravdu zařadit do fronty?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "_Fronta"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Posílám %d příjemcům. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "Zprávu nelze uložit do fronty pro odeslání."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2273,7 +2271,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2284,7 +2282,7 @@ msgstr ""
 "\n"
 "Podepisování se nezdařilo: %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2295,7 +2293,7 @@ msgstr ""
 "\n"
 "Šifrování selhalo: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2305,7 +2303,7 @@ msgstr ""
 "\n"
 "Konverze znakové sady se nezdařila."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2315,7 +2313,7 @@ msgstr ""
 "\n"
 "Nepodařilo se získat šifrovací klíč příjemce."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2323,16 +2321,17 @@ msgstr ""
 "Zpráva byla uložena do fronty ale nemohla být odeslána.\n"
 "Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Použijte nabídku \"Odeslat pozdržené zprávy \" z hlavního okna."
+"Můžete zkusit znovu \"Odeslat\" nebo zařadit do fronty pomocí \"Poslat "
+"později\""
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2343,7 +2342,7 @@ msgstr ""
 "na %s.\n"
 "Odeslat v kódování %s?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2356,100 +2355,104 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Varování šifrování"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "_Pokračovat"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "Není dostupný žádný účet pro odeslání pošty!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Vybraný účet není NNTP: Odeslání není možné."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Zrušit koncept"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Ignorovat přílohu"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Část originálu %s"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Přidat do knihy adres"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Smazat obsah pole"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "Uložit zprávu do "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "P_rocházet"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "Vybrat složku pro uložení zprávy"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "_Záhlaví"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Přílohy"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Ostatní"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Pře_dmět:"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2458,19 +2461,19 @@ msgstr ""
 "Nelze spustit kontrolu pravopisu.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "_Od:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Účet použitý pro tuto zprávu"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Adresa odesílatele musí být uvedena"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2479,50 +2482,50 @@ msgstr ""
 "Systém zabezpečení '%s' se nepodařilo načíst. Nebudete moci digitálně "
 "podepsat nebo šifrovat zprávu."
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "Žá_dné"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Chyba v těle šablony na řádku %d."
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Chyba formátu %s šablony."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2531,12 +2534,12 @@ msgstr ""
 "Nepodařilo se zapsat tělo do souboru:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr "Komunikace pomocí socketu s externím editorem není ve Windows možná."
 
-#: src/compose.c:9710
+#: src/compose.c:9702
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2547,21 +2550,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Externí editor ukončen s chybou: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "id procesu: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "id procesu: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2572,19 +2570,19 @@ msgstr ""
 "Mám přerušit proces?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl odeslat tuto zprávu."
 
-#: src/compose.c:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2592,24 +2590,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2618,59 +2616,50 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Zpráva byla modifikována. Chcete uložit poslední změny?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"Velikost vkládaného textu přesahuje limit (%dKiB) pro vložení.\n"
-"Přiložte místo toho jako soubor."
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2688,20 +2677,20 @@ msgstr[2] ""
 "Chcete obsah %d souborů vložit do textu zprávy nebo soubory připojit ke "
 "zprávě jako přílohu?"
 
-#: src/compose.c:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2919,7 +2908,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Soubor"
 
@@ -2964,12 +2953,12 @@ msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Nová složka"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -2997,13 +2986,13 @@ msgstr "Přidat nový JPilot záznam"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editace LDAP - Vyberte bázi pro hledání"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Název počítače"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3063,7 +3052,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3229,8 +3218,8 @@ msgstr ""
 "Heslo, které bude použito pro připojení spolu s údajem \"Přihlašovací "
 "jméno\"."
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Zobrazit heslo"
@@ -3252,11 +3241,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximální počet položek, které budou vráceny při prohledávání."
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Server"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Ostatní"
 
@@ -3274,8 +3263,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "Změnit značky"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Značka"
 
@@ -3402,15 +3391,15 @@ msgstr "Výstupní HTML soubor"
 msgid "B_rowse"
 msgstr "_Procházet"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Šablona stylu"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Žádná"
 
@@ -3660,7 +3649,7 @@ msgstr "Exportovat knihu adres do LDIF souboru"
 msgid "Distinguished Name"
 msgstr "Rozlišovací jméno (dn)"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "Exportovat do mbox souboru"
 
@@ -3935,61 +3924,61 @@ msgstr ""
 "filtrování zprávy (%s%s%s)\n"
 "%ssoubor zprávy: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Koš"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Zpracovávám (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopíruji %s do %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Přesouvám %s do %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizuji vyrovnávací paměť pro %s..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "Zpracovávám zprávy..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizuji %s pro použití offline...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Jméno složky nemůže začínat nebo končit tečkou."
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "Jméno složky nemůže končit tečkou."
 
@@ -3998,7 +3987,7 @@ msgid "Select folder"
 msgstr "Vybrat složku"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "Nová složka"
 
@@ -4009,99 +3998,103 @@ msgstr "Zdědit vlastnosti a pravidla zpracování z rodičovské složky"
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' nemůže být obsaženo ve jméně složky."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nemohu vytvořit složku '%s'."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "Označit všechny jako _přečtené"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Označit všechny jako _nepřečtené"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Označit všechny jako přečtené rekurzi_vně"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Označit všechny jako nepřečtené rek_urzivně"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "S_pustit pravidla zpracování"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Otevřít po spuštění"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "_Zpracování..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "Vyprázdnit _koš..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Odeslat _frontu..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Nastavit Zobrazované sloupce"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Nové"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Celkem"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Označit všechny jako přečtené"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4109,15 +4102,15 @@ msgstr ""
 "Opravdu chcete označit všechny maily v této složce a jejích podsložkách jako "
 "přečtené?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Opravdu chcete označit všechny zprávy v této složce jako přečtené?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Označit všechny jako nepřečtené"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
@@ -4125,95 +4118,95 @@ msgstr ""
 "Opravdu chcete označit všechny maily v této složce a jejích podsložkách jako "
 "nepřečtené?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Opravdu chcete označit všechny zprávy v této složce jako nepřečtené?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovení stromu složek vyčistí všechny lokální vyrovnávací paměti. Chcete "
 "pokračovat?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Prohledávám strom složek..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nepodařilo se načíst obsah adresáře %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zavírám složku %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otevírám složku %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Odstranit všechny zprávy v koši?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Pracujete v režimu offline. Přepnout?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Odeslat pozdržené zprávy"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Odeslat všechny zprávy ve frontě pozdržených zpráv?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Při posílání pozdržených zpráv nastala stejná chyba."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4222,64 +4215,64 @@ msgstr ""
 "Při odesílání pozdržených zpráv nastala chyba:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Opravdu chcete složku '%s' zkopírovat do '%s'?"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Opravdu chcete složku '%s' učinit podsložkou složky '%s'?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Kopírovat složku"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Přesunout složku"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopíruji %s do %s..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Přesouvám %s do %s..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "Zdroj i cíl jsou totožné."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "Nelze kopírovat složku do své vlastní podsložky."
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "Nelze přesunout složku do své vlastní podsložky."
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Složka nemůže být přesouvána mezi různými poštovními schránkami."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "Kopírování se nezdařilo!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "Přesun se nezdařil!"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Zpracování složky - pravidla pro složku %s"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Cílová složka může být použita pouze k uložení podsložek."
 
@@ -4324,8 +4317,8 @@ msgid "read-only"
 msgstr "pouze pro čtení"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "neznámý"
 
@@ -4363,13 +4356,13 @@ msgstr ""
 "Claws Mail je volně šiřitelný software distribuovaný pod licencí GPL. Pokud "
 "chcete přispět na projekt Claws Mail, můžete tak učinit na:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "a Hiroyuki Yamamoto"
 
@@ -4404,7 +4397,7 @@ msgstr ""
 "Lokalizace: %s (znaková sada: %s)\n"
 "Operační systém: neznámý"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Tým Claws Mail"
 
@@ -4525,73 +4518,78 @@ msgstr ""
 "Kopii GNU General Public License byste měli obdržet společně s tímto "
 "programem. Pokud ne, viz. "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Statistiky relace\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Spuštěno: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Příchozí provoz\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Přijaté zprávy: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "Zprávy označené jako spam: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Odchozí provoz\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/přesměrované zprávy: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Zodpovězené zprávy: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Přeposlané zprávy: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Celkem odchozích zpráv: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "_Informace"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Autoři"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Licence"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "_Poznámky k verzi"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "_Statistiky"
 
@@ -4798,7 +4796,7 @@ msgid "Configuring..."
 msgstr "Nastavování..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Datum"
@@ -4807,9 +4805,9 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "Od"
@@ -4830,9 +4828,9 @@ msgstr "Odesílatel:"
 msgid "Reply-To"
 msgstr "Odpovědět komu"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Komu"
@@ -4868,9 +4866,9 @@ msgstr "References"
 msgid "References:"
 msgstr "References:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Předmět"
@@ -4880,7 +4878,7 @@ msgstr "Předmět"
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Komentáře"
 
@@ -4994,8 +4992,8 @@ msgid "Seen:"
 msgstr "Zobrazen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Stav"
@@ -5068,7 +5066,7 @@ msgstr "Priorita"
 msgid "Precedence:"
 msgstr "Priorita:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Organizace"
 
@@ -5387,9 +5385,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5403,7 +5400,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5418,7 +5415,7 @@ msgstr "_Zavést..."
 msgid "_Unload"
 msgstr "_Odebrat"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Popis"
 
@@ -5441,8 +5438,8 @@ msgid "Loaded plugins"
 msgstr "Zavedené moduly"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "_Použít"
 
@@ -5455,10 +5452,10 @@ msgid "_Hide"
 msgstr "_Skrýt"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Účet"
@@ -5528,17 +5525,17 @@ msgid "forwarded messages"
 msgstr "přeposlané zprávy"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "zprávy, které mají přílohy"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "zprávy obsahující S ve jméně nebo hodnotě záhlaví"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "zprávy obsahující S v hodnotě záhlaví"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "zprávy, které mají přílohy"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "zprávy obsahující S v záhlaví \"Message-ID\""
@@ -5628,18 +5625,18 @@ msgid "unread messages"
 msgstr "nepřečtené zprávy"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "zprávy obsahující V v záhlaví H"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "zprávy obsahující S v záhlaví \"References\""
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "zprávy vracející 0, jsou-li předány příkazu - %F je soubor se zprávou"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "zprávy obsahující S v záhlaví \"X-Label\""
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "logický operátor A (AND)"
@@ -5685,55 +5682,55 @@ msgstr ""
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Něco selhalo během hledání. Prosím zkontrolujte záznamy."
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Komu/Kopie/Předmět/Značka"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Včetně podsložek"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Zachovat i při změně složky"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Vyhledávat během psaní"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Spustit na vybrané"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "Vyč_istit"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Odstranit nastavenou podmínku"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Upravit vyhledávací kritéria"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Informace"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Informace o rozšířených možnostech vyhledávání"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "U_pravit"
 
@@ -5912,16 +5909,16 @@ msgstr "(Žádný předmět)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Název souboru:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Velikost souboru:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Načíst obrázek"
 
@@ -6111,7 +6108,7 @@ msgstr "TLS chyba"
 msgid "Unknown error [%d]"
 msgstr "Neznámá chyba [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6123,7 +6120,7 @@ msgstr ""
 "Přihlášení pomocí CRAM-MD5 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul CRAM-MD5 SASL."
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6135,7 +6132,7 @@ msgstr ""
 "Přihlášení pomocí DIGEST-MD5 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul DIGEST-MD5 SASL."
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6147,7 +6144,55 @@ msgstr ""
 "Přihlášení pomocí SCRAM-SHA-1 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
 
-#: src/imap.c:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Přihlášení pomocí SCRAM-SHA-224 pracuje pouze pokud byl libetpan zkompilován "
+"s podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Přihlášení pomocí SCRAM-SHA-256 pracuje pouze pokud byl libetpan zkompilován "
+"s podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Přihlášení pomocí SCRAM-SHA-384 pracuje pouze pokud byl libetpan zkompilován "
+"s podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Přihlášení pomocí SCRAM-SHA-512 pracuje pouze pokud byl libetpan zkompilován "
+"s podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6159,7 +6204,7 @@ msgstr ""
 "Přihlášení pomocí PLAIN pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul PLAIN SASL."
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6171,7 +6216,7 @@ msgstr ""
 "Přihlášení pomocí LOGIN pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul LOGIN SASL."
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6181,37 +6226,37 @@ msgstr ""
 "\n"
 "OAuth2 chyba. Zkontrolujte a opravte nastavení OAuth2 účtu."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Připojení k %s selhalo: přihlášení odmítnuto.%s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Připojení k %s selhalo: přihlášení odmítnuto.%s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Připojení k %s selhalo"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP spojení s %s bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail potřebuje přístup k síti, aby mohl přistupovat k IMAP serveru."
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6224,108 +6269,108 @@ msgstr ""
 "\n"
 "Chcete pokračovat v připojování k serveru? Komunikace nebude zabezpečena."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "_Pokračovat v připojování"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na IMAP server: %s:%d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemohu se spojit s IMAP serverem: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP serverem: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nelze spustit STARTTLS relaci.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "Hledání selhalo kvůli chybě serveru."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vyžaduje STARTTLS pro přihlášení.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6334,20 +6379,24 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje STARTTLS, ale Claws Mail je "
 "zkompilován bez podpory STARTTLS.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Mazání odstraněných zpráv..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6377,7 +6426,7 @@ msgid "Cop_y folder..."
 msgstr "Z_kopírovat složku..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "_Odstranit složku..."
 
@@ -6397,7 +6446,7 @@ msgstr "_Odebírání"
 msgid "_Subscribe..."
 msgstr "_Odebírat..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "_Odhlásit..."
 
@@ -6429,21 +6478,21 @@ msgstr ""
 "pouze podsložky a žádné zprávy, přidejte nakonec názvu '/')"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadejte nové jméno pro '%s':"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6462,7 +6511,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "Vybrat složku pro kopírování složky '%s'"
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6476,8 +6525,8 @@ msgstr ""
 "Chcete je opravdu odstranit?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
@@ -6784,8 +6833,8 @@ msgstr "Spojení selhalo"
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Zamknuto"
 
@@ -6958,8 +7007,8 @@ msgstr "Začleňování zrušeno\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "sekund"
 
@@ -7024,7 +7073,7 @@ msgstr "LDAP chyba (hledání): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Přezdívka"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7033,7 +7082,7 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7042,7 +7091,7 @@ msgstr ""
 "Byla nalezena konfigurace pro %s.\n"
 "Chcete převést tuto konfiguraci?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7055,11 +7104,11 @@ msgstr ""
 "Vaše pravidla filtrování Sylpheed mohou být převedena pomocí\n"
 "skriptu dostupného na %s."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Ponechat původní nastavení"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7070,27 +7119,27 @@ msgstr ""
 "pro IMAP nebo diskuzní skupiny. Záloha také vyžaduje určité místo na vašem "
 "disku."
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Převedení konfigurace"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopíruji konfiguraci... Může to chvíli trvat..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Převedení selhalo!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Převádím konfiguraci..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(nebo starší)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7110,7 +7159,7 @@ msgstr[2] ""
 "Následující zásuvné moduly se nepodařilo načíst. Zkontrolujte nastavení.\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7120,7 +7169,7 @@ msgstr ""
 "Pravděpodobně chyba IMAP účtu. Použijte \"Obnovit strom složek\" v menu "
 "rodičovské složky pro opravu."
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7129,76 +7178,76 @@ msgstr ""
 "Claws Mail nalezl schránku, ale nemohl ji načíst. Pravděpodobně pochází od "
 "zastaralého externího modulu. Prosím přeinstalujte modul a zkuste to znovu."
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Chybějící jméno souboru\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "Nepodařilo se otevřít soubor pro čtení\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Poškozená hlavička\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička 'To:'\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "Chybějící požadovaná hlavička 'To:'\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Zkuste -h nebo --help pro zobrazení platných.\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Schází argument souboru pro volbu %s"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Schází nebo je prázdný uri argument pro volbu %s"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Schází uri argument pro volbu %s"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "Schází nejméně jeden neprázdný argument souboru pro volbu %s"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "Schází složka, typ a požadovaný argument pro volbu %s"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Schází typ a požadovaný argument pro volbu %s"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Schází požadovaný argument pro volbu %s"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]             otevře okno pro psaní nové zprávy"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7217,12 +7266,12 @@ msgstr ""
 "do\n"
 "                         prázdné řádky, pak tělo do konce souboru."
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe uri        přihlásí se k odběru zadaného URI pokud to lze"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7232,7 +7281,7 @@ msgstr ""
 "                         otevře okno pro psaní zprávy s připojeným\n"
 "                         souborem(y)"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7242,23 +7291,23 @@ msgstr ""
 "                         otevře okno pro psaní zprávy s vloženým\n"
 "                         souborem(y)"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive                      načte nové zprávy"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all                  načte nové zprávy ze všech účtů"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zrušit přijímání zpráv"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zrušit odesílání zpráv"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7277,15 +7326,15 @@ msgstr ""
 "                         rekurzivně: nepravda když argument startuje s 0, n, "
 "N, f nebo F"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                         pošle všechny pozdržené zprávy"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [složka]...           zobrazit celkový počet zpráv"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7293,15 +7342,15 @@ msgstr ""
 "  --status-full [složka]...\n"
 "                         zobrazí status každé složky"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí statistiky relace"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     resetuje statistiky relace"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7311,46 +7360,46 @@ msgstr ""
 "                         složka je id složky, např. 'složka/podsložka', "
 "file:// nebo absolutní cesta"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online                       přejde do online režimu"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                      přejde do offline režimu"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit  --quit -q                       ukončí Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             režim trasování"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug                        přepne režim trasování"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              vypíše tuto nápovědu a skončí"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           vypíše informace o verzi a skončí"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      vypíše informace o verzi a vestavěných vlastnostech "
 "a skončí"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                   vypíše název adresáře s konfigurací"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7358,7 +7407,7 @@ msgstr ""
 "  --alternate-config-dir adresář\n"
 "                  použije zadaný adresář s konfigurací"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7366,48 +7415,48 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         nastaví polohu a velikost hlavního okna"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Schází argument adresáře pro volbu %s"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Schází argument geometrie pro volbu %s"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Schází argument složky pro volbu %s"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Neznámá volba %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Zpracovávám (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "nejvyšší složka v hierarchii"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: network is online.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
@@ -7591,11 +7640,11 @@ msgstr "Následující nepřečtená _složka"
 msgid "F_older..."
 msgstr "Sl_ožka..."
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Další část"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Předchozí část"
 
@@ -7837,7 +7886,7 @@ msgstr "Zn_ačky"
 msgid "Re-_edit"
 msgstr "Znovu _upravit"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "Zkontrolovat podpis"
 
@@ -8042,7 +8091,7 @@ msgstr "Záhlaví sloupců"
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
@@ -8050,7 +8099,7 @@ msgstr "Skrýt přečtená vlákna"
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
@@ -8162,11 +8211,11 @@ msgstr "Podle zamknuto"
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "Sestupně"
 
@@ -8174,7 +8223,7 @@ msgstr "Sestupně"
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Upravit značky..."
 
@@ -8215,7 +8264,7 @@ msgstr "protokolování filtrů vypnuto\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Neoznačený"
 
@@ -8223,19 +8272,19 @@ msgstr "Neoznačený"
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Přidat schránku"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8249,18 +8298,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka '%s' již existuje."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8270,51 +8319,51 @@ msgstr ""
 "Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva pro "
 "zápis."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "_Ukončit"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "_Synchronizovat"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Žádná duplicitní zpráva ve vybrané složce.\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8322,7 +8371,7 @@ msgstr[0] "Odstraněna %d duplicitní zpráva ve vybrané složce.\n"
 msgstr[1] "Odstraněny %d duplicitní zprávy ve vybrané složce.\n"
 msgstr[2] "Odstraněno %d duplicitních zpráv ve vybrané složce.\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, 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"
@@ -8330,11 +8379,11 @@ msgstr[0] "Označit %d duplicitní zprávu ve vybrané složce.\n"
 msgstr[1] "Označit %d duplicitní zprávy ve vybrané složce.\n"
 msgstr[2] "Označit %d duplicitních zpráv ve vybrané složce.\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Vymazávám duplikované zprávy ve všech složkách..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8342,47 +8391,47 @@ msgstr[0] "Odstraněna %d duplicitní zpráva v %d složkách.\n"
 msgstr[1] "Odstraněny %d duplicitní zprávy v %d složkách.\n"
 msgstr[2] "Odstraněno %d duplicitních zpráv v %d složkách.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Žádné duplicitní zprávy v %d složkách.\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Vybrat složku pro přejití"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Zpracování složky - pravidla prováděná před pravidly složky"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Nemohu zaregistrovat jako výchozí klient: není možné získat cestu."
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nemohu zaregistrovat jako výchozí klient: není možné zapisovat do registrů."
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8390,52 +8439,52 @@ msgstr[0] "Zapomenuté %d heslo pro %d účty.\n"
 msgstr[1] "Zapomenutá %d hesla pro %d účty.\n"
 msgstr[2] "Zapomenutých %d hesel pro %d účty.\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "%s záhlaví"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "záhlaví"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "řádka záhlaví"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "řádek těla"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "značka"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zkontrolovat jestli zpráva odpovídá [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "zpráva odpovídá\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "zpráva neodpovídá\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(žádný)"
 
@@ -8473,7 +8522,7 @@ msgstr "Přepsat mbox soubor"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento soubor již existuje. Chcete ho přepsat?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Přepsat"
 
@@ -8701,8 +8750,8 @@ msgstr ""
 "\n"
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
@@ -8742,63 +8791,67 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Odstranit schránku"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "Otevřít čím..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "Odeslat..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "Zobrazit jako text"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "Uložit j_ako..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "Uložit _vše..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Uložit všechny přílohy..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "MIME Typ"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Zobrazit úplnou informaci"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Zkontrolovat znovu"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "Stiskněte ikonu %s pro zkontrolování."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "Stiskněte ikonu %s nebo '%s' pro zkontrolování."
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Vypršel časový limit pro kontrolu podpisu. Stiskněte ikonu pro nový pokus."
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8806,36 +8859,36 @@ msgstr ""
 "Vypršel časový limit pro kontrolu podpisu. Stiskněte ikonu nebo '%s' pro "
 "nový pokus."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr "Chyba při kontrole podpisu. Stiskněte ikonu pro nový pokus."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr "Chyba při kontrole podpisu. Stiskněte ikonu nebo '%s' pro nový pokus."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "Kontroluji podpis..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Přepsat existující soubor '%s'?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
 #, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
@@ -8844,19 +8897,19 @@ msgstr ""
 "Nastala chyba při ukládání části zprávy %d. Chcete ukládání zrušit nebo "
 "přeskočit chybu a pokračovat?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "Chyba při ukládání části zprávy"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "Ignorovat vše"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8864,7 +8917,7 @@ msgstr[0] "%d soubor úspěšně uložen."
 msgstr[1] "%d soubory úspěšně uloženy."
 msgstr[2] "%d souborů úspěšně uloženo."
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8872,7 +8925,7 @@ msgstr[0] "%d soubor úspěšně uložen"
 msgstr[1] "%d soubory úspěšně uloženy"
 msgstr[2] "%d souborů úspěšně uloženo"
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8880,26 +8933,26 @@ msgstr[0] "%s, %d soubor selhal."
 msgstr[1] "%s, %d soubory selhaly."
 msgstr[2] "%s, %d souborů selhalo."
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Vybrat cílovou složku"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' není adresář."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8908,7 +8961,7 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8919,11 +8972,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Spustit nedůvěryhodný binární soubor?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8935,20 +8988,20 @@ msgstr ""
 "\n"
 "Chcete ho spustit?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "Spustit binární soubor"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9060,88 +9113,88 @@ msgstr "Odhlásit diskusní skupinu"
 msgid "Rename newsgroup folder"
 msgstr "Přejmenovat složku diskuzní skupiny"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 - chybějící autorizační kód\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 - chyba spojení\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "Chyba připojení OAuth2 TLS\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2 - přístupový token získán\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2 - přístupový token nebyl získán\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2 - obnovený token získán\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2 - obnovený token nebyl získán\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "OAuth2 - obnovený token získán\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "OAuth2 - obnovený token nebyl získán\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 - chyba při psaní do soketu\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 - chyba soketu, vypršení času\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 - přístupový stále aktuální\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 - získání přístupového tokenu použitím obnovením tokenu\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 - pokus o aktuální token s autorizačním kódem\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 - přístupový token updatován\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 originál: %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 kódováno: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
 "\n"
 msgstr "OAuth2 dekódováno: %s\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Vložit hlavní heslo"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Nesprávná hlavní heslo."
 
@@ -9557,7 +9610,7 @@ msgstr "Ano"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Ne"
 
@@ -9574,7 +9627,7 @@ msgid "Delete selected files"
 msgstr "Smazat vybrané soubory"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Vybrat maily před"
 
@@ -9587,97 +9640,97 @@ msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Vyberte jméno archivu [přípona by měla odpovídat archivu jako např. .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Vytvořit archiv"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Vložte argumenty archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Složka pro archivaci"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Složka, která bude hlavní v archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Vyberte složku, která bude hlavní v archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Jméno archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Umístění a jméno archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Vybrat"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr "Vyberte jméno a umístění archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Vyberte kompresi"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Vyberte tuto možnost pro používání %s komprese pro archivy"
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Vyberte formát"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Vyberte tuto možnost pro používání %s formátu pro archivy"
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Různé volby"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Rekurzivně"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Vyberte tuto možnost pro vkládání podsložek do archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9687,11 +9740,11 @@ msgstr ""
 "Uvědomte si, že to dramaticky zvýší čas\n"
 "potřebný pro vytvoření archivu"
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "Pře_jmenovat"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9702,7 +9755,7 @@ msgstr ""
 "Schéma pro pojmenování: datum_od at komu@předmět.\n"
 "Jména bude oříznuty na maximálně 96 znaků"
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9710,11 +9763,11 @@ msgstr ""
 "Vyberte tuto možnost pro mazání mailů po archivaci\n"
 "Funguje jen IMAP4, lokálním mboxem a POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Volby výběru"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9806,7 +9859,7 @@ msgstr "Odebrat přílohy"
 msgid "Remove"
 msgstr "Odstranit"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Příloha"
@@ -9968,19 +10021,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Vyloučit"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -9990,15 +10043,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Kterákoliv"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: stahuji těla zpráv..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtruji zprávy..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -10010,7 +10063,7 @@ msgstr ""
 "Pomocí \"/Označit/Označit jako spam\" a \"/Označit/Mark jako ne spam\" "
 "trénujte Bogofilter s několika stovkami spam a ne spam zprávami."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -10019,21 +10072,21 @@ msgstr ""
 "Zásuvný modul Bogofilter nemohl filtrovat zprávy. Příkaz `%s %s %s` nemohl "
 "být spuštěn."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: učím se ze zprávy..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Učení selhalo; `%s` vrácen se stavem %d."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: učím se ze zpráv..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10042,7 +10095,7 @@ msgstr ""
 "Učení selhalo; `%s %s %s` vráceno s chybou:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10069,13 +10122,13 @@ msgstr ""
 "\n"
 "Nastavení v /Nastavení/Volby/Zásuvné moduly/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Rozpoznávání spamu"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Učení se rozpoznávat spam"
 
@@ -10099,7 +10152,7 @@ msgstr "Zprávy větší než tato velikost nebudou kontrolovány"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "KiB"
 
@@ -10205,19 +10258,19 @@ msgstr "Cesta k bogofilter"
 msgid "Mark spam as read"
 msgstr "Označit spam jako přečtený"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: získávám tělo..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtruji zprávu..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10229,18 +10282,18 @@ msgstr ""
 "Použijte \"/Označit/Označit jako spam\" a \"/Označit/Označit jako ne spam\" "
 "pro trénink Bsfilter s několika stovkami spamových a nespamových zpráv."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr "Bsfilter nemůže filtrovat zprávy. Příkaz `%s` nemohl být spuštěn."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: učení ze zprávy..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10578,65 +10631,52 @@ msgstr ""
 "\n"
 "Modul je zcela neužitečný."
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Zobrazovat obrázky"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Zobrazovat vložené obrázky"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Povolit Javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Spouštět vložený javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Spouštět Java applety"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Spouštět vložené Java applety"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Renderovat objekty pomocí zásuvných modulů"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Renderovat vložené objekty pomocí zásuvných modulů"
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Otevřít v prohlížeči (vzdálený obsah je povolen)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "Nedělat nic (vzdálený obsah je zakázán)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Proxy"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "Použít nastavení GNOME proxy"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "Použít proxy"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Vzdálené zdroje"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10650,115 +10690,120 @@ msgstr ""
 "Java appletů můžou být povoleno, pokud jsou přiloženy\n"
 "v emailu."
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Povolit načtení vzdáleného obsahu"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "Při kliknutí na odkaz"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Otevřít v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "CSS z tohoto souboru bude aplikováno na všechny HTML části"
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "_Procházet"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Vyberte šablona stylu"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "Načítání vzdáleného obsahu je zakázáno."
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Načíst obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Odblokovat externí obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Povolit Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Povolit zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Povolit Javu"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Otevřít odkazy v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s je poškozený nebo není podporovaný kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Otevřít obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Kopírovat odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Stáhnout odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Uložit obrázek jako"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Kopírovat obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Načíst kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Fancy"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "Selhalo nalezení rozšíření companion WebKit %s"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML prohlížeč"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10858,189 +10903,6 @@ msgid ""
 msgstr ""
 "Přidá X-FETCH-TIME hlavičku s datem a časem doručení zprávy ve formátu RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "Zásuvný modul GData: Autentizace vyžadována"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"Je třeba autorizovat Claws Mail pro přístup k seznamu kontaktů Google pomocí "
-"zásuvného modulu GData.\n"
-"\n"
-"Navštivte autorizační stránku Google stisknutím tlačítka dole. Po potvrzení "
-"autorizace dostanete autorizační kód. Vložte kód do políčka dole pro udělení "
-"přístupu Claws Mail k seznamu kontaktů Google."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "Krok 1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr "Klikněte pro otevření autorizační stránky Google v prohlížeči"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "Krok 2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Vložte kód:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "Zásuvný modul GData: Chyba při dotazu na kontakty: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "Přidán %d z"
-msgstr[1] "Přidány %d z"
-msgstr[2] "Přidáno %d z"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "1 kontakt pro uložení"
-msgstr[1] "%d kontakty pro uložení"
-msgstr[2] "%d kontaktů pro uložení"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "Zásuvný modul GData: Spuštěn asynchronní dotaz na kontakty\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "Zásuvný modul GData: Chyba při dotazu na skupiny: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "Zásuvný modul GData: Skupiny obdrženy\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "Zásuvný modul GData: Spuštěn asynchronní dotaz na skupiny\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "Zásuvný modul GData: Chyba autentizace: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "Zásuvný modul GData: Autentizace úspěšná\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Zásuvný modul GData: Spuštěna interaktivní autentizace\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "Zásuvný modul GData: Obdržen autorizační kód, vyžadující autorizaci\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"Zásuvný modul GData: Nezískán autorizační kód, požadavek na autorizaci "
-"zrušen\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"Zásuvný modul GData: Interaktivní autorizace stále běží, nebyla spuštěna "
-"další relace\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Zásuvný modul GData: Chyba obnovení autentizace: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Zásuvný modul GData: Obnovení autentizace úspěšné\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"Zásuvný modul GData: Čas od posledního obnovení: %d minut, obnovuji teď\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Zásuvný modul GData: Pokus o obnovení autentizace\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Autentizace"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Uživatelské jméno:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Interval hlasování (sekundy):"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Maximální počet výsledků:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr "Selhala registrace kompletace adres pomocí zásuvného modulu GData"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Selhala registrace offline přepínače zásuvného modulu GData"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Tento zásuvný modul pro přístup k protokolu GData pro Claws Mail.\n"
-"\n"
-"GData protokol je rozhraní ke Google službám.\n"
-"Aktuálně je implementováno vkládání Google kontaktů do kompletace adresy "
-"pomocí Tab.\n"
-"\n"
-"Zpětná vazba na <berndth at gmx.de> vítána."
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "GData integrace"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11202,8 +11064,8 @@ msgid "Cache refresh interval"
 msgstr "Interval obnovy vyrovnávací paměti"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hodin"
 
@@ -11349,11 +11211,11 @@ msgstr "Velikost vyrovnávací paměti pro obrázky v megabytech"
 msgid "Default font"
 msgstr "Výchozí font"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Otevřít odkaz"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Kopírovat odkaz"
 
@@ -11449,7 +11311,7 @@ msgstr "Metoda autentizace nedostupná"
 msgid "sending error on Sieve session: %s\n"
 msgstr "chyba odesílání na Sieve relaci: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Filtrovat"
 
@@ -11581,7 +11443,7 @@ msgstr "Spravovat sieve filtry na serveru pomocí ManageSieve protokolu."
 msgid "Enable Sieve"
 msgstr "Povolit Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Informace o serveru"
 
@@ -11617,8 +11479,12 @@ msgstr "Použít STARTTLS když je dostupné"
 msgid "Require STARTTLS"
 msgstr "Vyžadovat STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Autentizace"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Žádná autentizace"
 
@@ -11632,28 +11498,28 @@ msgstr "Nastavit autentizaci"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -11969,7 +11835,7 @@ msgid "Never"
 msgstr "Nikdy"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Vždy"
 
@@ -12578,9 +12444,9 @@ msgstr "Vyprší za"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte '0' pro uložení hesla po celou dobu relace"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut(y)"
 
@@ -12791,108 +12657,108 @@ msgstr "Špatný podpis od \"%s\""
 msgid "The signature has not been checked"
 msgstr "Digitální podpis nebyl zkontrolován"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "Chyba při kontrole podpisu: žádný status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba při kontrole podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Digitálně podepsáno na %s pomocí %s ID klíče %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Správný podpis od uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Klíč s prošlou platností \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Podpis s prošlou platností od uid\"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Odvolaný klíč \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ŠPATNÝ podpis od \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Platnost: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "Odvolán"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Majitel Trust: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Žádný klíč!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint primárního klíče:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROVÁNÍ: Adresa autora podpisu \"%s\" nesouhlasí s DNS záznamem\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Ověřená adresa autora podpisu je \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nelze načíst obsah zprávy, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nelze inicializovat data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "Specifikace tajného klíče není jednoznačná"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Tajný klíč nebyl nalezen (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Nepodařilo se nastavit tajný klíč: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Jádro '%s' není správně nainstalováno."
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12901,12 +12767,12 @@ msgstr ""
 "Gpgme protokol '%s' je nepoužitelný: Je nainstalováno jádro '%s' verze %s, "
 "ale pro správnou funkci je vyžadována verze %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme protokol '%s' je nepoužitelný (neznámý problém)"
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12914,7 +12780,7 @@ msgstr ""
 "GnuPG není korektně instalováno, nebo je verze příliš stará.\n"
 "Podpora pro OpenPGP je vypnuta."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12922,11 +12788,11 @@ msgstr ""
 "Chcete-li generovat klíče, musíte nejprve uložit informace o účtu tlačítkem "
 "\"OK\".\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "Nenalezen PGP klíč"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -12936,12 +12802,12 @@ msgstr ""
 "podepisovat zprávy a přijímat šifrované zprávy.\n"
 "Chcete vytvořit nový pár klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12949,11 +12815,11 @@ msgstr ""
 "Generuji nový pár klíčů... Prosím pohybujte myší abyste pomohli generátoru "
 "získat dostatek entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepodařilo se vygenerovat nový pár klíčů: neznámá chyba"
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12966,15 +12832,15 @@ msgstr ""
 "\n"
 "Chcete je uložit na server klíčů?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Klíč vygenerován"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Klíč exportován."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "Nelze exportovat klíč."
 
@@ -13181,12 +13047,12 @@ msgid "Show Python console..."
 msgstr "Zobrazit konzoli Pythonu..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Procházet"
@@ -13299,28 +13165,28 @@ msgstr ""
 "Nepodařilo se přečíst obsah starého feeds.xml souboru:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl: Chyba při zápisu '%s' do seznamu exportovaných kanálů.\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Nepodařilo se smazat starý OPML soubor '%s': %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: Nepodařilo se otevřít soubor '%s' pro seznam exportovaných kanálů: "
 "%s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Cnyba při zápisu souboru  exportovaných kanálů.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13333,7 +13199,7 @@ msgstr ""
 "\n"
 "Jméno složky '%s' není povolené."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13348,139 +13214,139 @@ msgstr ""
 "můžete jednotlivé zprávy číst, ručně nebo automaticky mazat, případně si "
 "přečtené zprávy archivovat."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "RSS kanál"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Aktualizovat všechny kanály"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Odebírání kanálu"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Vložte URL kanálu, který chcete odebírat:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' nemůže být obsaženo ve jméně složky."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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 potřebuje přístup k síti, aby mohl aktualizovat kanál."
 msgstr[1] "Claws Mail potřebuje přístup k síti, aby mohl aktualizovat kanály."
 msgstr[2] "Claws Mail potřebuje přístup k síti, aby mohl aktualizovat kanály."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Opravdu chcete odstranit strom kanálů `%s' ?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Odstranit strom kanálů"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "Vyberte OPML soubor"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: Odebírání nového kanálu: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: Nový kanál odebírán: '%s' (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Aktualizuji kanál: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Aktualizace dokončena: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: Chyba při získání kanálu '%s': %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: Neplatný kanál nalezen na '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: Nemohu zpracovat kanál na '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 "RSSyl: Aplikace se ukončuje, nemohl být dokončen obnova kanálu na '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "HTTP základní autentizace"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Použít výchozí nastavení intervalu aktualizace"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Uchovat staré položky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "_Oříznout"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Obnova kanálu, mazání položek, které už nejsou ve zdrojovém kanálu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Stahovat komentáře, pokud je to možné"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Vždy označit jako nové"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "Označit jako nová jenom když změní její text"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "Nikdy označit jako nové"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "Přidat název položky na začátek zprávy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Ignorovat přejmenování názvu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13488,94 +13354,94 @@ msgstr ""
 "Povolit pro uchování aktuálního jména složky, ačkoliv autor kanálu změní "
 "název kanálu."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "Ověřit platnost TLS certifikátu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Uživatelské jméno"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "Zdrojové URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "Stahovat komentáře staré méně než"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dnech"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "Nastavit na -1 pro získání všech komentářů"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Jen jestli se položka změní"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Položky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Interval obnovy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Vložte 0, pokud nechcete aktualizovat automaticky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Vlastnosti kanálu"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "_Aktualizovat kanál"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "Vlastnosti _kanálu"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "Přejmenovat složku..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "O_bnovit rekurzivně"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "Odebírat nový kanál..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "Vytvořit novou _složku..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Importovat seznam kanálů..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Odstranit strom"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "Přidat strom RSS složek"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Vložte jméno nového stromu RSS složek."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13584,90 +13450,90 @@ msgstr ""
 "Vytvoření stromu složek selhalo.\n"
 "Možná už některé soubory existují nebo nemáte oprávnění k zápisu?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Moje kanály"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Vyberte cookie soubor"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Výchozí interval aktualizace"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
 msgstr "Aktualizovat všechny kanály po spuštění aplikace"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Ověřovat platnost TLS certifikátů pro nové kanály"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Cesta k cookie souborům"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Cesta k souboru cookies.txt (Netscape stylu) obsahující vaše cookies"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Obnovování"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Bezpečnost a soukromí"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "Nelze vytvořit složku pro nový kanál '%s'."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Odebírat nový kanál?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Složka kanálu:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr "Místo použití oficiálního názvu můžete použít jiné pro složku kanálu."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "_Upravit vlastnosti kanálu po přihlášení k odběru"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Aktualizuji komentáře pro '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadována autorizace)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Zakázán)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Nenalezen)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Chyba %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13681,7 +13547,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13690,21 +13556,21 @@ msgstr ""
 "Neplatný kanál na\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Nepojmenované kanály"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Pravděpodobně neplatný kanál bez jména na %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Aktualizuji kanál '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13717,11 +13583,11 @@ msgstr ""
 "\n"
 "Prosím kontaktujte vývojáře, toto by nemělo nastat."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl aktualizovat kanály."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13823,41 +13689,45 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "Oznamování spamu"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Povolen"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Přeposlat:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Modulu Spamassassin se nepodařilo připojit k serveru spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrování zprávy modulem SpamAssassin selhalo.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Modul SpamAssassin je v předvolbách vypnut.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssasin: filtrování zprávy..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -13867,7 +13737,7 @@ msgstr ""
 "pravděpodobně způsobena nedosažitelností serveru. Prosím ujistěte se, že "
 "server (spamd) běží a je přístupný."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13875,15 +13745,15 @@ msgstr ""
 "Claws Mail potřebuje přístup na síť pro poslání mailu(ů) do vzdáleného "
 "učitele."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Nepodařilo se získat přihlašovací jméno"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "Modul Spamassassin je načten, ale v předvolbách je vypnut.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14346,63 +14216,68 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akce:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Nová schůzka..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Exportovat kalendář..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "_Přihlásit Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "Pře_jmenovat..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "U_pdatovat přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "Zobrazení jako _seznam"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "Zobrazení po _týdnech"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "Zobrazení po _měsících"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Schůzky"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[bez shrnutí]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "zítra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "tento týden"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "později"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14411,21 +14286,21 @@ msgstr ""
 "\n"
 "Jsou plánovány tyto události %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Čas (%d sekund) připojení k %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (Neuatorizován)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: 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:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14438,7 +14313,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14449,110 +14324,110 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nepodařilo se vytvořit složku %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail potřebuje přístup na síť pro update Webcal kanálu."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Stahování kalendáře pro %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "nové přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail potřebuje přístup na síť pro update přihlášení."
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Přihlásit Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "Vložte Webcal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "Nemohu parsovat URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Skutečně chcete odhlásit?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Smazat odběr"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "přijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "předběžně přijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "odmítnuté"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "nezodpovězené"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "inviduální"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "skupina"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "zdroj"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "místnost"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "V minulosti"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Dnes"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Zítra"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "Tento týden"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "Později"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Přijaté: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Odmítnuté: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Předběžně přijaté: "
 
@@ -14960,95 +14835,95 @@ msgstr "Chyba syntaxe časové značky při pozdravu\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Chyba syntaxe časové značky při pozdravu (není ASCII)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "Chyba protokolu POP\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpověď: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Vymazávám starou zprávu %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Přeskakuji zprávu %d [%s] (%d bytů)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "schránka je zamknuta\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "Časový limit pro relaci vypršel\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "příkaz není podporován\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "nastala chyba v POP relaci\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "Příkaz TOP není podporován\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Diskusní skupiny (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Žádný (pouze odesílání SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Název účtu"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Automatická konfigurace"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15056,81 +14931,81 @@ msgstr ""
 "Varování: tato verze Claws Mail byla zkompilována\n"
 "bez podpory IMAP a News."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "Autentizace při připojení"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "Server diskuzních skupin"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Lokální schránka"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "Použít místo SMTP serveru příkaz pro odeslání"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "příkaz pro odeslání pošty"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované zprávy budou uloženy v této složce"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "Autentizace před POP připojením"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "Vybrat"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "Odstranit zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dnů a 0 hodin: odstranit ihned"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15138,94 +15013,98 @@ msgstr ""
 "Zprávy překračující tento limit budou staženy pouze částečně. Když takovou "
 "zprávu vyberete, budete moci dokončit stažení nebo ji odstranit."
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků pro stažení"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "Adresář pro IMAP server"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mód efektivní šířka pásma (prevence stahování vzdálených značek)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Tento mód používá menší šířku pásma, ale může být pomalejší s některými "
 "servery."
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Velikost dávky"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatický příjem pošty"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Použít globální nastavení"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Přijímat poštu každých"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Zpracovat tento účet při volbě 'Přijmout poštu ze všech účtů'"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Přidat záhlaví user agent"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15233,215 +15112,215 @@ msgstr ""
 "Pokud necháte tyto položky prázdné, bude použito uživatelské jméno a heslo "
 "stejné jako pro příjem."
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "Autentizace POP před odesláním"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "Časový limit pro POP autentizaci"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Autentizace"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Vyberte poskytovatele OAuth2 email služby"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "ID klienta"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "Klientské certifikát"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Získat autorizační kód"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "Otevřít výchozí prohlížeč s požadavkem"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Kopírovat odkaz"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Autorizační kód"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr "Vložit kompletní URL z prohlížeče nebo daný autentizační token"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Dokončit autorizaci"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Autorizovat"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "Automaticky vložit podpis"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Výchozí alternativní slovník"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Předat"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Výchozí systém zabezpečení"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Zprávy vždy digitálně podepsat"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Zprávy vždy šifrovat"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "Odpověď na podepsanou zprávu vždy podepsat"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Odpověď na šifrovanou zprávu vždy šifrovat"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Odesílanou zprávu šifrovat také vaším klíčem"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Odeslané šifrované zprávy uložit jako čistý text"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "Nepoužívat TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Použít příkaz STARTTLS pro spuštění šifrovaného relace"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívat TLS (pokud je to ale nutné, použít STARTTLS)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "Klientské certifikáty"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Certifikát pro příjem"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Soubor klientského certifikátu jako PKCS12 nebo PEM soubor"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Certifikát pro odeslání"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Automaticky přijímat platné certifikáty TLS"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Použít neblokující TLS"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Vypněte, pokud máte problémy s TLS připojením"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Použít proxy server"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Použít výchozí nastavení"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Použít globální nastavení proxy"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Použít autentizaci"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Použít proxy server pro odeslání"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15450,27 +15329,27 @@ msgstr ""
 "nakonfigurovanému odchozímu serveru s vynecháním libovolného "
 "nakonfigurovaného proxy serveru."
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Název domény"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15478,174 +15357,178 @@ msgstr ""
 "Jméno domény bude použito pro generované Message-ID a při připojení SMTP "
 "serverů."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Příkaz pro komunikaci se serverem"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Zprávu zaslanou do více skupin označit jako přečtenou a obarvit:"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Ukládat odložené zprávy do"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Ukládat odstraněné zprávy do"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "Nebyl zadán POP server."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "Výchozí složka pro doručování zpráv (inbox) neexistuje."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "Nebyl zadán IMAP server."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "nebyl zadán název lokálního schránky."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "nebyl zadán příkaz pro odeslání."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "User ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP user ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "doména není uvedena."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "odesílaná není vybrána."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "fronta není vybrána."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "koncepty nejsou vybrány."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "koš není vybrán."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Selhalo (špatná adresa)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "Autorizace je kompletní"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "Váš autorizační kód OAuth2 obdržel Claws Mail"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "Autorizace NENÍ kompletní"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "Váš autorizační kód OAuth2 neobdržel Claws Mail"
 
@@ -15880,7 +15763,7 @@ msgstr "pro aplikaci filtrovacích pravidel mezi {} na vybrané zprávy"
 msgid "for a literal %"
 msgstr "pro znak %"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Akce"
 
@@ -16187,7 +16070,7 @@ msgstr "Skrýt"
 msgid "Message flags"
 msgstr "Příznaky zpráv"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Označit"
@@ -16213,7 +16096,7 @@ msgstr "Označit jako ne spam"
 msgid "Execute"
 msgstr "Provést odložené operace"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Barevné značení zpráv"
 
@@ -16228,7 +16111,7 @@ msgstr "Přesměrovat"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Ohodnocení"
@@ -16498,8 +16381,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Skryté sloupce"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Zobrazené sloupce"
 
@@ -16702,7 +16585,7 @@ msgstr "Použít jiné písmo pro tisk"
 msgid "Message Printing"
 msgstr "Tisk zpráv"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Zobrazení"
@@ -16955,11 +16838,11 @@ msgstr "část těla"
 msgid "whole message"
 msgstr "celá zpráva"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "Označené"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Odstraněné"
 
@@ -16967,11 +16850,11 @@ msgstr "Odstraněné"
 msgid "Replied"
 msgstr "Odpovězené"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Předané"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Spam"
@@ -16980,7 +16863,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má přílohu"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "Podepsané"
 
@@ -17492,7 +17375,7 @@ msgstr "Vybrat barvu pro rozdílné řádky"
 msgid "Hunk lines"
 msgstr "Rozdílné řádky"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Seznam složek"
 
@@ -17976,112 +17859,116 @@ msgstr "Barva pro slova s chybou. Je-li vybrána černá, budou slova podtrhová
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "zkratky pro jména dnů v týdnu"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "zkratka pro měsíc"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "preferované datum a čas podle aktuálního locale"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci číselně"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodiny číselně s 24 hodinových cyklem"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodiny číselně s 12 hodinových cyklem"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "rok číselně"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "měsíc číselně"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "minuty číselně"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "buď AM nebo PM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "vteřiny číselně"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu číselně"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "preferovaný datum pro aktuální locale"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Formát datumu"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Zobrazit počet zpráv za názvem složky"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Ano - počet nepřečtených"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Ano - počet nepřečtených a celkem"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
 msgstr "Po startu otevřít naposledy otevřenou složku"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "Po startu otevřít vybranou otevřenou složku"
+
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18089,99 +17976,99 @@ msgstr ""
 "Spustit pravidla zpracování před označením všech zpráv ve složce jako "
 "přečtené nebo nepřečtené"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Zkrátit názvy diskuzních skupin delší než"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "dopisy(ů)"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "Seznam zpráv"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Zamknout záhlaví sloupců"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Zobrazeno ve sloupci From"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Jméno a adresa"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Nápověda k formátu datumu"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Nastavit výběr zpráv při vstupu do složky"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Zobrazit zprávu ihned po vybrání"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "Při vstupu do složky"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "Při zobrazení výsledku hledání"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Při vybrání následující nebo předchozí zprávy pomocí klávesové zkratky"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "Při odstraňování  nebo přesouvání zpráv"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "Při použití navigačních kláves"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Označit zprávu za přečtenou"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "když vybrána, potom"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "jen při otevření v novém okně nebo odpovědi na ni"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Zobrazit dotaz \"nejsou nepřečtené (nebo nové) zprávy\""
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "Předpokládat 'Ano'"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "Předpokládat 'Ne'"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Zobrazit odesílatele pomocí knihy adres"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "Vlákno z předmětu jako přídavek ke standardních záhlavím"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Přesun a mazání provádět ihned"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18189,56 +18076,56 @@ msgstr ""
 "Při odškrtnutí odkládá přesouvání, kopírování a mazání zpráv do okamžiku, "
 "kdy použijete nabídku 'Nástroje/Provést odložené operace'"
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr ""
 "Potvrzení při označení všech zpráv ve složce jako přečtené nebo nepřečtené"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Potvrzení při změně barevného označení zpráv"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Zobrazovat tipy"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Výchozí"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Nové složky"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Seřadit podle"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Číslo"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "Datum vlákna"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "Neřadit"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Zobrazit vlákna"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Sbalit všechna vlákna"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Skrýt přečtené zprávy"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Seznamy"
 
@@ -18409,7 +18296,7 @@ msgstr "Aktuální šablony"
 msgid "Template"
 msgstr "Šablona"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Výchozí vnitřní motiv"
 
@@ -18417,21 +18304,16 @@ msgstr "Výchozí vnitřní motiv"
 msgid "Themes"
 msgstr "Motivy"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Odstranit systémový motiv '%s'"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Odstranit motiv '%s'"
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Opravdu chcete odstranit tento motiv?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18440,24 +18322,24 @@ msgstr ""
 "Soubor %s selhal\n"
 "během odstraňování motivu."
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Odstraňování složky motivu selhalo."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Motiv byl úspěšně odstraněn"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Vyberte složku s motivem"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalovat motiv '%s'"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18465,15 +18347,11 @@ msgstr ""
 "Tato složka zřejmě neobsahuje motiv.\n"
 "Přesto nainstalovat?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "Chcete instalovat motiv pro všechny uživatele?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "Motiv existuje"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18485,25 +18363,25 @@ msgstr ""
 "\n"
 "Chcete ho nahradit?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Nepodařilo se odstranit starý motiv v %s."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Nepodařilo se vytvořit cílovou složku %s."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "Motiv byl úspěšně nainstalován."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "Instalace motivu se nezdařila"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18512,78 +18390,78 @@ msgstr ""
 "Soubor %s selhal\n"
 "během instalace motivu."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Zobrazit všechny motivy ikon"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d dostupných motivů (uživatelské: %d, systémové: %d, vnitřní: 1)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Vnitřní motiv má %d ikon"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "Pro tento motiv není dostupná žádná informace"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Chyba: nelze získat stav motivu"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d souborů (%d ikon), velikost: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Výběr"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Instalovat nový..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Získat další..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Informace"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Autor"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Zobrazit vše"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "SVG renderování"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "Povolit alfa kanál"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Přesto změnit velikost"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "Pixelů na inch (PPI)"
 
@@ -18732,7 +18610,7 @@ msgstr "Nejsou definovány klíče příjemce."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba při dekódování BASE64]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "Nelze dekódovat část"
 
@@ -19175,22 +19053,6 @@ msgstr ""
 "Nastala chyba při posílání zprávy:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Nastavení schránky"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Nejprve nastavte umístění schránky.\n"
-"Pokud již nějakou máte, můžete použít\n"
-"schránku v MH formátu.\n"
-"Pokud si nejste jisti, stiskněte pouze OK."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Zdroj zprávy"
@@ -19467,11 +19329,11 @@ msgstr "Od: %s, na %s"
 msgid "To: %s, on %s"
 msgstr "Pro: %s, na %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "Nejste autorem tohoto článku."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -19479,84 +19341,84 @@ msgstr[0] "Opravdu chcete odstranit vybranou zprávu?"
 msgstr[1] "Opravdu chcete odstranit %d vybrané zprávy?"
 msgstr[2] "Opravdu chcete odstranit %d vybraných zpráv?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Odstranit zprávu"
 msgstr[1] "Odstranit zprávy"
 msgstr[2] "Odstranit zprávy"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Vybrat složku pro přesunutí vybrané zprávy"
 msgstr[1] "Vybrat složku pro přesunutí vybrané zprávy"
 msgstr[2] "Vybrat složku pro přesunutí vybrané zprávy"
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Vybrat složku pro kopírování vybrané zprávy"
 msgstr[1] "Vybrat složku pro kopírování vybrané zprávy"
 msgstr[2] "Vybrat složku pro kopírování vybrané zprávy"
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "Přidat nebo přepsat"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Přidat nebo přepsat existující soubor?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "_Přidat"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "Př_epsat"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Chystáte se vytisknout okolo %d zpráv postupně po jedné. Chcete pokračovat?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Přeskočit"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplikovat bez ohledu na účet ke kterému jsou přiřazena"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplikovat, jsou-li přiřazena k aktuálnímu účtu"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Filtrování"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19564,71 +19426,71 @@ msgstr ""
 "Některá filtrovací pravidla jsou přiřazena specifickým účtům.\n"
 "Zvolte prosím způsob aplikace těchto pravidel:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Zpracovávám nastavení"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Opravdu chcete resetovat barevné označení pro všechny vybrané zprávy?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "Opravdu chcete použít barevné označení pro všechny vybrané zprávy?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Obnovit barevného označení"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Nastavit barevného označení"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovězeno ale také přeposláno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Odpovězeno - klikněte pro zobrazení odpovědi"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "K přesunutí"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "Bude zkopírováno"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "Zpráva je podepsaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "Zpráva je šifrovaná a má přílohu/přílohy"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Šifrovaná zpráva"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "Má přílohu/přílohy"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19637,11 +19499,11 @@ msgstr ""
 "Chyba v regulárním výrazu (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Přejít zpět na seznam složek (Máte nepřečtené zprávy)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Přejít zpět na seznam složek"
 
@@ -20494,176 +20356,3 @@ msgid ""
 msgstr ""
 "Claws Mail je nyní připraven.\n"
 "Stiskněte uložit a můžeme začít."
-
-#~ msgid "Move Email Addresses to or from Group with arrow buttons"
-#~ msgstr "E-mailové adresy přesuňte do/ze skupiny pomocí tlačítek se šipkami"
-
-#, c-format
-#~ msgid ""
-#~ "rule is account-based [id=%d, name='%s'], current account [id=%d, "
-#~ "name='%s']\n"
-#~ msgstr ""
-#~ "pravidlo založeno na účtu [id=%d, name='%s'], aktuální účet [id=%d, "
-#~ "name='%s']\n"
-
-#~ msgctxt "IPv6"
-#~ msgid ""
-#~ "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-#~ msgstr ""
-#~ "přidává podporu IPv6 adres, nového protokolu adresování v Internetu\n"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be permanently deleted. Recovery "
-#~ "will not be possible.\n"
-#~ "\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Všechny složky a zprávy v '%s' budou nenávratně odstraněny. Obnovení "
-#~ "nebude možné.\n"
-#~ "\n"
-#~ "Chcete je opravdu odstranit?"
-
-#~ msgid "Skip"
-#~ msgstr "Přeskočit"
-
-#~ msgid "Skip all"
-#~ msgstr "Vše přeskočit"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be deleted.\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Všechny složky a zprávy v '%s' budou nenávratně odstraněny\n"
-#~ "Chcete je opravdu odstranit?"
-
-#~ msgid "Select preset:"
-#~ msgstr "Vyberte schéma:"
-
-#~ msgid ""
-#~ "You can also modify each menu shortcut by pressing\n"
-#~ "any key(s) when focusing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Můžete modifikovat klávesové zkratky v nabídce tak, že\n"
-#~ "najedete myší nad položku nabídky a stisknete klávesovou zkratku."
-
-#~ msgid "Search the Web"
-#~ msgstr "Prohledat web"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text"
-#~ msgstr "Barva písma pro 1. úroveň citace"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text"
-#~ msgstr "Barva písma pro 2. úroveň citace"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text"
-#~ msgstr "Barva písma pro 3. úroveň citace"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text background"
-#~ msgstr "Barva pozadí pro 1. úroveň citace"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text background"
-#~ msgstr "Barva pozadí pro 2. úroveň citace"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text background"
-#~ msgstr "Barva pozadí pro 3. úroveň citace"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for links"
-#~ msgstr "Barva pro odkazy"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for signatures"
-#~ msgstr "Barva pro podpisy"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for folder"
-#~ msgstr "Barva pro složku"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for inserted lines"
-#~ msgstr "Výběr barvy pro vložené řádky"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for removed lines"
-#~ msgstr "Výběr barvy pro odstraněné řádky"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for hunk lines"
-#~ msgstr "Výběr barvy pro rozdílné řádky"
-
-#~ msgid "Enable customisable keyboard shortcuts"
-#~ msgstr "Povolit přizpůsobování klávesových zkratek"
-
-#~ 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"
-#~ "Uncheck this option if you want to lock all existing keyboard shortcuts."
-#~ msgstr ""
-#~ "Při zaškrtnutí, můžete měnit klávesové zkratky většiny položek menu, "
-#~ "jejím vybráním a tiskem dané kombinace.\n"
-#~ "Zrušte volbu, pokud chcete uzamknout všechny stávající klávesové zkratky."
-
-#~ msgid "A_dd"
-#~ msgstr "Při_dat"
-
-#~ msgid "Tag is not set."
-#~ msgstr "Hodnota není nastavena."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Apply tags"
-#~ msgstr "Použít značky"
-
-#~ msgid "Please select tags to apply/remove. Changes are immediate."
-#~ msgstr "Vyberte značku pro přidání/odstranění. Změny jsou okamžité."
-
-#~ msgid "_Properties"
-#~ msgstr "_Vlastnosti"
-
-#~ msgid "SSL/TLS error"
-#~ msgstr "SSL/TLS chyba"
-
-#~ msgid "g_thread is not supported by glib.\n"
-#~ msgstr "g_thread není v glib podporován.\n"
-
-#~ msgid "Attach warner"
-#~ msgstr "Kontrola příloh"
-
-#~ msgid "Warn when"
-#~ msgstr "Varovat při"
-
-#~ msgid "UIDL"
-#~ msgstr "UIDL"
-
-#~ msgid "The Notification plugin needs threading support."
-#~ msgstr ""
-#~ "Zásuvný modul \"Upozorňování\" potřebuje podporu vláken (threading "
-#~ "support)."
-
-#~ msgid "Incorrect part"
-#~ msgstr "Nesprávná část"
-
-#~ msgid "Not a text part"
-#~ msgstr "Není textová část"
-
-#~ msgid "Couldn't convert text data to any sane charset."
-#~ msgstr "Nelze převést text do žádné znakové sady."
-
-#~ msgid "Signature boundary not found."
-#~ msgstr "Hranice digitálního podpisu nebyla nalezena."
-
-#~ msgid "Available URLs:"
-#~ msgstr "Dostupné odkazy:"
-
-#~ msgid "Please select the URL to open."
-#~ msgstr "Vyberte odkaz, který chcete otevřít."
-
-#~ msgid "Use secure authentication (APOP)"
-#~ msgstr "Použít zabezpečenou autentizaci (APOP)"
diff --git a/po/pl.po b/po/pl.po
index bac9cdd37..47d42d7eb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,14 +13,14 @@
 # Pawel Pekala <c0rn at o2.pl>, 2007.
 # Franciszek Janowski <nobange at poczta.onet.pl>, 2009.
 # Jakub T. Jankiewicz <jcubic at onet.pl>, 2017, 2018, 2019, 2020, 2021.
-# Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>, 2022.
+# SPDX-FileCopyrightText: 2022, 2023 Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 4.0.0git443\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-13 16:29+0200\n"
-"PO-Revision-Date: 2022-10-14 10:43+0200\n"
-"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>\n"
+"POT-Creation-Date: 2023-11-13 20:13+0100\n"
+"PO-Revision-Date: 2023-11-13 20:33+0100\n"
+"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz at gmai.com>\n"
 "Language-Team: Polish <kde-i18n-doc at kde.org>\n"
 "Language: pl_PL\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10"
 " || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 22.08.1\n"
+"X-Generator: Lokalize 23.08.1\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -52,10 +52,10 @@ msgid ""
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
-"Naciśnięcie przycisku 'Pobierz wiadomości' pobierze wiadomości z danego"
-" konta, jeśli "
-"jego pole w kolumnie 'P' zostało zaznaczone. Wiadomości zostaną pobrane w"
-" takiej kolejności jak poniżej. Wytłuszczenie tekstu oznacza domyślne konto."
+"Naciśnięcie przycisku 'Pobierz wiadomości' pobierze wiadomości z danego "
+"konta, jeśli jego pole w kolumnie 'P' zostało zaznaczone. Wiadomości zostaną "
+"pobrane w takiej kolejności jak poniżej. Wytłuszczenie tekstu oznacza "
+"domyślne konto."
 
 #: src/account.c:781 src/foldersel.c:348
 msgid "_New"
@@ -65,8 +65,8 @@ msgstr "_Nowe"
 msgid "Create a new account"
 msgstr "Utworzy nowe konto"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -78,8 +78,8 @@ msgstr "Dostosuje ustawienia dla danego konta"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -95,8 +95,8 @@ msgstr "_Usuń"
 msgid "Delete the selected account from the list"
 msgstr "Usunie dane konto ze spisu"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "S_kopiuj"
@@ -137,26 +137,26 @@ msgstr "Przesunie dane konto w górę"
 msgid " _Set as default account "
 msgstr " U_staw jako konto domyślne "
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "Zamknij"
@@ -170,53 +170,52 @@ msgstr "Nie można skopiować kont, zawierających zdalne katalogi."
 msgid "Copy of %s"
 msgstr "Kopia %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Czy na pewno usunąć konto '%s'?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Bez tytułu)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Usuń konto"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -225,88 +224,88 @@ msgstr "Usuń konto"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "_Usuń"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "P"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Pobierz z wszystkich kont' odbierze pocztę z zaznaczonych kont"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Protokół"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Serwer"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Nie można pobrać pliku z komunikatami %d"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "Nie można pobrać części wiadomości."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Nie można pobrać części wiadomości wieloczęściowej: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -315,11 +314,11 @@ msgstr ""
 "Wybrane działanie nie może być użyta w oknie pisania wiadomości\n"
 "ponieważ zawiera %%f, %%F, %%as lub %%p."
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "Nie przypisano żadnych akcji do tego filtra"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -328,7 +327,7 @@ msgstr ""
 "Nieprawidłowe działania filtrowania:\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -339,44 +338,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Ukończono"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Uruchamianie: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Zakończono: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Wejście/wyjście działania"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "_Wykonaj"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "_Zatrzymaj"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -387,11 +386,11 @@ msgstr ""
 "('%%h' zostanie zastąpione przez)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Ukryty argument użytkownika dla Akcji"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -402,25 +401,25 @@ msgstr ""
 "('%%u' zostanie zastąpione przez)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Argument użytkownika działania"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
 "Nie można skopiować katalogu do samego siebie lub do jego pod struktury."
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "Nie można wkleić skopiować książki adresowej do samej siebie."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "Nie można przenieść katalogu do samego siebie lub do jego pod struktury."
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Grupa"
@@ -493,40 +492,40 @@ msgstr ""
 "Czy na pewno zastąpić wszystkie nazwy\n"
 "cech wartościami domyślnymi?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_Nie"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Tak"
 
@@ -565,31 +564,30 @@ msgstr "Dod_aj"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_OK"
@@ -620,7 +618,7 @@ msgstr ""
 "Claws Mail spróbuje teraz znaleźć powielone adresy pocztowe w twojej książce "
 "adresowej."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Po_szukaj"
@@ -634,7 +632,7 @@ msgid "Duplicate email addresses"
 msgstr "Powielone adresy pocztowe"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adres"
@@ -643,11 +641,11 @@ msgstr "Adres"
 msgid "Address book path"
 msgstr "Ścieżka do książki adresowej"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "Czy na pewno usunąć adres(y)?"
 
@@ -655,7 +653,7 @@ msgstr "Czy na pewno usunąć adres(y)?"
 msgid "Delete address"
 msgstr "Usuń adresy"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Te dane adresowe są tylko do odczytu i nie mogą być usuwane."
 
@@ -667,7 +665,7 @@ msgstr "Dodaj do książki adresowej"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Uwagi"
@@ -676,7 +674,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog z książką adresową"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "Dodaj adres(y)"
 
@@ -684,50 +682,50 @@ msgstr "Dodaj adres(y)"
 msgid "Can't add the specified address"
 msgstr "Wybrany adres nie może być dodany"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "Adres pocztowy"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "_Książka"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Narzędzia"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Nowa _książka"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "Nowy _Katalog"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "Nowa _wizytówka"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "Nowy _JPilot"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "Nowy _serwer LDAP"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "_Edytuj książkę"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "_Usuń książkę"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -735,189 +733,189 @@ msgstr "_Usuń książkę"
 msgid "_Save"
 msgstr "Zapi_sz"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "Zaznacz w_szystko"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "Wy_tnij"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Wklej"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "Nowy _adres"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "Nowa _grupa"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "Wyślij tam wiado_mość"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "Połącz"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "Zaimportuj plik _LDIF..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "Zaimportuj plik M_utta..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "Zaimportuj plik _Pine..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "Wyeksportuj do _HTML..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "Wyeksportuj do LDI_F..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Wyszukaj powieleń..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Zmień własne cechy..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "_Przeglądanie wpisu"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Powodzenie"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Złe argumenty"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "Nie określono pliku"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Błąd podczas otwierania pliku"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Błąd podczas czytania pliku"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Napotkano koniec pliku"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Błąd alokacji pamięci"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Format pliku nieprawidłowy"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Błąd zapisu pliku"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Błąd podczas otwierania katalogu"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "Nie określono ścieżki"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "Błąd przy próbie połączenia z serwerem LDAP"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "Błąd podczas inicjalizacji LDAP"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "Błąd podczas podłączania adresu serwera LDAP"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "Błąd podczas wyszukiwania w bazie LDAP"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "Upłynął czas oczekiwania na wykonanie działania LDAP"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "Błąd w warunkach wyszukiwania LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "Nie znaleziono wpisów LDAP powiązanych z kryterium wyszukiwania"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "przeszukiwanie LDAP zostało przerwane na żądanie"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "Błąd podczas nawiązywania połączenia STARTTLS"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Brak unikatowej nazwy (dn)"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Brak wymaganych informacji"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "Istnieje już kontakt o takim kluczu"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "Wymagany jest silniejszy sposób uwierzytelnienia"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Źródła"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Poszukaj"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Usuń grupę"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -925,26 +923,26 @@ msgstr ""
 "Czy chcesz usunąć grupę(y)?\n"
 "Wszystkie znajdujące się tam adresy zostaną usunięte."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Nie można wkleić. Docelowa książka adresowa jest tylko do odczytu."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Nie można wkleić do grupy adresowej."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Czy chcesz usunąć wyniki zapytania i adresy w `%s'?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -953,20 +951,20 @@ msgstr ""
 "Czy chcesz usunąć '%s'? Jeżeli usuniesz tylko katalog, adresy w nim zawarte "
 "zostaną przeniesione do katalogu nadrzędnego."
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Usuń tylko _katalog"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Usuń katalog i _adresy"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -975,7 +973,7 @@ msgstr ""
 "Czy chcesz usunąć '%s'?\n"
 "Wszystkie znajdujące się tam adresy zostaną usunięte."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -984,28 +982,28 @@ msgstr ""
 "Czy chcesz usunąć '%s'?\n"
 "Wszystkie znajdujące się tam adresy zostaną usunięte."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Poszukaj '%s'"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Nowe kontakty"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksowego."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Nowy użytkownik, nie można było zapisać plików książki adresowej."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Dawna książka adresowa została pomyślnie przekształcona."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -1013,7 +1011,7 @@ msgstr ""
 "Stara książka adresowa przekształcona,\n"
 "jednak nie powiódł się zapis nowego pliku indeksowego"
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1021,7 +1019,7 @@ msgstr ""
 "Nie można było przekształcić książki adresowej,\n"
 "lecz utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1029,7 +1027,7 @@ msgstr ""
 "Nie można przekształcić książki adresowej,\n"
 "nie można zapisać nowego pliku indeksowego adresu."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1037,52 +1035,52 @@ msgstr ""
 "Nie można było przekształcić książki adresowej,\n"
 "oraz nie można było utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Błąd przekształcania książki adresowej"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Nie można było otworzyć indeksu adresów"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Zajęty przeszukiwaniem..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Książki Adresowe"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "Serwery LDAP"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "Zapytanie LDAP"
 
@@ -1167,42 +1165,42 @@ msgstr "Zbierz adresy e-mail z zaznaczonych wiadomości"
 msgid "Collect email addresses from folder"
 msgstr "Zgromadź adresy e-mail z katalogu"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Wspólne adresy"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Adresy osobiste"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Wspólny adres"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Osobisty adres"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Uaktualnienie adresów"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "Nie udało się uaktualnić. Nie zapisano zmian do katalogu."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Powiadomienie"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Błąd"
@@ -1322,7 +1320,7 @@ msgstr "Twoja wersja Claws Mail jest za stara aby użyć wtyczki '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Twoja wersja Claws Mail jest za stara aby użyć tej wtyczki."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "Nie udało się uścisnąć ręki TLS\n"
 
@@ -1342,7 +1340,7 @@ msgstr "zła odpowiedź SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "wystąpił błąd podczas sesji SMTP\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "wystąpił błąd podczas uwierzytelniania\n"
 
@@ -1351,7 +1349,7 @@ msgstr "wystąpił błąd podczas uwierzytelniania\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Wiadomość jest zbyt duża (Graniczny rozmiar to %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "nie można rozpocząć sesji STARTTLS\n"
 
@@ -1488,212 +1486,212 @@ msgstr "%d.%02dMiB"
 msgid "%.2fGiB"
 msgstr "%.2fGiB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Środa"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piątek"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Styczeń"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Luty"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marzec"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Kwiecień"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Czerwiec"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Lipiec"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Sierpień"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Wrzesień"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Październik"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Listopad"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Grudzień"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Nie"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Pon"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Wt"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Śr"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Czw"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pią"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sob"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Sty"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Lut"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Kwi"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Maj"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Cze"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Lip"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Sie"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Wrz"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Paź"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Lis"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Gru"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "Rano"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "Po południu"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "rano"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "po południu"
@@ -1710,426 +1708,426 @@ msgstr ""
 "\n"
 "Podpisanie oraz szyfrowanie zostało wyłączone dla tej wiadomości"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "Dod_aj..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "Wiado_mość"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "Pi_sownia"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "U_stawienia"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "Wyślij"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Wyślij później"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "Z_ałącz plik"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "Wstaw pl_ik"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "Zastąp podpis"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Cofnij"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "P_onów"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Wy_tnij"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "Wklej _szczególnie"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Jako _cytat"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "_Z zawijaniem wierszy"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "_Bez zawijania wierszy"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Z_aznacz wszystko"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "_Rozszerzone"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "Przesuń o znak w tył"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "Przesuń o znak wprzód"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "Przesuń o słowo w tył"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "Przesuń o słowo wprzód"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "Przesuń do początku wiersza"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "Przesuń do końca wiersza"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "Przesuń do poprzedniego wiersza"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "Przesuń do następnego wiersza"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Usuń poprzedni znak"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Usuń kolejny znak"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Usuń poprzednie słowo"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Usuń kolejne słowo"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Usuń wiersz"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Usuń do końca wiersza"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "Za_wiń bieżący akapit"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Zawiń wszystkie długie wiersze"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "Sprawdź wszystko albo tylko zazna_czone"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "Podświetl wszystkie słowa z błędami"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "Przejdź do _poprzedniego słowa z błędem"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "Przejdź do _następnego słowa z błędem"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "Tryb odpowiadania"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "Ochrona prywatności"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "_Ważność"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Kodowani_e znaków"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Zachodnioeuropejskie"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Bałtyckie"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrajskie"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabskie"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japońskie"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chińskie"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreańskie"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tajskie"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "Książka _adresowa"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "Wzorce"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Działa_nia"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "O progr_amie"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "Sam zawijaj"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Sam wc_inaj"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "Podpisz"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "Za_szyfruj"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "Pop_roś o potwierdzenie dostarczenia"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "Usuń odniesienia"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Pokaż li_nijkę"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "Z_wykły"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "W_szystkim"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "Nadawcy"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
-msgstr "Na listę dyskusyjną"
+msgstr "Na listę wysyłkową"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "Najwyższa"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "Wysoka"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "Niska"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "Najniższa"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "S_am wykryj"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitowe ASCII (US-ASCII)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unikod (UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Środkowoeuropejskie (ISO-8859-2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Greckie (ISO-8859-7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Tureckie (ISO-8859-9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Błędny format nadawcy wiadomości."
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Błędny format tematu wiadomości."
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Błąd w treści wiadomości w wierszu %d."
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Nie można odpowiedzieć. Pierwotna wiadomość prawdopodobnie nie istnieje."
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" wzorca \"Odpowiedz\" zawiera nieprawidłowy adres email."
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Błąd formatu wzorca (treść wiadomości) w wierszu %d."
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Pole \"Od\" wzorca \"Przekaż\" zawiera nieprawidłowy adres email."
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Błąd formatu wzorca (treść wiadomości) w wierszu %d."
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Fw: kilka wiadomości email"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Błąd w formacie wiadomości przekierowującej w wierszu %d."
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "DW:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "UDW:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpowiedz-Do:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Źródła wieści:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Odpowiedzi-Do(FUT):"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "W odpowiedzi na:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Do:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nie można dołączyć pliku (nie udało się przekształcić zestawu znaków)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2147,16 +2145,16 @@ msgstr[2] ""
 "Następujące pliki zostały dołączone:\n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Znacznik cytatu\" wzorca jest nieprawidłowy."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nie można pobrać rozmiaru pliku '%s'."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2165,57 +2163,57 @@ msgstr ""
 "Zamierzasz wstawić plik z %s do treści wiadomości. Na pewno chcesz "
 "kontynuować?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "Czy jesteś pewny?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "Ws_taw"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Pusty plik"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "Z_ałącz mimo tego"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s"
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [zmieniono]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanie wiadomości %s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[brak tematu] - Tworzenie wiadomości %s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napisz nową wiadomość"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2223,62 +2221,62 @@ msgstr ""
 "Nie podano konta, z którego wysyłasz pocztę.\n"
 "Wybierz konto przed wysłaniem."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Jedynym odbiorą jest domyślny adres '%s'. Wysłać mimo to?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Temat wiadomości jest pusty. %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Czy mimo to chcesz wysłać tą wiadomość ?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Czy mimo to chcesz dodać tę wiadomość do kolejki ?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "Kolejka"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Wysyłanie do %d odbiorców. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "Nie można zakolejkować do wysłania wiadomości."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2288,7 +2286,7 @@ msgstr ""
 "Nie można zakolejkować do wysłania wiadomości:\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2299,7 +2297,7 @@ msgstr ""
 "\n"
 "Błąd sygnatury %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2310,7 +2308,7 @@ msgstr ""
 "\n"
 "Błąd szyfrowania: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2320,7 +2318,7 @@ msgstr ""
 "\n"
 "Nie udało się przekształcić zestawu znaków."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2330,7 +2328,7 @@ msgstr ""
 "\n"
 "Nie odnaleziono klucza szyfrującego odbiorcy."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2338,18 +2336,17 @@ msgstr ""
 "Wiadomość została zakolejkowana, ale nie mogła zostać wysłana\n"
 "Użyj \"Wyślij zakolejkowane wiadomości\" z głównego okna by ponowić."
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Wiadomość została zakolejkowana, ale nie mogła zostać wysłana\n"
-"Użyj \"Wyślij zakolejkowane wiadomości\" z głównego okna by spróbować "
-"ponownie."
+"Możesz spróbować \"Wysłać\" ponownie lub umieścić wiadomość w kolejce do"
+" \"Wysłania później\""
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2360,7 +2357,7 @@ msgstr ""
 "do danego zestawu znaków %s.\n"
 "Czy wysłać jako %s ?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2373,100 +2370,104 @@ msgstr ""
 "\n"
 "Czy wysłać ją mimo tego?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Ostrzeżenie dotyczące szyfrowania"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "K_ontynuuj"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "Brak konta do wysyłania poczty!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Wybrane konto nie jest kontem NNTP: Wysłanie wiadomości niemożliwe."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Załącznik %s już nie istnieje. Czy pominąć go?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Zaniechaj szkicowania"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Przerwij wysyłanie"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Pomiń załącznik"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Pierwotna cześć %s"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Usuń zawartość wpisu"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Aby uzupełnić adres z książki adresowej, naciśnij klawisz <tab>"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Rodzaj MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "Zapisz wiadomość w "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "_Przeglądaj"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "Wybierz katalog do zapisu wiadomości"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Na_główek"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "Z_ałączniki"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "In_ne"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Temat:"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2475,19 +2476,19 @@ msgstr ""
 "Nie udało się uruchomić sprawdzania pisowni.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "_Od:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Konto do użycia dla tej wiadomości"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Adres nadawcy do użycia"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2496,50 +2497,50 @@ msgstr ""
 "Nie można wczytać systemu ochrony prywatności '%s'. Nie będzie można ani "
 "podpisać, ani zaszyfrować tej wiadomości. "
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "_Brak"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Treść wzorca zawiera błąd w wierszu %d."
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Błąd formatu wzorca '%s'."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Nieprawidłowy rodzaj MIME."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "Plik nie istnieje lub jest pusty."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Właściwości..."
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "Rodzaj MIME"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2548,14 +2549,14 @@ msgstr ""
 "Nie można zapisać treści do pliku\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr ""
 "Porozumiewanie się gniazdami przy użyciu zewnętrznego edytora jest "
 "niedostępne na Windowsie."
 
-#: src/compose.c:9710
+#: src/compose.c:9702
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2566,21 +2567,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Zewnętrzy edytor zatrzymał się z błędem: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "id procesu: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "id procesu: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2591,19 +2587,19 @@ msgstr ""
 "Wymusić zakończenie jego działania?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail potrzebuje dostępu do sieci aby wysłać tę wiadomość."
 
-#: src/compose.c:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "Nie można zapisać kopii roboczej."
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "Nie można zapisać kopii roboczej"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2611,86 +2607,76 @@ msgstr ""
 "Nie można zapisać kopii roboczej\n"
 "Co chcesz zrobić z tą wiadomością ?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "_Anuluj i wyjdź"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "Porzuć wia_domość"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "Zaznacz plik"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nie można odczytać pliku '%s'."
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 "Bieżące kodowanie nie obsługuje\n"
-"wszystkich znaków pliku '%s', więc może się on "
-"wstawić niepoprawnie."
+"wszystkich znaków pliku '%s', więc może się on wstawić niepoprawnie."
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "Porzucanie wiadomości"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "Wiadomość ta uległa zmianie. Czy porzucić te zmiany?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "Por_zuć"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "Zapi_sz w katalogu roboczych"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Zapisywanie zmian"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Wiadomość ta uległa zmianie. Czy zapisać te zmiany?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "_Nie zapisuj"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "W jaki sposób chcesz użyć szablonu '%s'?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "Użycie szablonu"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "Z_astąp"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"Rozmiar wklejanego tekstu przekracza graniczny (%dKiB) do wklejenia.\n"
-"Załącz go jako plik."
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2704,20 +2690,20 @@ msgstr[1] ""
 msgstr[2] ""
 "Wstawić %d plików do treści wiadomości, czy dodać je jako załączniki?"
 
-#: src/compose.c:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "Wstawić czy załączyć?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "Z_ałącz"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Błąd formatu cytowania w wierszu %d."
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2935,7 +2921,7 @@ msgid " Check File "
 msgstr " Sprawdź plik "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Plik"
 
@@ -2980,12 +2966,12 @@ msgid "Input the new name of folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Nowy katalog"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Wpisz nazwę nowego katalogu:"
 
@@ -3013,13 +2999,13 @@ msgstr "Dodaj nowy wpis JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Edytuj LDAP - Wybierz podstawę wyszukiwania"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Nazwa gospodarza"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3081,7 +3067,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3249,8 +3235,8 @@ msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "Hasło, które zostanie użyte podczas łączenia jako użytkownik \"BindDN\" "
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Pokaż hasło"
@@ -3272,11 +3258,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Graniczna liczba wyników zwrócona podczas wyszukiwania."
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Rozszerzone"
 
@@ -3294,8 +3280,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "Zmień znaczniki"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Znacznik"
 
@@ -3422,15 +3408,15 @@ msgstr "Plik wyjściowy HTML"
 msgid "B_rowse"
 msgstr "P_rzeglądaj"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Wzór stylów"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Brak"
 
@@ -3681,7 +3667,7 @@ msgstr "Eksportowanie książki adresowej do pliku LDIF"
 msgid "Distinguished Name"
 msgstr "Unikalna nazwa"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "Eksportowanie do pliku mbox"
 
@@ -3814,15 +3800,15 @@ msgstr ""
 msgid ""
 "rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"zasada jest niezależna od konta, mimo to stosowane są wszystkie zasady na"
-" życzenie użytkownika\n"
+"zasada jest niezależna od konta, mimo to stosowane są wszystkie zasady na "
+"życzenie użytkownika\n"
 
 #: src/filtering.c:665
 msgid ""
 "rule is account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"zasada jest zależna od konta, mimo to stosowane są wszystkie zasady na"
-" życzenie użytkownika\n"
+"zasada jest zależna od konta, mimo to stosowane są wszystkie zasady na "
+"życzenie użytkownika\n"
 
 #: src/filtering.c:673
 #, c-format
@@ -3854,8 +3840,8 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching current account [id=%d, "
 "name='%s']\n"
 msgstr ""
-"zasada zależna od konta [id=%d, name='%s'], dopasowywana do bieżącego "
-"konta [id=%d, name='%s']\n"
+"zasada zależna od konta [id=%d, name='%s'], dopasowywana do bieżącego konta "
+"[id=%d, name='%s']\n"
 
 #: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
@@ -3958,61 +3944,61 @@ msgstr ""
 "filtruje wiadomość (%s%s%s)\n"
 "%splik wiadomości: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Przychodząca"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Kosz"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Kopie robocze"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Przetwarzanie (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopiowanie %s do %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Przenoszenie %s do %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Uaktualnianie pamięci podręcznej dla %s ..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "Przetwarzanie wiadomości..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizowanie %s do użytku w trybie niesieciowym...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Nazwa katalogu nie może kończyć ani zaczynać się kropką."
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "Nazwa katalogu nie może się kończyć ani zaczynać spacją."
 
@@ -4021,7 +4007,7 @@ msgid "Select folder"
 msgstr "Wybór katalogu"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
@@ -4032,99 +4018,103 @@ msgstr "Odziedzicz po katalogu nadrzędnym właściwości i zasady przetwarzania
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' nie może występować w nazwie katalogu."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nie można utworzyć katalogu '%s'."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "Ozn_acz wszystkie jako przeczytane"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Oz_nacz wszystkie jako nieprzeczytane"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Oznacz _wszystkie wgłąb jako przeczytane"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Oznacz _wszystkie wgłąb jako nieprzeczytane"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "_Wykonaj zasady przetwarzania"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "Po_szukaj w katalogu..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Otwórz zaraz po uruchomieniu"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "Przetwarzan_ie..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "Opróżnij _kosz..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Wyślij wiadomości z k_olejki..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Wybierz pokazywane kolumny"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Nowe"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Łącznie"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Ustawianie szczegółów katalogu..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Oznaczanie wszystkich jako przeczytane"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4132,16 +4122,16 @@ msgstr ""
 "Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu i podkatalogach "
 "jako przeczytane?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu jako przeczytane?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Oznaczanie wszystkich jako nieprzeczytane"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
@@ -4149,99 +4139,99 @@ msgstr ""
 "Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu i podkatalogach "
 "jako nieprzeczytane?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu jako "
 "nieprzeczytane?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Odpytywanie katalogu %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Odpytywanie katalogu %s..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Przebuduj drzewo katalogów"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Przebudowanie drzewa katalogów usunie miejscowe pliki pamięci podręczne "
 "(cache). Czy chcesz kontynuować?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Przebudowywanie drzewa katalogu..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Odpytywanie drzewa katalogu..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nie można otworzyć katalogu %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomościami we wszystkich katalogach..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zamykanie katalogu %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otwieranie katalogu %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "Katalog nie mógł zostać otworzony."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Opróżnij kosz"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Usunąć wszystkie wiadomości z kosza?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "Opróżnij _kosz"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Ostrzeżenie o braku sieci"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr ""
 "Pracujesz będąc odłączonym od sieci. Czy chcesz połączyć się ponownie do "
 "sieci?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Wyślij zakolejkowane wiadomości"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Czy wysłać wszystkie wiadomości z kolejki?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Błędy podczas wysyłania zakolejkowanych wiadomości."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4250,64 +4240,64 @@ msgstr ""
 "Pojawiły się błędy podczas wysyłania zakolejkowanych wiadomości:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Czy na pewno skopiować katalog '%s' wewnątrz '%s'?"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Czy na pewno utworzyć katalog '%s' jako podkatalog '%s'?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Skopiuj katalog"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Przenieś katalog"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiowanie %s do %s..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Przenoszenie %s do %s..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "Miejsce źródłowe i docelowe są takie same."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "Nie można skopiować katalogu do jego własnego podkatalogu. "
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "Nie można przenieść katalogu do jego własnego podkatalogu. "
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Nie można przenieść katalogu między różnymi skrzynkami."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "Nie udało się skopiować!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "Przeniesienie nie powiodło się"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Przetwarzanie ustawień dla katalogu %s"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Katalog docelowy może przechowywać tylko podkatalogi."
 
@@ -4352,8 +4342,8 @@ msgid "read-only"
 msgstr "tylko do odczytu"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "nieznana"
 
@@ -4383,7 +4373,7 @@ msgstr "Po więcej szczegółów odwiedź stronę Claws Mail:"
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
-"W celu otrzymania wsparcia i dyskusji zapisz się na listę dyskusyjną "
+"Aby otrzymać wsparcie i porozmawiać zapisz się na listę wysyłkową "
 "użytkowników Claws Mail:"
 
 #: src/gtk/about.c:148
@@ -4394,13 +4384,13 @@ msgstr ""
 "Claws Mail jest wolnym oprogramowaniem wydawanym na licencji GPL. Jeśli "
 "chcesz wspomóc projekt Claws Mail możesz to zrobić tutaj:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "Zespół Claws Mail\n"
 "oraz Hiroyuki Yamamoto"
 
@@ -4435,7 +4425,7 @@ msgstr ""
 "Ustawienia językowe: %s (zestaw znaków: %s)\n"
 "System Operacyjny: nieznany"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Zespół Claws Mail"
 
@@ -4559,73 +4549,78 @@ msgstr ""
 "Powszechnej Licencji Publicznej GNU (GNU General Public License);jeśli nie, "
 "odwiedź "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Statystyki posiedzenia\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Rozpoczęto: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Ruch przychodzący\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Odebrane wiadomości: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "Wiadomości spam: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Ruch wychodzący\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nowe/przekierowane wiadomości: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpowiedzi: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Przekazane wiadomości: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Całkowita liczba wysłanych wiadomości: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "Op_is"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Autorzy"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "_Dodatki"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Licencja"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "_Uwagi do wydania"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "_Statystyki"
 
@@ -4834,7 +4829,7 @@ msgid "Configuring..."
 msgstr "Ustawianie..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Data"
@@ -4843,9 +4838,9 @@ msgstr "Data"
 msgid "Date:"
 msgstr "Data:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "Od"
@@ -4866,9 +4861,9 @@ msgstr "Nadawca:"
 msgid "Reply-To"
 msgstr "Adres zwrotny"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Do"
@@ -4904,9 +4899,9 @@ msgstr "Odniesienia"
 msgid "References:"
 msgstr "Odniesienia:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Temat"
@@ -4916,7 +4911,7 @@ msgstr "Temat"
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Komentarze"
 
@@ -5030,8 +5025,8 @@ msgid "Seen:"
 msgstr "Widziane:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Stan"
@@ -5104,7 +5099,7 @@ msgstr "Pierwszeństwo"
 msgid "Precedence:"
 msgstr "Pierwszeństwo:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -5114,11 +5109,11 @@ msgstr "Organizacja:"
 
 #: src/gtk/headers.h:48
 msgid "Mailing-List"
-msgstr "Lista dyskusyjna"
+msgstr "Lista wysyłkowa"
 
 #: src/gtk/headers.h:48
 msgid "Mailing-List:"
-msgstr "Lista dyskusyjna:"
+msgstr "Lista wysyłkowa:"
 
 #: src/gtk/headers.h:49
 msgid "List-Post"
@@ -5423,23 +5418,22 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
-#: src/plugins/notification/notification_prefs.c:401
-#: src/plugins/notification/notification_prefs.c:417
-#: src/plugins/notification/notification_prefs.c:436
-#: src/plugins/notification/notification_prefs.c:454
-#: src/plugins/notification/notification_prefs.c:472
-#: src/plugins/notification/notification_prefs.c:490
-#: src/plugins/notification/notification_prefs.c:508
-#: src/plugins/notification/notification_prefs.c:526
+#: src/plugins/notification/notification_prefs.c:404
+#: src/plugins/notification/notification_prefs.c:420
+#: src/plugins/notification/notification_prefs.c:439
+#: src/plugins/notification/notification_prefs.c:457
+#: src/plugins/notification/notification_prefs.c:475
+#: src/plugins/notification/notification_prefs.c:493
+#: src/plugins/notification/notification_prefs.c:511
+#: src/plugins/notification/notification_prefs.c:529
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5454,7 +5448,7 @@ msgstr "_Wczytaj..."
 msgid "_Unload"
 msgstr "Wyłącz"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Opis"
 
@@ -5476,8 +5470,8 @@ msgid "Loaded plugins"
 msgstr "Wczytane wtyczki"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "Z_astosuj"
 
@@ -5490,10 +5484,10 @@ msgid "_Hide"
 msgstr "_Ukryj"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Konto"
@@ -5565,17 +5559,17 @@ msgid "forwarded messages"
 msgstr "przekazane wiadomości"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "wiadomości które zawierające załączniki"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "wiadomości zawierające S w dowolnej nazwie i wartości nagłówka"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "wiadomości zawierające S w wartości dowolnego nagłówka"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "wiadomości które zawierające załączniki"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "wiadomości, które zawierają S w polu Message-ID nagłówka"
@@ -5665,20 +5659,20 @@ msgid "unread messages"
 msgstr "nieprzeczytane wiadomości"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "wiadomości zawierające V w nagłówku H"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "wiadomości, zawierające S w nagłówku Referencje"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "wiadomości które po przetworzeniu przez polecenie zwracają 0 - %F jest "
 "plikiem z wiadomością"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "wiadomości zawierające S w nagłówku X-Label"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "operator logiczny AND (I/Oraz)"
@@ -5727,55 +5721,55 @@ msgstr ""
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Coś poszło nie tak podczas wyszukiwania. Proszę sprawdź logi."
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Do/DW/Temat/Znacznik"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Wgłąb"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Przyklejony"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Podpowiedź"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Zastosuj tylko do zaznaczonych"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "W_yczyść"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Wyczyść bieżące zapytanie"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Dostosuj warunki wyszukiwania"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Szczegóły"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Szczegóły rozszerzonych symboli"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "E_dycja"
 
@@ -5936,15 +5930,15 @@ msgstr "Certyfikat TLS uległ zmianie"
 msgid "Tags:"
 msgstr "Znaczniki:"
 
-#: src/headerview.c:193 src/plugins/notification/notification_popup.c:313
-#: src/plugins/notification/notification_popup.c:620
+#: src/headerview.c:193 src/plugins/notification/notification_popup.c:316
+#: src/plugins/notification/notification_popup.c:623
 #: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3494
 #: src/summaryview.c:3512 src/summaryview.c:3551
 msgid "(No From)"
 msgstr "(Brak nadawcy)"
 
-#: src/headerview.c:208 src/plugins/notification/notification_popup.c:315
-#: src/plugins/notification/notification_popup.c:624
+#: src/headerview.c:208 src/plugins/notification/notification_popup.c:318
+#: src/plugins/notification/notification_popup.c:627
 #: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3563
 #: src/summaryview.c:3566
 msgid "(No Subject)"
@@ -5954,16 +5948,16 @@ msgstr "(Bez tematu)"
 msgid "Error:"
 msgstr "Błąd:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Rozmiar pliku:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Wczytaj obraz"
 
@@ -6157,7 +6151,7 @@ msgstr "Błąd TLS"
 msgid "Unknown error [%d]"
 msgstr "Nieznany błąd [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6166,10 +6160,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Logowanie z użyciem CRAM-MD5 działa tylko jeżeli biblioteka libetpan została "
-"skompilowana ze wsparciem SASL i wtyczka CRAM-MD5 SASL jest zainstalowana."
+"Logowanie z użyciem CRAM-MD5 zadziała tylko wtedy, gdy biblioteka libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę CRAM-MD5 SASL."
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6178,10 +6172,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Logowanie z użyciem CRAM-MD5 działa tylko jeżeli biblioteka libetpan została "
-"skompilowana z obsługą SASL i wtyczka CRAM-MD5 SASL jest zainstalowana."
+"Logowanie z użyciem DIGEST-MD5 zadziała tylko wtedy, gdy biblioteka libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę DIGEST-MD5 SASL."
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6190,11 +6184,62 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Logowanie z użyciem SCRAM-SHA-1 działa tylko jeżeli biblioteka libetpan "
-"została skompilowana ze wsparciem SASL i wtyczka SCRAM SASL jest "
-"zainstalowana."
+"Logowanie z użyciem SCRAM-SHA-1 zadziała tylko wtedy, gdy biblioteka libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę SCRAM SASL."
 
-#: src/imap.c:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Logowanie z użyciem SCRAM-SHA-224 zadziała tylko wtedy, gdy biblioteka"
+" libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę SCRAM SASL."
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Logowanie z użyciem SCRAM-SHA-256 zadziała tylko wtedy, gdy biblioteka"
+" libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę SCRAM SASL."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Logowanie z użyciem SCRAM-SHA-384 zadziała tylko wtedy, gdy biblioteka"
+" libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę SCRAM SASL."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Logowanie z użyciem SCRAM-SHA-512 zadziała tylko wtedy, gdy biblioteka"
+" libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę SCRAM SASL."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6203,10 +6248,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Logowanie typu PLAIN działa tylko jeżeli biblioteka libetpan została "
-"skompilowana ze wsparciem SASL i wtyczka PLAIN SASL jest zainstalowana."
+"Logowanie PLAIN zadziała tylko wtedy, gdy biblioteka libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę PLAIN SASL."
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6215,10 +6260,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Logowanie z użyciem LOGIN działa tylko jeżeli biblioteka libetpan została "
-"skompilowana z obsługą SASL i wtyczka LOGIN SASL jest zainstalowana."
+"Logowanie LOGIN zadziała tylko wtedy, gdy biblioteka libetpan "
+"została zbudowana z obsługą SASL oraz gdy wgrano wtyczkę LOGIN SASL."
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6228,36 +6273,36 @@ msgstr ""
 "\n"
 "Błąd OAuth2. Sprawdź i popraw ustawienia swojego konta OAuth2."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Nie udało się połączyć z %s: odmówiono wejścia.%s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Nie udało się połączyć z %s: odmówiono wejścia.%s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Nie udało się połączyć z %s"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Połączenie IMAP do %s zostało przerwane. Łączę jeszcze raz...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail potrzebuje dostępu do sieci w celu dostępu do serwera IMAP."
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Połączenie nie jest bezpieczne"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6271,108 +6316,108 @@ msgstr ""
 "Czy chcesz kontynuować łączenie do tego serwera? Połączenie nie będzie "
 "bezpieczne."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Kon_tynuuj łączenie"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Konto '%s': Łączenie z serwerem IMAP: %s:%d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nie można połączyć się z serwerem IMAP: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Nie można połączyć się z serwerem IMAP: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nie można nawiązać sesji STARTTLS.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nie udało się nawiązać połączenia z serwerem IMAP: %s.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nie można wejść na serwer IMAP %s."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "Dodawanie wiadomości..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopiowanie wiadomości..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "Wyszukanie nie powiodło się z powodu błędu serwera."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "nie można ustawić flagi usunięta\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Odpytywanie o katalogi, których nie śledzę %s..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Szukanie podkatalogów w %s ..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nie można zmienić nazwy skrzynki z %s do %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "nie można usunąć skrzynki pocztowej\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "Nie udało się wykonać polecenia LIST\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "Flagowanie wiadomości..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można zaznaczyć katalogu: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Serwer wymaga STARTTLS do zalogowania się.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "Nie można odświeżyć właściwości.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6381,20 +6426,24 @@ msgstr ""
 "Połączenie z %s nie powiodło się: serwer wymaga STARTTLS, lecz Claws Mail "
 "skompilowane jest bez obsługi STARTTLS.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "Logowanie na serwer jest wyłączone.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "Pobieranie wiadomości..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Wymazywanie usuniętych wiadomości..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nie można ustawić flagi usunięta: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6424,7 +6473,7 @@ msgid "Cop_y folder..."
 msgstr "S_kopiuj katalog..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "_Usuń katalog..."
 
@@ -6444,7 +6493,7 @@ msgstr "Śledzenie"
 msgid "_Subscribe..."
 msgstr "Zacznij śledzić..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "Przestań śledzić..."
 
@@ -6476,21 +6525,21 @@ msgstr ""
 "i żadnych wiadomości, to dopisz znak '/' na końcu jego nazwy)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Wpisz nową nazwę dla '%s':"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Przemianuj katalog"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6509,7 +6558,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "Wybierz katalog, do którego skopiować katalog '%s'"
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6522,8 +6571,8 @@ msgstr ""
 "Czy na pewno to zrobić?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu '%s'."
@@ -6836,8 +6885,8 @@ msgstr "Błąd połączenia."
 msgid "Auth failed"
 msgstr "Błąd uwierzytelniania"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Zablokowana"
 
@@ -7007,11 +7056,11 @@ msgstr "Upłynął czas oczekiwania na połączenie z %s:%d."
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporacja została anulowana\n"
 
-#: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
-#: src/plugins/notification/notification_prefs.c:1355
-#: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1067
+#: src/plugins/notification/notification_prefs.c:1370
+#: src/plugins/notification/notification_prefs.c:1676
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "sekundy"
 
@@ -7076,7 +7125,7 @@ msgstr "Błąd LDAP (szukanie): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Ksywka"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7085,7 +7134,7 @@ msgstr ""
 "Plik `%s' już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7094,7 +7143,7 @@ msgstr ""
 "Znaleziono ustawienia dla wersji %s.\n"
 "Czy chcesz przenieść te ustawienia?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7107,11 +7156,11 @@ msgstr ""
 "Twoje zasady filtrów mogą zostać przekształcone \n"
 "za pomocą skryptu dostępnego pod adresem %s."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Zachowaj starą ustawienia"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7121,27 +7170,27 @@ msgstr ""
 "może chwile potrwać jeśli dużo danych IMAP lub źródła wieści i zajmie trochu "
 "dodatkowego miejsca na twoim dysku."
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Przenoszenie ustawień"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopiowanie plików ustawień... Może to trochę potrwać..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Nie udało się przenieść ustawień!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Ustawienia przenosin..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(lub starszy)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7164,7 +7213,7 @@ msgstr[2] ""
 "więcej szczegółów:\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7174,7 +7223,7 @@ msgstr ""
 "Prawdopodobnie spowodowane jest to wadliwym kontem IMAP. Użyj \"Przebuduj "
 "drzewo katalogów\" z menu katalogu by spróbować to naprawić."
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7184,77 +7233,77 @@ msgstr ""
 "Prawdopodobnie jest to spowodowane przestarzałą zewnętrzną wtyczką. Wgraj "
 "wtyczkę ponownie i spróbuj ponownie."
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Brakująca nazwa pliku\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "Nie można było odczytać pliku\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Uszkodzony nagłówek\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Powielony nagłówek 'Do:'\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "Brak wymaganego nagłówka 'Do:'\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Spróbuj opcji -h lub --help aby wyświetlić sposób użycia.\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Brak argumentu pliku dla opcji %s"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Brakujący lub pusty argument uri dla opcji %s"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Brakujący argument uri dla opcji %s"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr ""
 "Brakuje co najmniej jednego nie-pustego argumentu z plikiem dla opcji %s"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "Brakujący katalog, rodzaj i argument zapytania dla opcji %s"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Brakujący rodzaj oraz argument zapytania dla opcji %s"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Brak argumentu zapytania dla opcji %s"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7273,12 +7322,12 @@ msgstr ""
 "                         nie nastąpi pusty wiersz, dalej treść wiadomości do "
 "końca pliku."
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe uri        zaczyna śledzić podany adres URI, jeśli to możliwe"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7288,7 +7337,7 @@ msgstr ""
 "                         otwórz okno pisania wiadomości z załączonymi\n"
 "                         plikami"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7298,23 +7347,23 @@ msgstr ""
 "                         otwórz okno pisania wiadomości z wstawionymi\n"
 "                         plikami"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive              pobiera nowe wiadomości"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          pobiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     anuluje pobieranie wiadomości"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       anuluje wysyłanie wiadomości"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7331,18 +7380,18 @@ msgstr ""
 "                         typ: s[ubject],f[rom],t[o],e[xtended],m[ixed] lub "
 "g: etykieta\n"
 "                         żądanie: wyszukiwany ciąg znaków\n"
-"                         wgłąb: wyłączone jeśli arg. rozpoczyna się od "
-"0, n, N, f lub F"
+"                         wgłąb: wyłączone jeśli arg. rozpoczyna się od 0, n, "
+"N, f lub F"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła zakolejkowane wiadomości"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalog]...   pokazuje całkowitą ilość wiadomości"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7350,63 +7399,62 @@ msgstr ""
 "  --status-full [katalog]...\n"
 "                         pokaż stan każdego katalogu"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           pokaż statystyki sesji"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     zresetuj statystyki sesji"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
 "file:// uri or an absolute path"
 msgstr ""
 "  --select katalog[/msg]  przechodzi do danego katalogu/wiadomości\n"
-"                         Katalog to identyfikator w postaci"
-" 'katalog/podkatalog', adres uri o przedrostu "
-"file:// lub ścieżka bezwzględna"
+"                         Katalog to identyfikator w postaci 'katalog/"
+"podkatalog', adres uri o przedrostu file:// lub ścieżka bezwzględna"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online               przełącza w tryb pracy z siecią"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              przełącza w tryb pracy z rozłączoną siecią"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       wyłącza program Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             tryb serwisowy"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         przełącz tryb debugowania"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              wyświetla tę pomoc"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           wyświetla informację o wersji"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr "  --version-full -V      wyświetla szczegóły o wbudowanych funkcjach"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           wyjściowy katalog ustawień"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7414,7 +7462,7 @@ msgstr ""
 "  --alternate-config-dir [katalog]\n"
 "                         korzysta z podanego katalogu ustawień"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7422,48 +7470,48 @@ msgstr ""
 "  --geometry -geometry [SzerxWys][+X+Y]\n"
 "                         ustaw geometrie okna głównego"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Brakujący argument katalogu dla opcji %s"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Brakujący argument geometrii dla opcji %s"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Brakujący argument katalogu dla opcji %s"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Nieznany błąd %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Przetwarzanie (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "katalog górnego poziomu"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Zakolejkowane wiadomości"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały zakolejkowane. Wyjść?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: sieć jest włączona.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieć jest rozłączona.\n"
 
@@ -7647,11 +7695,11 @@ msgstr "Następnego katalogu z ni_eprzeczytanymi wiadomościami"
 msgid "F_older..."
 msgstr "Katal_ogu..."
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Następnej części"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Poprzedniej części"
 
@@ -7750,7 +7798,7 @@ msgstr "Odpowiedz szczególnie"
 
 #: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
-msgstr "Na _listę dyskusyjną"
+msgstr "Na _listę wysyłkową"
 
 #: src/mainwindow.c:670
 msgid "Follow-up and reply to"
@@ -7773,11 +7821,11 @@ msgstr "Prze_kieruj"
 
 #: src/mainwindow.c:677
 msgid "Mailing-_List"
-msgstr "_Lista dyskusyjna"
+msgstr "_Lista wysyłkowa"
 
 #: src/mainwindow.c:678
 msgid "Post"
-msgstr "Wyślij"
+msgstr "Napisz"
 
 #: src/mainwindow.c:680
 msgid "Help"
@@ -7893,7 +7941,7 @@ msgstr "_Znaczniki"
 msgid "Re-_edit"
 msgstr "Zmień tr_eść"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "Sprawdź podpis"
 
@@ -8098,7 +8146,7 @@ msgstr "Nagłówki kolumn"
 msgid "Th_read view"
 msgstr "Pokaż w wątkach"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Ukryj przeczytane wątki"
 
@@ -8106,7 +8154,7 @@ msgstr "Ukryj przeczytane wątki"
 msgid "_Hide read messages"
 msgstr "_Ukryj przeczytane wiadomości"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Ukryj usunięte wiadomości"
 
@@ -8218,11 +8266,11 @@ msgstr "Wg blokad"
 msgid "D_on't sort"
 msgstr "Nie szereguj"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "Rosnąco"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "Malejąco"
 
@@ -8230,7 +8278,7 @@ msgstr "Malejąco"
 msgid "_Auto detect"
 msgstr "S_am wykryj"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Zmień znaczniki..."
 
@@ -8269,7 +8317,7 @@ msgstr "dziennik filtrowania wyłączony\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Nienazwany"
 
@@ -8277,19 +8325,19 @@ msgstr "Nienazwany"
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Usunąć wszystkie wiadomości z katalogów kosza?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "Nie wychodź"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę pocztową"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8303,18 +8351,18 @@ msgstr ""
 "Jeśli podasz istniejącą skrzynkę, zostanie ona\n"
 "samoczynnie przeszukana."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Skrzynka pocztowa '%s' już istnieje."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Skrzynka pocztowa"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8323,51 +8371,51 @@ msgstr ""
 "Nie udało się utworzyć skrzynki pocztowej.\n"
 "Być może pliki już istnieją lub nie masz uprawnień do zapisu w tym miejscu."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Wysyłanie zabronione"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Nie udało się zaimportować skrzynki mbox."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Nie udało się wyeksportować skrzynki mbox."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Wyjdź"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Czy wyjść z Claws Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "_Wyjdź"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Synchronizacja katalogów"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Czy chcesz zsynchronizować swoje katalogi?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "Z_synchronizuj"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Usuwanie powielonych wiadomości..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Nie znaleziono powielonych wiadomości w wybranym katalogu.\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8375,7 +8423,7 @@ msgstr[0] "Usunięto %d powieloną wiadomość z zaznaczonego katalogu.\n"
 msgstr[1] "Usunięto %d powielone wiadomości z zaznaczonego katalogu.\n"
 msgstr[2] "Usunięto %d powielonych wiadomości z zaznaczonego katalogu.\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, 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"
@@ -8386,11 +8434,11 @@ msgstr[1] ""
 msgstr[2] ""
 "Oznaczono %d powielonych wiadomości do usunięcia z wybranego katalogu.\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Usuwanie powielonych wiadomości z wszystkich katalogów..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8398,50 +8446,50 @@ msgstr[0] "Usunięto %d powieloną wiadomość z %d katalogów.\n"
 msgstr[1] "Usunięto %d powielone wiadomości z %d katalogów.\n"
 msgstr[2] "Usunięto %d powielonych wiadomości z %d katalogów.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Nie znaleziono powielonej wiadomości z %d katalogów.\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Wybierz katalog, do którego chcesz przejść"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Zasady przetwarzania do zastosowania przed zasadami katalogów"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "Zasady przetwarzania do zastosowania po zasadach katalogów"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Ustawienia filtrowania"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Nie można zarejestrować jako domyślnego klienta: pobieranie ścieżki "
 "wykonania niemożliwe."
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail został zarejestrowany jako klient domyślny."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Nie można zarejestrować jako domyślnego klienta: nie można zapisywać do "
 "rejestru."
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Odpytywanie katalogu %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8449,52 +8497,52 @@ msgstr[0] "Usunięto %d hasło z %d konta.\n"
 msgstr[1] "Usunięto %d hasła z %d kont.\n"
 msgstr[2] "Usunięto %d haseł z %d kont.\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "nagłówek %s"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "nagłówek"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "wiersz nagłówka"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "wiersz treści wiadomości"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "znacznik"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Rozróżniaj wielkości liter"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "Nie rozróżniaj wielkości liter"
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "sprawdzanie czy wiadomości pasują [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "wiadomość pasuje\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "wiadomość nie pasuje\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(żaden)"
 
@@ -8532,7 +8580,7 @@ msgstr "Zastąp plik skrzynki mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ten plik już istnieje. Czy chcesz go zastąpić?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Zastąp"
 
@@ -8763,8 +8811,8 @@ msgstr ""
 "\n"
 "  Wiadomość została usunięta lub przeniesiona do innego katalogu"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "Błąd podczas uczenia.\n"
 
@@ -8804,64 +8852,68 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "Otwórz _w..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "Wyślij do..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "Wyświetl jako tekst"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "Zapi_sz jako..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "Z_apisz wszystko..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Zapisz wszystkie załączniki..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "Rodzaj MIME"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Zobacz pełne szczegóły"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Sprawdź ponownie"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Kliknij na ikonkę aby go sprawdzić."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Kliknij na ikonkę, lub wciśnij klawisz '%s' aby go sprawdzić."
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Proces weryfikacji podpisu trwał zbyt długo. Kliknij na aby ponowić tę "
 "operację."
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8869,58 +8921,58 @@ msgstr ""
 "Proces weryfikacji podpisu trwał zbyt długo. Kliknij na ikonkę, lub wciśnij "
 "klawisz '%s' aby ponowić tę operację."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr "Błąd sprawdzania podpisu. Naciśnij na ikonę i spróbuj ponownie."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Błąd sprawdzania podpisu. Naciśnij na ikonę, lub klawisz '%s', aby ponowić."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "Sprawdzanie podpisu..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "Powrót do wiadomości email"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nie można zapisać części wiadomości wieloczęściowej: %s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Czy zastąpić istniejący plik '%s'?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
 #, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
 "saving or ignore error and continue?"
 msgstr ""
-"Napotkano błąd podczas zapisywania części wiadomości %d. Wycofać zapisywanie,"
-" czy pójść dalej nie zważając na błąd?"
+"Napotkano błąd podczas zapisywania części wiadomości %d. Wycofać "
+"zapisywanie, czy pójść dalej nie zważając na błąd?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "Błąd zapisywania części wiadomości"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "Pomiń"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "Pomiń wszystkie"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8928,7 +8980,7 @@ msgstr[0] "Pomyślnie zapisano %d plik."
 msgstr[1] "Pomyślnie zapisano %d pliki."
 msgstr[2] "Pomyślnie zapisano %d plików."
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8936,7 +8988,7 @@ msgstr[0] "Pomyślnie zapisano %d plik"
 msgstr[1] "Pomyślnie zapisano %d pliki"
 msgstr[2] "Pomyślnie zapisano %d plików"
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8944,26 +8996,26 @@ msgstr[0] "%s, %d plik zakończony niepowodzeniem"
 msgstr[1] "%s, %d plik zakończony niepowodzeniem"
 msgstr[2] "%s, %d plik zakończony niepowodzeniem"
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Wybierz katalog docelowy"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Zapisz jako"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Otwórz w"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8972,7 +9024,7 @@ msgstr ""
 "Wpisz nazwę programu do otworzenia pliku:\n"
 "('%s' zostanie zastąpione nazwą pliku)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8983,11 +9035,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Uruchomić niepewny plik binarny?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8999,20 +9051,20 @@ msgstr ""
 "\n"
 "Czy chcesz uruchomić ten plik?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "Uruchom plik wykonywalny"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Rodzaj:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9124,77 +9176,77 @@ msgstr "Przestań śledzić źródło wieści"
 msgid "Rename newsgroup folder"
 msgstr "Przemianuj katalog źródła wieści"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "Brakuje kodu uwierzytelniającego OAuth2\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 błąd połączenia\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "Błąd połączenia TLS OAuth2\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "Token dostępu OAuth2 został pobrany\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "Token dostępu OAuth2 nie został pobrany\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "Odświeżający token OAuth2 został pobrany\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "Odświeżający token OAuth2 nie został pobrany\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "Podano token odświeżający, zastępujący OAuth2\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "Nie podano tokena odświeżającego, zastępującego OAuth2\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "Błąd pisania do gniazda OAuth2\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "Błąd przekroczenia czasu oczekiwania dla gniazda OAuth2\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "Token dostępu OAuth2 jest nadal aktualny\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 pobieranie tokenu dostępu używając tokenu odświeżającego\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 próba pobrania świeżego tokenu z kodem uwierzytelnienia\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "Uaktualniono token dostępu i odświeżania OAuth2\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth oryginalna cześć %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth zakodowano: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9203,11 +9255,11 @@ msgstr ""
 "OAuth2 zdekodowało: %s\n"
 "\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Wpisz hasło główne"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Niepoprawne hasło główne."
 
@@ -9625,7 +9677,7 @@ msgstr "Tak"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Nie"
 
@@ -9642,7 +9694,7 @@ msgid "Delete selected files"
 msgstr "Usuń wybrany plik"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Wybierz wiadomości przed"
 
@@ -9656,99 +9708,99 @@ msgstr ""
 "Wybierz nazwa pliku archiwum [końcówka powinna odzwierciedlać archiwum np.: ."
 "tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Utwórz archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Wpisz argumenty Archiwizera"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Katalog do archiwizacji"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Katalog główny archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Naciśnij przycisk aby wybrać katalog, który będzie katalogiem głównym "
 "archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Nazwa Archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Miejsce archiwum i jego nazwa"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Wybierz"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr "Naciśnij ten przycisk, aby wybrać nazwę i miejsce dla archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Wybierz kompresję"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Zaznacz to pole, aby użyć pakowania %s dla tego archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Wybierz format"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Wybierz to, aby użyć %s jako format archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Różne ustawienia"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Wgłąb"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Zaznacz to pole, aby dołączyć podkatalogi w archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9759,11 +9811,11 @@ msgstr ""
 "Bądź jednak świadomy, że może do znacznie zwiększyć czas jaki\n"
 "zajmie na stworzenie archiwum"
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "_Zmień nazwę"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9774,7 +9826,7 @@ msgstr ""
 "Nazwy są nadawane według zapisu: data_od at do@tytuł.\n"
 "Nazwy zostaną obcięte do 96 znaków"
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9782,11 +9834,11 @@ msgstr ""
 "Zaznacz to pole, aby usunąć wiadomości po archiwizacji\n"
 "Obecnie obsługiwane są tylko IMAP4, miejscowe skrzynki i POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Ustawienia zaznaczania"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9879,7 +9931,7 @@ msgstr "Usuń załącznik"
 msgid "Remove"
 msgstr "Usuń"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Załącznik"
@@ -10044,19 +10096,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Wyklucz"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -10066,15 +10118,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Wszystkie"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: pobieranie treści wiadomości..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrowanie wiadomości..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -10086,7 +10138,7 @@ msgstr ""
 "Użyj\"/Oznacz/Oznacz jako spam\" i \"/Zaznacz/Zaznacz  jako dobra\" by "
 "wytrenować Bogofilter kilkuset wiadomościami spam i dobrymi."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -10095,21 +10147,21 @@ msgstr ""
 "Wtyczka Bogofilter nie może odfiltrować wiadomości. Nie można uruchomić "
 "polecenia `%s %s %s`."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: rozpoznawanie wiadomości..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Rozpoznawanie nie powiodło się, %s zwrócił stan %d."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: rozpoznawanie wiadomości..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10118,7 +10170,7 @@ msgstr ""
 "Rozpoznawanie nie powiodło się, '%s %s %s' zwrócił błąd:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10146,13 +10198,13 @@ msgstr ""
 "\n"
 "Ustawienia wtyczki znajdują się w /Ustawienia/Ustawienia/Wtyczki/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Wykrywanie spamu"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Rozpoznawanie spamu"
 
@@ -10176,7 +10228,7 @@ msgstr "Wiadomości większe niż ta nie zostaną sprawdzone"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "KiB"
 
@@ -10283,19 +10335,19 @@ msgstr "Ścieżka do programu Bogofilter"
 msgid "Mark spam as read"
 msgstr "Oznacz wiadomości ze spamem jako przeczytaną"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: pobieranie treści wiadomości..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrowanie wiadomości..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10307,7 +10359,7 @@ msgstr ""
 "Użyj\"/Oznacz/Oznacz jako spam\" i \"/Zaznacz/Zaznacz  jako dobra\" by "
 "wytrenować Bsfilter kilkuset wiadomościami spam i dobrymi."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -10316,11 +10368,11 @@ msgstr ""
 "Wtyczka Bsfilter nie może odfiltrować wiadomości. Nie można uruchomić "
 "polecenia `%s`."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: rozpoznawanie wiadomości..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10466,8 +10518,8 @@ msgstr ""
 "Ta wtyczka używa programu Antywirusowego Clam do przeszukiwania wszystkich "
 "wiadomości pobieranych z kont IMAP, LOCAL oraz POP.\n"
 "\n"
-"Gdy okaże się, że załącznik wiadomości zawiera wirusa, to można go usunąć lub"
-" zapisać w przeznaczonym do tego katalogu.\n"
+"Gdy okaże się, że załącznik wiadomości zawiera wirusa, to można go usunąć "
+"lub zapisać w przeznaczonym do tego katalogu.\n"
 "\n"
 "Ponieważ ta wtyczka porozumiewa się z clamd za pomocą\n"
 "gniazd dlatego są wymagane minimalne uprawnienia do\n"
@@ -10668,65 +10720,52 @@ msgstr ""
 "\n"
 "Nie jest do niczego przydatna"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Wyświetlanie obrazów"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Wyświetlanie zagnieżdżonych obrazów"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Uruchamiaj javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Uruchamiaj zagnieżdżony javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Uruchamiaj aplety Java"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Uruchamiaj zagnieżdżone aplety Java"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Renderuj obiekty używając wtyczek"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Renderuj zagnieżdżone obiekty używając wtyczek"
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Otwieraj w przeglądarce (zdalna zawartość jest włączona)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "Nie rób nic (zdalna zawartość jest wyłączona)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Pośrednik"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "Użyj ustawień pośrednika z ustawień GNOME"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "Użyj pośrednika"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Zdalne zasoby"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10740,115 +10779,120 @@ msgstr ""
 "z sieci. Wyświetlanie obrazów, skryptów, obiektów wtyczek lub apletów\n"
 "Java nadal może być włączone dla załączników w wiadomości."
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Włącz wczytywanie zdalnej zawartości"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "Przy kliknięciu na odnośnik, domyślnie"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Otwórz w zewnętrznej przeglądarce"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "CSS z tego pliku zostanie wczytany dla każdej części HTML"
 
-#: src/plugins/fancy/fancy_prefs.c:310
-#: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/fancy/fancy_prefs.c:284
+#: src/plugins/notification/notification_prefs.c:1349
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Prze_glądaj"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Wybierz arkusz stylów"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "Wyłączono wczytywanie zdalnej zawartości."
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Wczytaj obrazy"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Włącz zdalną zawartość"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Włącz Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Włącz Wtyczki"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Włącz Javę"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Otwórz odnośniki w zewnętrznej przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Wystąpił błąd: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s jest uszkodzonym lub nie obsługiwanym kanałem"
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Otwórz w przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Otwórz w przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Otwórz obraz"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Skopiuj odnośnik"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Odnośnik Pobierania"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Zapisz obraz Jako"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Skopiuj obraz"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Zaimportuj kanał"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Fancy"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "Nie udało się znaleźć rozszerzenia WebKit o nazwie %s"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Przeglądarka HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10882,10 +10926,9 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
-"Ta wtyczka zmienia pobrane wiadomości. Dodaje nagłówki zawierające "
-"szczegóły takiej takie jak: UIDL, konto Claws Mail, serwer POP, ID"
-" użytkownika "
-"oraz czas pobrania.\n"
+"Ta wtyczka zmienia pobrane wiadomości. Dodaje nagłówki zawierające szczegóły "
+"takiej takie jak: UIDL, konto Claws Mail, serwer POP, ID użytkownika oraz "
+"czas pobrania.\n"
 "\n"
 "Ustawienia można znaleźć w /Ustawienia/Ustawienia/Wtyczki/Fetchinfo"
 
@@ -10949,197 +10992,6 @@ msgstr ""
 "Dodaje nagłówek X-FETCH-TIME, zawierający datę i czas pobrania wiadomości w "
 "formacje RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "Wtyczka GData: Wymagane uwierzytelnienie"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"Aby korzystać z wtyczki GData, musisz nadać uprawnienia Claws Mail aby miał "
-"dostęp do listy kontaktów Google.\n"
-"\n"
-"Odwiedź stronę uwierzytelniania Google wciskając poniższy przycisk. Po "
-"potwierdzeniu uwierzytelnienia, dostaniesz kod uwierzytelniający. Wpisz ten "
-"kod w pole poniżej aby nadać uprawnienia do listy kontaktów Google dla Claws "
-"Mail."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "Krok 1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
-"Naciśnij tutaj, aby otworzyć stronę uwierzytelniania Google w przeglądarce"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "Krok 2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Wpisz kod:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "Wtyczka GData: błąd wczytywania kontaktów: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "Dodano %d z"
-msgstr[1] "Dodano %d z"
-msgstr[2] "Dodano %d z"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "%d kontaktów do cache-u"
-msgstr[1] "%d kontaktów do cache-u"
-msgstr[2] "%d kontaktów do cache-u"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "Wtyczka GData: Rozpoczynanie asynchronicznego zapytania o kontakty\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "Wtyczka GData: Błąd zapytania dla grup: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "Wtyczka GData: Grupy pobrane\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "Wtyczka GData: Rozpoczynanie asynchronicznego zapytania o grupy\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "Wtyczka GData: Błąd uwierzytelnienia: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "Wtyczka GData: Pomyślne uwierzytelnienie\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Wtyczka GData: Rozpoczynanie interaktywnego uwierzytelnienia\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr ""
-"Wtyczka GData: Otrzymano kod uwierzytelniania, wysyłanie zapytania "
-"uwierzytelniającego\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"Wtyczka GData: Nie otrzymano kodu uwierzytelniającego, zapytanie "
-"uwierzytelniające anulowane\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"Wtyczka GData: Interaktywne uwierzytelnianie nadal działa, dodatkowa sesja "
-"nie została uruchomiona\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Wtyczka GData: Błąd odświeżania uwierzytelnienia: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Wtyczka GData: Pomyślne odświeżenie uwierzytelnienia\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"Wtyczka GData: Upłyną czas od ostatniego odświeżenia: %d minut, odświeżam "
-"teraz\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Wtyczka GData: Próba odświeżenia uwierzytelnienia\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Uwierzytelnianie"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Nazwa użytkownika:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Czas między pobieraniami (w sekundach):"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Graniczna  liczba wyników:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Nie powiodła się rejestracja funkcji do uzupełniania adresów we wtyczce GData"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr ""
-"Nie powiodła się rejestracja funkcji przełączania trybu offline we wtyczce "
-"GData"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Ta wtyczka zapewnia dostęp do protokoły GData dla Claws Mail.\n"
-"\n"
-"Protokół GData to interfejs usług Google.\n"
-"Aktualnie, jedyne zaimplementowane funkcje to dołączenie kontaktów Google do "
-"uzupełnia za pomocą klawisza Tab.\n"
-"\n"
-"Wrażenia i uwagi na adres <berndth at gmx.de> będą mile widziane."
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "Obsługa GData"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11306,8 +11158,8 @@ msgid "Cache refresh interval"
 msgstr "Odstęp czasu między odświeżeniami pamięci podręcznej"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "godzin"
 
@@ -11454,11 +11306,11 @@ msgstr "Rozmiar pamięci podręcznej dla obrazów w megabajtach"
 msgid "Default font"
 msgstr "Domyślna czcionka"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Otwórz odnośnik"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Skopiuj położenie odnośnika"
 
@@ -11554,7 +11406,7 @@ msgstr "Metoda uwierzytelniania niedostępna"
 msgid "sending error on Sieve session: %s\n"
 msgstr "błąd wysyłania podczas sesji Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Filtr"
 
@@ -11686,7 +11538,7 @@ msgstr "Zarządzanie filtrami sieve na serwerze używając protokołu ManageSiev
 msgid "Enable Sieve"
 msgstr "Włącz Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Szczegóły serwera"
 
@@ -11724,8 +11576,12 @@ msgstr "Używaj STARTTLS jeśli możliwe"
 msgid "Require STARTTLS"
 msgstr "Wymagane STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Uwierzytelnianie"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Brak uwierzytelnienia"
 
@@ -11739,28 +11595,28 @@ msgstr "Określ uwierzytelnienia"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Hasło"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Sam wykryj"
 
@@ -11828,14 +11684,14 @@ msgstr "Nie ma żadnych nowych wiadomości"
 
 #: src/plugins/notification/notification_plugin.c:220
 #: src/plugins/notification/notification_plugin.c:418
-#: src/plugins/notification/notification_prefs.c:402
-#: src/plugins/notification/notification_prefs.c:418
-#: src/plugins/notification/notification_prefs.c:437
-#: src/plugins/notification/notification_prefs.c:455
-#: src/plugins/notification/notification_prefs.c:473
-#: src/plugins/notification/notification_prefs.c:491
-#: src/plugins/notification/notification_prefs.c:509
-#: src/plugins/notification/notification_prefs.c:527
+#: src/plugins/notification/notification_prefs.c:405
+#: src/plugins/notification/notification_prefs.c:421
+#: src/plugins/notification/notification_prefs.c:440
+#: src/plugins/notification/notification_prefs.c:458
+#: src/plugins/notification/notification_prefs.c:476
+#: src/plugins/notification/notification_prefs.c:494
+#: src/plugins/notification/notification_prefs.c:512
+#: src/plugins/notification/notification_prefs.c:530
 msgid "Notification"
 msgstr "Powiadomienia"
 
@@ -11903,55 +11759,55 @@ msgstr ""
 msgid "Various tools"
 msgstr "Różne narzędzia"
 
-#: src/plugins/notification/notification_popup.c:311
+#: src/plugins/notification/notification_popup.c:314
 msgid "New Mail message"
 msgstr "Nowa wiadomość"
 
-#: src/plugins/notification/notification_popup.c:332
+#: src/plugins/notification/notification_popup.c:335
 msgid "New News post"
 msgstr "Nowa wieść"
 
-#: src/plugins/notification/notification_popup.c:333
+#: src/plugins/notification/notification_popup.c:336
 msgid "A new message arrived"
 msgstr "Nadeszła nowa wiadomość"
 
-#: src/plugins/notification/notification_popup.c:336
+#: src/plugins/notification/notification_popup.c:339
 msgid "New Calendar message"
 msgstr "Nowa wiadomość kalendarza"
 
-#: src/plugins/notification/notification_popup.c:337
+#: src/plugins/notification/notification_popup.c:340
 #: src/plugins/notification/notification_trayicon.c:906
 msgid "A new calendar message arrived"
 msgstr "Nadeszła nowa wiadomość kalendarza"
 
-#: src/plugins/notification/notification_popup.c:340
+#: src/plugins/notification/notification_popup.c:343
 msgid "New RSS feed article"
 msgstr "Nowa wieść z kanału RSS"
 
-#: src/plugins/notification/notification_popup.c:341
+#: src/plugins/notification/notification_popup.c:344
 #: src/plugins/notification/notification_trayicon.c:909
 msgid "A new article in a RSS feed arrived"
 msgstr "Nadeszła nowa wieść z kanału RSS"
 
-#: src/plugins/notification/notification_popup.c:344
+#: src/plugins/notification/notification_popup.c:347
 msgid "New unknown message"
 msgstr "Nowa nieznana wiadomość"
 
-#: src/plugins/notification/notification_popup.c:345
+#: src/plugins/notification/notification_popup.c:348
 msgid "Unknown message type arrived"
 msgstr "Dostarczono wiadomość nieznanego typu"
 
-#: src/plugins/notification/notification_popup.c:378
+#: src/plugins/notification/notification_popup.c:381
 #: src/plugins/notification/notification_trayicon.c:678
 msgid "Present main window"
 msgstr "Otwórz w głównym oknie"
 
-#: src/plugins/notification/notification_popup.c:488
+#: src/plugins/notification/notification_popup.c:491
 msgid "Mail message"
 msgstr "Wiadomość pocztowa"
 
-#: src/plugins/notification/notification_popup.c:489
-#: src/plugins/notification/notification_popup.c:495
+#: src/plugins/notification/notification_popup.c:492
+#: src/plugins/notification/notification_popup.c:498
 #, c-format
 msgid "%d new message arrived"
 msgid_plural "%d new messages arrived"
@@ -11959,15 +11815,15 @@ msgstr[0] "nadeszła %d nowa wiadomość"
 msgstr[1] "nadeszły %d nowe wiadomości"
 msgstr[2] "nadeszło %d nowych wiadomości"
 
-#: src/plugins/notification/notification_popup.c:494
+#: src/plugins/notification/notification_popup.c:497
 msgid "News message"
 msgstr "Wieść"
 
-#: src/plugins/notification/notification_popup.c:500
+#: src/plugins/notification/notification_popup.c:503
 msgid "Calendar message"
 msgstr "Wiadomość kalendarza"
 
-#: src/plugins/notification/notification_popup.c:501
+#: src/plugins/notification/notification_popup.c:504
 #: src/plugins/notification/notification_trayicon.c:943
 #, c-format
 msgid "%d new calendar message arrived"
@@ -11976,11 +11832,11 @@ msgstr[0] "Nadeszła %d nowa wiadomość kalendarza"
 msgstr[1] "Nadeszły %d nowe wiadomości kalendarza"
 msgstr[2] "Nadeszło %d nowych wiadomości kalendarza"
 
-#: src/plugins/notification/notification_popup.c:506
+#: src/plugins/notification/notification_popup.c:509
 msgid "RSS news feed"
 msgstr "Kanał RSS"
 
-#: src/plugins/notification/notification_popup.c:507
+#: src/plugins/notification/notification_popup.c:510
 #, c-format
 msgid "%d new article in a RSS feed arrived"
 msgid_plural "%d new articles in a RSS feed arrived"
@@ -11988,7 +11844,7 @@ msgstr[0] "Nadeszła %d nowa wieść z kanału RSS"
 msgstr[1] "Nadeszły %d nowa wieści z kanału RSS"
 msgstr[2] "Nadeszło %d nowych wieści z kanału RSS"
 
-#: src/plugins/notification/notification_popup.c:571
+#: src/plugins/notification/notification_popup.c:574
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -11996,246 +11852,250 @@ msgstr[0] "%d nowa wiadomość"
 msgstr[1] "%d nowe wiadomości"
 msgstr[2] "%d nowych wiadomości"
 
-#: src/plugins/notification/notification_prefs.c:419
+#: src/plugins/notification/notification_prefs.c:422
 msgid "Hotkeys"
 msgstr "Skróty klawiszowe"
 
-#: src/plugins/notification/notification_prefs.c:438
+#: src/plugins/notification/notification_prefs.c:441
 msgid "Banner"
 msgstr "Banner"
 
-#: src/plugins/notification/notification_prefs.c:456
+#: src/plugins/notification/notification_prefs.c:459
 msgid "Popup"
 msgstr "Okno wysuwne"
 
-#: src/plugins/notification/notification_prefs.c:474 src/prefs_actions.c:264
+#: src/plugins/notification/notification_prefs.c:477 src/prefs_actions.c:264
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/plugins/notification/notification_prefs.c:492
+#: src/plugins/notification/notification_prefs.c:495
 msgid "LCD"
 msgstr "LCD"
 
-#: src/plugins/notification/notification_prefs.c:510
+#: src/plugins/notification/notification_prefs.c:513
 msgid "SysTrayicon"
 msgstr "Ikona zasobnika systemowego"
 
-#: src/plugins/notification/notification_prefs.c:528
+#: src/plugins/notification/notification_prefs.c:531
 msgid "Indicator"
 msgstr "Wskaźnik"
 
-#: src/plugins/notification/notification_prefs.c:611
+#: src/plugins/notification/notification_prefs.c:614
 msgid "Include folder types"
 msgstr "Weź pod uwagę tylko następujące katalogi"
 
-#: src/plugins/notification/notification_prefs.c:620
+#: src/plugins/notification/notification_prefs.c:623
 msgid "Mail folders"
 msgstr "Katalogi poczty"
 
-#: src/plugins/notification/notification_prefs.c:628
+#: src/plugins/notification/notification_prefs.c:631
 msgid "News folders"
 msgstr "Katalogi wieści"
 
-#: src/plugins/notification/notification_prefs.c:636
+#: src/plugins/notification/notification_prefs.c:639
 msgid "RSSyl folders"
 msgstr "Katalogi RSSyl"
 
-#: src/plugins/notification/notification_prefs.c:644
+#: src/plugins/notification/notification_prefs.c:647
 msgid "vCalendar folders"
 msgstr "Katalogi vCalendar"
 
-#: src/plugins/notification/notification_prefs.c:652
+#: src/plugins/notification/notification_prefs.c:655
 msgid "These settings override folder-specific selections."
 msgstr "Ustawienia te zastępują ustawienia poszczególnych katalogów."
 
-#: src/plugins/notification/notification_prefs.c:663
+#: src/plugins/notification/notification_prefs.c:666
 msgid "Global notification settings"
 msgstr "Globalne ustawienie powiadamiania"
 
-#: src/plugins/notification/notification_prefs.c:672
+#: src/plugins/notification/notification_prefs.c:675
 msgid "Set window manager urgency hint when new messages exist"
 msgstr ""
 "Powiadom zarządzanie oknami o pilności, gdy pojawią się nowe wiadomości"
 
-#: src/plugins/notification/notification_prefs.c:681
+#: src/plugins/notification/notification_prefs.c:684
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
 "Powiadom zarządzanie oknami o pilności, gdy pojawią się nieprzeczytane "
 "wiadomości"
 
-#: src/plugins/notification/notification_prefs.c:691
+#: src/plugins/notification/notification_prefs.c:694
 msgid "Use sound theme"
 msgstr "Użyj dźwięków"
 
-#: src/plugins/notification/notification_prefs.c:763
+#: src/plugins/notification/notification_prefs.c:766
 msgid "Show banner"
 msgstr "Pokaż baner"
 
-#: src/plugins/notification/notification_prefs.c:768
+#: src/plugins/notification/notification_prefs.c:771
 #: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/plugins/notification/notification_prefs.c:773 src/prefs_receive.c:229
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Zawsze"
 
-#: src/plugins/notification/notification_prefs.c:772
+#: src/plugins/notification/notification_prefs.c:775
 msgid "Only when not empty"
 msgstr "Tylko gdy niepusty"
 
-#: src/plugins/notification/notification_prefs.c:791
+#: src/plugins/notification/notification_prefs.c:794
 msgid "Banner speed"
 msgstr "Szybkość banera"
 
-#: src/plugins/notification/notification_prefs.c:828
+#: src/plugins/notification/notification_prefs.c:831
 msgid "Maximum number of messages"
 msgstr "Graniczna liczba wiadomości"
 
-#: src/plugins/notification/notification_prefs.c:834
+#: src/plugins/notification/notification_prefs.c:837
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "Ogranicz liczbę pokazywanych wiadomości, użyj 0 dla nieograniczonej"
 
-#: src/plugins/notification/notification_prefs.c:843
+#: src/plugins/notification/notification_prefs.c:846
 msgid "Banner width"
 msgstr "Szerokość banera"
 
-#: src/plugins/notification/notification_prefs.c:849
+#: src/plugins/notification/notification_prefs.c:852
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "Ogranicz rozmiar banera, użyj 0 dla szerokości ekranu"
 
-#: src/plugins/notification/notification_prefs.c:851
+#: src/plugins/notification/notification_prefs.c:854
 msgid "pixel(s)"
 msgstr "piksel(e)"
 
-#: src/plugins/notification/notification_prefs.c:860
+#: src/plugins/notification/notification_prefs.c:863
 msgid "Include unread mails in banner"
 msgstr "Dołącz nieprzeczytane wiadomości w banerze"
 
-#: src/plugins/notification/notification_prefs.c:868
+#: src/plugins/notification/notification_prefs.c:871
 msgid "Make banner sticky"
 msgstr "Ustaw baner jako pokazujący się na wszystkich obszarach roboczych"
 
-#: src/plugins/notification/notification_prefs.c:878
-#: src/plugins/notification/notification_prefs.c:1073
-#: src/plugins/notification/notification_prefs.c:1364
-#: src/plugins/notification/notification_prefs.c:1599
+#: src/plugins/notification/notification_prefs.c:881
+#: src/plugins/notification/notification_prefs.c:1076
+#: src/plugins/notification/notification_prefs.c:1379
+#: src/plugins/notification/notification_prefs.c:1614
 msgid "Only include selected folders"
 msgstr "Weź pod uwagę tylko wybrane katalogi"
 
-#: src/plugins/notification/notification_prefs.c:887
-#: src/plugins/notification/notification_prefs.c:1082
-#: src/plugins/notification/notification_prefs.c:1373
-#: src/plugins/notification/notification_prefs.c:1608
+#: src/plugins/notification/notification_prefs.c:890
+#: src/plugins/notification/notification_prefs.c:1085
+#: src/plugins/notification/notification_prefs.c:1388
+#: src/plugins/notification/notification_prefs.c:1623
 msgid "Select folders..."
 msgstr "Wybierz katalogi..."
 
-#: src/plugins/notification/notification_prefs.c:899
+#: src/plugins/notification/notification_prefs.c:902
 msgid "Banner colors"
 msgstr "Kolor banera"
 
-#: src/plugins/notification/notification_prefs.c:903
-#: src/plugins/notification/notification_prefs.c:1114
+#: src/plugins/notification/notification_prefs.c:906
+#: src/plugins/notification/notification_prefs.c:1117
 msgid "Use custom colors"
 msgstr "Użyj własnych kolorów"
 
-#: src/plugins/notification/notification_prefs.c:918
-#: src/plugins/notification/notification_prefs.c:1128
+#: src/plugins/notification/notification_prefs.c:921
+#: src/plugins/notification/notification_prefs.c:1131
 msgid "Foreground"
 msgstr "Pierwszy plan"
 
-#: src/plugins/notification/notification_prefs.c:922
-#: src/plugins/notification/notification_prefs.c:1134
+#: src/plugins/notification/notification_prefs.c:925
+#: src/plugins/notification/notification_prefs.c:1137
 msgid "Foreground color"
 msgstr "Kolor pierwszoplanowy"
 
-#: src/plugins/notification/notification_prefs.c:927
-#: src/plugins/notification/notification_prefs.c:1140
+#: src/plugins/notification/notification_prefs.c:930
+#: src/plugins/notification/notification_prefs.c:1143
 #: src/prefs_msg_colors.c:251 src/prefs_msg_colors.c:265
 #: src/prefs_msg_colors.c:279
 msgid "Background"
 msgstr "Drugi plan"
 
-#: src/plugins/notification/notification_prefs.c:931
-#: src/plugins/notification/notification_prefs.c:1146
+#: src/plugins/notification/notification_prefs.c:934
+#: src/plugins/notification/notification_prefs.c:1149
 msgid "Background color"
 msgstr "Kolor drugoplanowy"
 
-#: src/plugins/notification/notification_prefs.c:1037
-#: src/plugins/notification/notification_prefs.c:1634
+#: src/plugins/notification/notification_prefs.c:1040
+#: src/plugins/notification/notification_prefs.c:1649
 msgid "Enable popup"
 msgstr "Włącz okna wysuwne"
 
-#: src/plugins/notification/notification_prefs.c:1054
-#: src/plugins/notification/notification_prefs.c:1652
+#: src/plugins/notification/notification_prefs.c:1057
+#: src/plugins/notification/notification_prefs.c:1667
 msgid "Popup timeout"
 msgstr "Czas pokazywania okna wysuwnego"
 
-#: src/plugins/notification/notification_prefs.c:1093
+#: src/plugins/notification/notification_prefs.c:1096
 msgid "Make popup sticky"
 msgstr "Uczyń okno wysuwne lepkim"
 
-#: src/plugins/notification/notification_prefs.c:1103
+#: src/plugins/notification/notification_prefs.c:1106
 msgid "Set popup window width and position"
 msgstr "Ustaw szerokość i położenie okna wysuwnego"
 
-#: src/plugins/notification/notification_prefs.c:1108
+#: src/plugins/notification/notification_prefs.c:1111
 msgid "(the window manager is free to ignore this)"
 msgstr "(zarządzanie oknami może to pominąć)"
 
-#: src/plugins/notification/notification_prefs.c:1158
-#: src/plugins/notification/notification_prefs.c:1664
+#: src/plugins/notification/notification_prefs.c:1161
+#: src/plugins/notification/notification_prefs.c:1679
 msgid "Display folder name"
 msgstr "Wyświetl nazwę katalogu"
 
-#: src/plugins/notification/notification_prefs.c:1217
+#: src/plugins/notification/notification_prefs.c:1170
+msgid "Notify on unread also"
+msgstr "Powiadom także o nieprzeczytanych"
+
+#: src/plugins/notification/notification_prefs.c:1232
 msgid "Sample popup window"
 msgstr "Przykładowe okno wysuwne"
 
-#: src/plugins/notification/notification_prefs.c:1223
+#: src/plugins/notification/notification_prefs.c:1238
 msgid "Done"
 msgstr "Zrobione"
 
-#: src/plugins/notification/notification_prefs.c:1281
+#: src/plugins/notification/notification_prefs.c:1296
 msgid "Select command"
 msgstr "Wybierz polecenie"
 
-#: src/plugins/notification/notification_prefs.c:1310
+#: src/plugins/notification/notification_prefs.c:1325
 msgid "Enable command"
 msgstr "Włącz polecenie"
 
-#: src/plugins/notification/notification_prefs.c:1327 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1342 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Polecenie do wykonania"
 
-#: src/plugins/notification/notification_prefs.c:1345
+#: src/plugins/notification/notification_prefs.c:1360
 msgid "Block command after execution for"
 msgstr "Zablokuj działanie po wykonaniu na"
 
-#: src/plugins/notification/notification_prefs.c:1452
+#: src/plugins/notification/notification_prefs.c:1467
 msgid "Enable LCD"
 msgstr "Włącz LCD"
 
-#: src/plugins/notification/notification_prefs.c:1471
+#: src/plugins/notification/notification_prefs.c:1486
 msgid "Hostname:Port of LCDd server"
 msgstr "Gospodarz:Port serwera LCDd"
 
-#: src/plugins/notification/notification_prefs.c:1556
+#: src/plugins/notification/notification_prefs.c:1571
 msgid "Enable Trayicon"
 msgstr "Włącz ikonę zasobnika systemowego"
 
-#: src/plugins/notification/notification_prefs.c:1572
+#: src/plugins/notification/notification_prefs.c:1587
 msgid "Hide at start-up"
 msgstr "Ukryj zaraz po uruchomieniu"
 
-#: src/plugins/notification/notification_prefs.c:1580
+#: src/plugins/notification/notification_prefs.c:1595
 msgid "Close to tray"
 msgstr "Zamknięcie umieszcza w zasobniku systemowym"
 
-#: src/plugins/notification/notification_prefs.c:1588
+#: src/plugins/notification/notification_prefs.c:1603
 msgid "Hide when iconified"
 msgstr "Ukryj gdy zikonizowany"
 
@@ -12245,36 +12105,36 @@ msgstr "Ukryj gdy zikonizowany"
 #. for that, go for something along the lines of "passive popup"
 #. instead.See also
 #. http://en.wikipedia.org/wiki/Toast_(computing)
-#: src/plugins/notification/notification_prefs.c:1625
+#: src/plugins/notification/notification_prefs.c:1640
 msgid "Passive toaster popup"
 msgstr "Bierne okno wysuwne"
 
-#: src/plugins/notification/notification_prefs.c:1789
+#: src/plugins/notification/notification_prefs.c:1804
 msgid "Add to Indicator Applet"
 msgstr "Dodaj do apletu Indicator"
 
-#: src/plugins/notification/notification_prefs.c:1803
+#: src/plugins/notification/notification_prefs.c:1818
 msgid "Hide mainwindow when minimized"
 msgstr "Ukryj główne okno gdy zminimalizowano"
 
-#: src/plugins/notification/notification_prefs.c:1856
+#: src/plugins/notification/notification_prefs.c:1871
 msgid "Enable global hotkeys"
 msgstr "Włącz globalne skróty klawiszowe"
 
-#: src/plugins/notification/notification_prefs.c:1870
+#: src/plugins/notification/notification_prefs.c:1885
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "Przykładami skrótów klawiszowych są <b>%s</b> i <b>%s</b>"
 
-#: src/plugins/notification/notification_prefs.c:1870
+#: src/plugins/notification/notification_prefs.c:1885
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
-#: src/plugins/notification/notification_prefs.c:1870
+#: src/plugins/notification/notification_prefs.c:1885
 msgid "<alt>N"
 msgstr "<alt>N"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1897
 msgid "Toggle minimize"
 msgstr "Przełącz minimalizację"
 
@@ -12694,9 +12554,9 @@ msgstr ""
 "(Ustawienie '0' powoduje przechowywanie\n"
 "hasła przez całą sesję"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut"
 
@@ -12907,109 +12767,109 @@ msgstr "Niewłaściwy podpis od \"%s\""
 msgid "The signature has not been checked"
 msgstr "Ten podpis nie był sprawdzony"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "Błąd podczas sprawdzania podpisu: brak stanu\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Błąd podczas sprawdzania podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Podpis wykonano %s za pomocą %s, ID klucza %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Poprawny podpis od \"%s\" (Zaufanie: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Przedawniony klucz uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Przedawniony podpis od \"%s\" (Zaufanie: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Unieważniony uid klucza \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "NIEWŁAŚCIWY podpis od \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Ważność: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "Unieważniony"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Zaufany Właściciel: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Brak klucza!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Odcisk podstawowego klucza:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "UWAGA: Adres podpisującego \"%s\" nie zgadza się z wpisem w DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Potwierdzony adres podpisującego, to \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nie można informacji z komunikatu, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nie można zainicjować danych, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "Specyfikacja klucza prywatnego jest nieprawidłowa"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Klucz prywatny nie został odnaleziony (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Nie udało się ustawić klucza prywatnego: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Protokół GPGme '%s' nie nadaje się do użytku: Silnik '%s' nie jest "
 "zainstalowany poprawnie."
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13018,12 +12878,12 @@ msgstr ""
 "Protokół GPGme '%s' nie nadaje się do użytku: Zainstalowany jest silnik '%s' "
 "w wersji %s ale do poprawnego działania wymagana jest wersja %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protokół Gpgme '%s' nie nadaje się do użytku (nieznany problem)"
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13031,7 +12891,7 @@ msgstr ""
 "GnuPG nie jest poprawnie zainstalowany, lub musi zostać uaktualniony\n"
 "Obsługa OpenPGP została wyłączona."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13039,11 +12899,11 @@ msgstr ""
 "Musisz zapisać informację o koncie przy użyciu \"OK\" zanim będziesz mógł "
 "wygenerować parę kluczy.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "Nie znaleziono klucza PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -13053,12 +12913,12 @@ msgstr ""
 "mógł podpisywać i otrzymywać zaszyfrowanych wiadomości.\n"
 "Chcesz stworzyć teraz nową parę kluczy?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nie udało się wygenerować nowej pary kluczy: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13066,11 +12926,11 @@ msgstr ""
 "Generowanie nowej pary kluczy... Poruszaj myszką aby pomóc w generacji "
 "entropii..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Generowanie kluczy nie powiodło się: nieznany błąd "
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13083,15 +12943,15 @@ msgstr ""
 "\n"
 "Chcesz wyeksportować ją na serwer kluczy?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Klucz wygenerowany"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Klucz wyeksportowany."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "Eksport klucza nie powiódł się."
 
@@ -13302,12 +13162,12 @@ msgid "Show Python console..."
 msgstr "Pokaż konsolę Pythona..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Przeglądaj"
@@ -13419,27 +13279,27 @@ msgstr ""
 "Nie można utworzyć starego pliku feeds.xml:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl: Błąd podczas dodawania '%s' do listy eksportowanych kanałów.\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Nie można otworzyć starego pliku OPML '%s' %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: Nie można otworzyć pliku '%s' w celu przeglądania listy kanałów: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Błąd podczas zapisu pliku z eksportowanymi kanałami.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13452,7 +13312,7 @@ msgstr ""
 "\n"
 "Nazwa katalogu '%s' nie dozwolona."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13466,140 +13326,140 @@ msgstr ""
 "Każdy kanał będzie posiadał katalog z wiadomościami, pobranymi z sieci. "
 "Możesz je czytać, usuwać lub zapisywać."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "Kanał RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(pusty)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Odśwież wszystkie kanały"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Zacznij śledzić kanał"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Wpisz adres URL kanału, który chcesz zacząć śledzić:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' nie może występować w nazwie katalogu."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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 potrzebuje dostępu do sieci żeby odświeżyć kanał."
 msgstr[1] "Claws Mail potrzebuje dostępu do sieci żeby odświeżyć kanały."
 msgstr[2] "Claws Mail potrzebuje dostępu do sieci żeby odświeżyć kanały."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Na pewno usunąć drzewo kanału `%s' ?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Usuń drzewo kanałów"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "Wybierz plik OPML"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: Zaczęto śledzić nowy kanał %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: Zaczęto śledzić nowy kanał: '%s' (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Odświeżanie kanału: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: odświeżanie zakończone: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: Błąd pobierania kanału z '%s': %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: Nie znaleziono poprawnego kanału na '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: Nie można przetworzyć kanału z '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 "RSSyl: Aplikacja kończy działania, nie można skończyć uaktualniania kanału z "
 "'%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "Uwierzytelnienia HTTP Basic"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Użyj domyślnego odstępu odświeżania"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Zachowaj stare elementy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "_Obetnij"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Uaktualnij kanał usuwając wpisy, które już nie są w źródle kanału"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Pobierz komentarze jeśli to możliwe"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Zawsze oznaczaj jako nowe"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "Oznacz jako nową, tylko gdy tekst uległ zmianie"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "Nigdy nie oznaczaj jako nowy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "Wstaw tytuły elementów na początek wiadomości"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Pomiń zmianę tytułu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13607,94 +13467,94 @@ msgstr ""
 "Włącz to aby zachować bieżącą nazwę katalogu, nawet gdy autor zmieni tytuł "
 "kanału."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "Potwierdź poprawność certyfikatu TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Nazwa pliku"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "Adres źródłowy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "Pobierz komentarze do postów, które są młodsze niż"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dni"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "Ustaw -1 aby pobrać wszystkie komentarze"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Gdy wpis ulegnie zmianie"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Wpisy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Okres odświeżania"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Ustaw na 0 żeby wyłączyć okresowe odświeżanie tego kanału"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Ustaw właściwości kanału"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "_Odśwież kanał"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "Właściw_ości kanału"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "Prze_mianuj..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "Poszuk_aj wgłąb"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "Zacznij śledzić _nowy kanał..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "Utwórz _nowy katalog..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Import listy kanałów..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Usuń drzewo"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "Dodaj katalog RSS"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Wpisz nazwę nowego katalogu RSS."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13703,58 +13563,58 @@ msgstr ""
 "Utworzenie katalogu nie powiodło się.\n"
 "Może pliki już istnieją lub nie masz praw do zapisu w tym miejscu?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Moje Kanały"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Wybierz plik ciasteczek"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Domyślny odstęp czasu między odświeżeniami"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "Odśwież wszystkie kanały podczas startu programu"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
+msgstr "Odśwież wszystkie kanały zaraz po uruchomieniu"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Sprawdź ważność certyfikatów TLS dla nowych kanałów"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Ścieżka do pliku ciasteczek"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 "Ścieżka do pliku cookies.txt, w formacie Netscape, który zawiera twoje "
 "ciasteczka"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Odświeżanie"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Bezpieczeństwo i prywatność"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "Nie można było stworzyć katalogu dla nowego kanału '%s'."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Czy zacząć śledzić nowy kanał?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Katalog kanału:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
@@ -13762,35 +13622,35 @@ msgstr ""
 "Zamiast używać oficjalnego tytułu, możesz wpisać inną nazwę katalog dla tego "
 "kanału."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "Dostosuj właściwości kanału rozpoczęciu jego śledz_enia"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Uaktualnianie uwag dla %s ..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Wymagane uwierzytelnienie)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Nieautoryzowany)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Nie znaleziono)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Błąd %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13804,7 +13664,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13813,21 +13673,21 @@ msgstr ""
 "Nie znaleziono poprawnego kanału na\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Kanał bez tytułu"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Prawdopodobny niepoprawny kanał bez tytuł na %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Odświeżanie '%s..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13840,18 +13700,18 @@ msgstr ""
 "\n"
 "Proszę skontaktuj się z programistami, to nie powinno się wydarzyć."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail potrzebuje dostępu do sieci żeby odświeżyć twoje kanały."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
-"Napotkano błąd wewnętrzny podczas uaktualniania formatu przechowalni. Nie"
-" powinno było do tego dojść. Zalecamy zgłoszenie tego wraz z załączonym"
-" wyjściem diagnostycznym.\n"
+"Napotkano błąd wewnętrzny podczas uaktualniania formatu przechowalni. Nie "
+"powinno było do tego dojść. Zalecamy zgłoszenie tego wraz z załączonym "
+"wyjściem diagnostycznym.\n"
 
 #: src/plugins/smime/plugin.c:61
 msgid ""
@@ -13947,41 +13807,45 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "Zgłaszanie spamu"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Włączone"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Przekaż do:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Nazwa użytkownika:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Wtyczka SpamAssassin nie może połączyć się ze spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrowanie wiadomości przez wtyczkę SpamAssassin nie powiodło się.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Wtyczka SpamAssassin został wyłączona w jej ustawieniach.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "filtrowanie wiadomości SpamAssassin..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -13991,7 +13855,7 @@ msgstr ""
 "Prawdopodobnie z powodu nieosiągalności usługi spamd. Upewnij się, że spamd "
 "jest uruchomiony i osiągalny."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13999,15 +13863,15 @@ msgstr ""
 "Claws Mail potrzebuje dostępu do sieci aby przekazać wiadomości to zdalnego "
 "ucznia."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Nie powiodło się pobranie nazwy użytkownika"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "Wczytano wtyczkę SpamAssassin, lecz wyłączono ją w ustawieniach.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14472,63 +14336,68 @@ msgstr "Uczestnicy:"
 msgid "Action:"
 msgstr "Działanie:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Nowe spotkanie"
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "Wy_eksportuj kalendarz..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "Zacznij śledzić Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "P_rzemianuj..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "Uaktualnij śledzone"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "Widok _listy"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "_Widok tygodni"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "Widok _miesięcy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Spotkania"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[bez podsumowania]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "w przeszłości"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "dzisiaj"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "jutro"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "w tym tygodniu"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "później"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14537,21 +14406,21 @@ msgstr ""
 "\n"
 "Te spotkania są zaplanowane %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Upłynął czas połączenia (%d sekund) do %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (Nieautoryzowany)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Błąd: %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14564,7 +14433,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14575,111 +14444,111 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nie można utworzyć katalogu %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws Mail potrzebuje dostępu do sieci w celu odświeżenia kanału Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Pobieranie kalendarza dla %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "nowy śledzony"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail potrzebuje dostępu do sieci żeby odświeżyć śledzone."
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Zacznij śledzić Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "Wpisz adres URL WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "Błędny adres URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Czy na pewno chcesz przestać śledzić?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Przestań śledzić"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "przyjęto"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "wstępnie przyjęto"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "odmówiono"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "nie odpowiedziano"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "indywidualny"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "grupa"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "zasób"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "pokój"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "Przeszłość"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Jutro"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "W tym tygodniu"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "Później"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Przyjęto: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Odwołany: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Wstępnie przyjęto: "
 
@@ -15092,95 +14961,95 @@ msgstr "Błąd składni przy znaczniku czasowym powitania\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Błąd składni przy znaczniku czasowym powitania (nie jest w ASCII)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "Błąd protokołu POP\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "niewłaściwa odpowiedź UIDL: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Usuwanie przeterminowanych wiadomości %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Pomijanie wiadomości %d [%s] (%d bajtów)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "skrzynka zablokowana\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "Upłynął czas oczekiwania na sesję\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "nieobsługiwane polecenie\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "wystąpił błąd podczas sesji POP\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "polecenie TOP nie jest obsługiwana\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Wieści (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Plik miejscowej skrzynki mbox"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Żaden (tylko SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Nazwa konta"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Ustaw jako konto domyślne"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Dane osobowe"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "Adres pocztowy"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Sam ustaw"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15188,81 +15057,81 @@ msgstr ""
 "Ostrzeżenie: ta wersja Claws Mail\n"
 "została zbudowana bez obsługi IMAP oraz News."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga uwierzytelniania"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "Uwierzytelnij przy połączeniu"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "Serwer wieści"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Serwer do pobierania"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Lokalny mailbox"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (do wysyłania)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "Użyj polecenia mail zamiast serwera SMTP"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "polecenia do wysyłania poczty"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Lokalny"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "Domyślna skrzynka poczty przychodzącej"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Niefiltrowane wiadomości będą przetrzymywane w tym katalogu"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "Uwierzytelnij przed połączeniem POP"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "Po odebraniu usuń wiadomość z serwera"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Usuń po"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dni oraz 0 godzin : usuw natychmiast"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Graniczny rozmiar przy pobieraniu"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15270,95 +15139,99 @@ msgstr ""
 "Wiadomości powyżej tej granicy będą pobierane częściowo. Po ich zaznaczeniu "
 "będziesz mieć możliwość ich pełnego pobrania lub usunięcia."
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Graniczna liczba artykułów do pobrania"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "nieskończona jeśli podano 0"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Zwykły tekst"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(zazwyczaj puste)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Pokaż tylko katalogi, które śledzę"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Tryb oszczędzania łącza (zapobiega pobieraniu zdalnych znaczników)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Ten tryb w mniejszym stopniu obciąża łącze, ale może powodować wolniejsze "
 "działanie przy niektórych serwerach."
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Rozmiar wsadu"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Sprawdzanie okresowe"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Użyj ustawień globalnych"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Odpytuj o nowe wiadomości co"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "Filtruj wiadomości w trakcie ich pobierania"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "Zezwól wtyczkom na filtrowanie wiadomości w trakcie ich pobierania"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "Poszukaj nowych wiadomości na tym koncie po naciśnięciu 'Pobierz wiadomości'"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Nagłówek"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "Wytwórz ID-wiadomości"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "Wyślij adres konta w ID-wiadomości"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Dodaj nagłówek user agent"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Dodaj nagłówek określony przez użytkownika"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnienie SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15366,215 +15239,215 @@ msgstr ""
 "Jeśli pozostawisz te pola puste, to zostanie użyty ten sam login i hasło co "
 "przy pobieraniu."
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "Uwierzytelnij z POP przed wysłaniem"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "Upłynął czas oczekiwania uwierzytelnienie POP"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Uwierzytelnienie"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Wybierz dostawcę usług dla wiadomości OAuth2"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "Identyfikator Klienta"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "Dana poufna klienta"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Pobierz kod uwierzytelniający"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "Otwórz domyślną przeglądarkę wraz z zapytaniem"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Skopiuj odnośnik"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Kod uwierzytelnienia"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr "Wklej cały adres URL z przeglądarki lub dostarczonego  tokena auth"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Dokończ uwierzytelnienie"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Uwierzytelnij"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "Sam wstaw podpis"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "Podpis oddziel"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Wynik polecenia"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Sam dodaj następujące adresy"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "Sprawdź pisownię poniższymi słownikami"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Domyślny słownik"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Domyślny zapasowy słownik"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Pisanie wiadomości"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Domyślny system ochrony prywatności"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Podpisz każdą wiadomość"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Zaszyfruj każdą wiadomość"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "Podpisz wiadomość, gdy odpowiadam na podpisaną wiadomość"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Zaszyfruj wiadomość, gdy odpowiadam na zaszyfrowaną wiadomość"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zaszyfruj wysyłane wiadomości także przy użyciu własnego klucza"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Zapisz wysłane, zaszyfrowane wiadomości zwykłym tekstem"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "Nie używaj TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Użyj polecenia STARTTLS, aby nawiązać zaszyfrowaną sesję"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Wysyłanie (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Nie używaj TLS (ale w razie potrzeby użyj STARTTLS)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "Certyfikaty klienta"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Certyfikaty do pobierania"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Plik certyfikatów klienta file jako plik PKCS12 lub PEM"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Certyfikat do wysyłania"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Sam zatwierdzaj prawidłowe certyfikaty TLS"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Użyj nieblokującego TLS"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Wyłącz to, jeśli masz kłopoty z połączeniem TLS"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Użyj serwera pośredniczącego"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Użyj ustawień domyślnych"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Użyj globalnych ustawień serwera pośredniczącego"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Uwierzytelnij się"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Użyj serwera pośredniczącego do wysyłania"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15582,27 +15455,27 @@ msgstr ""
 "Jeśli wyłączone, wiadomości będą wysyłane używając bezpośredniego połączenia "
 "do ustawionego serwera wysyłania, omijając ustawione serwery pośredniczące"
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "Port serwera SMTP"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "Port serwera POP"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "Port serwera IMAP"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "Port serwera NNTP"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Nazwa domeny"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15610,174 +15483,178 @@ msgstr ""
 "Nazwa domeny zostanie użyta w wytworzenia identyfikatora wiadomości, jak "
 "również podczas łączenia z serwerami SMTP."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Użyj tego polecenia do porozumiewania się z serwerem"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Oznacz cross-posty jako przeczytane i zakoloruj:"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Umieść wiadomości wysłane w"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Umieść wiadomości z kolejki w"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Umieść wiadomości robocze w"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Umieść usunięte wiadomości w"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "Nie wpisano nazwy konta."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "Nie wpisano adresu pocztowego."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "Nie wpisano serwera SMTP."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "Nie wpisano ID użytkownika."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "Nie wpisano serwera POP."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "Domyślny katalog poczty przychodzącej nie istnieje."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "Nie wpisano serwera IMAP."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "Nie wpisano serwera NNTP."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "nie wpisano ścieżki do pliku miejscowej skrzynki mailbox."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "nie wpisano polecenia poczty."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "ID użytkownika nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "Hasło nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "ID użytkownika SMTP nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "Hasło SMTP nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "nie podano domeny."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "nie wybrano katalogu wysłanych."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "nie wybrano katalogu kolejki."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "nie wybrano katalogu roboczych."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "nie wybrano katalogu kosza."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "Pobieranie"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "Wysyłanie"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Wzorce"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Pośrednik"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Rozszerzone"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Ustawianie nowego konta"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Ustawienia konta"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Niepowodzenie (błędy adres)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "Wybierz plik z podpisem"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Wybierz plik certyfikatu"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (nie wczytano wtyczki)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "Ukończono uwierzytelnianie"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "Claws Mail otrzymał twój kod uwierzytelniający OAuth2"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "NIE ukończono uwierzytelniania"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "Claws Mail nie otrzymał twojego kodu uwierzytelniającego OAuth2"
 
@@ -15948,8 +15825,8 @@ msgstr "<span weight=\"bold\">Rozpocznij poniższymi:</span>"
 #: src/prefs_actions.c:994
 msgid "to send message body or selection to command's standard input"
 msgstr ""
-"aby wysłać treść wiadomości lub jej zaznaczenie na standardowe wejście"
-" polecenia"
+"aby wysłać treść wiadomości lub jej zaznaczenie na standardowe wejście "
+"polecenia"
 
 #: src/prefs_actions.c:995
 msgid "to send user provided text to command's standard input"
@@ -15966,8 +15843,8 @@ msgstr "<span weight=\"bold\">Zakończ poniższymi:</span>"
 #: src/prefs_actions.c:998
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
-"aby zamienić treść wiadomości lub wybrany jej kawałek standardowym wyjściem"
-" polecenia"
+"aby zamienić treść wiadomości lub wybrany jej kawałek standardowym wyjściem "
+"polecenia"
 
 #: src/prefs_actions.c:999
 msgid "to insert command's standard output without replacing old text"
@@ -16018,7 +15895,7 @@ msgstr ""
 msgid "for a literal %"
 msgstr "aby użyć znaku % dosłownie"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Działania"
 
@@ -16027,8 +15904,8 @@ msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
 msgstr ""
-"Działania są sposobem na uruchomienie zewnętrznych poleceń do przetworzenia"
-" pliku całej wiadomości lub tylko niektórych z jej części."
+"Działania są sposobem na uruchomienie zewnętrznych poleceń do przetworzenia "
+"pliku całej wiadomości lub tylko niektórych z jej części."
 
 #: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
 #: src/prefs_template.c:1107
@@ -16133,7 +16010,7 @@ msgstr "Domyślnie odpowiedz cytując"
 
 #: src/prefs_compose_writing.c:217
 msgid "Reply button invokes mailing list reply"
-msgstr "Przycisk odpowiadania odpowiada na listę dyskusyjną"
+msgstr "Przycisk odpowiadania odpowiada na listę wysyłkową"
 
 #: src/prefs_compose_writing.c:219
 msgid "Forwarding"
@@ -16327,7 +16204,7 @@ msgstr "Ukryj"
 msgid "Message flags"
 msgstr "Flagi wiadomości"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Oznacz"
@@ -16353,7 +16230,7 @@ msgstr "Oznacz jako ham"
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Kolorowa etykieta"
 
@@ -16368,7 +16245,7 @@ msgstr "Przekieruj"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Punktacja"
@@ -16640,8 +16517,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Ukryte kolumny"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Wyświetlane kolumny"
 
@@ -16850,7 +16727,7 @@ msgstr "Użyj innej czcionki do drukowania"
 msgid "Message Printing"
 msgstr "Drukowanie wiadomości"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Wyświetlanie"
@@ -17106,11 +16983,11 @@ msgstr "treści wiadomości"
 msgid "whole message"
 msgstr "całej wiadomości"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "Oznaczona"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Usunięte"
 
@@ -17118,11 +16995,11 @@ msgstr "Usunięte"
 msgid "Replied"
 msgstr "Odpowiedziane"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Przekazane"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Spam"
@@ -17131,7 +17008,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Posiada załącznik"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "Podpisane"
 
@@ -17445,15 +17322,15 @@ msgstr "Wiadomości HTML"
 
 #: src/prefs_message.c:164
 msgid "Render HTML messages as text"
-msgstr "Wyświetlaj wiadomości HTML jako zwykły tekst"
+msgstr "Wiadomości HTML wyświetlaj jako zwykły tekst"
 
 #: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
-msgstr "Wyświetlaj wiadomości tylko-HTML przy użyciu wtyczki, jeśli to możliwe"
+msgstr "Wiadomości tylko-HTML wyświetlaj przy użyciu wtyczki, jeśli to możliwe"
 
 #: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
-msgstr "Wybierz część HTML z wieloczęściowych wiadomości"
+msgstr "W wiadomościach wieloczęściowych wybieraj HTML, jeśli to możliwe"
 
 #: src/prefs_message.c:180
 msgid "Line space"
@@ -17644,7 +17521,7 @@ msgstr "Wybierz kolor dla różnic plików"
 msgid "Hunk lines"
 msgstr "Wiersze kawałków"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Spis katalogów"
 
@@ -18131,112 +18008,116 @@ msgstr "Wybierz kolor dla wyrazu o złej pisowni. Wybierz czarny aby podkreśla
 msgid "Spell Checking"
 msgstr "Sprawdzanie pisowni"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "skrócona nazwa dnia tygodnia"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "pełna nazwa dnia"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "skrócona nazwa miesiąca"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "pełna nazwa miesiąca"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "domyślna data oraz czas dla bieżącego języka"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "numer wieku (rok/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "dzień jako liczba"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako numer (zegar 24 godzinny)"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako numer (zegar 12 godzinny)"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "dzień roku jako liczba"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "miesiąc jako liczba"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "drugie jako liczba"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "dzień tygodnia jako liczba"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "domyślna data dla bieżącego języka"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie liczby roku"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "rok jako liczba"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasu lub nazwa lub skrót"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Zapis daty"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "Wybierz plik"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Przykład"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Wyświetl licznik liczby wiadomości obok nazwy katalogu"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Nieprzeczytane wiadomości"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Wszystkie i nieprzeczytane wiadomości"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
 msgstr "Otwórz ostatni otwarty katalog zaraz po uruchomieniu"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "Otwórz wybrany katalog zaraz po uruchomieniu"
+
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18244,99 +18125,99 @@ msgstr ""
 "Wykonaj zasady przetwarzania przed oznaczeniem wszystkich wiadomości w "
 "katalogu jako przeczytane lub nieprzeczytane"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skracaj nazwy źródła wieści do"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "liter(y)"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "Spis wiadomości"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Nie odpowiadaj na naciśnięcia kolumn"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Wyświetlane w kolumnie Od"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Nazwa oraz adres"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Pomoc formatu daty"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Określ otwartą wiadomość po otwarciu katalogu"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Otwórz wiadomość po jej zaznaczeniu"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "Po otwarciu katalogu"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "Po wyświetleniu wyników wyszukiwania"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Po wybraniu następnej lub poprzedniej wiadomości, używając skrótów"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "Po usunięciu lub przeniesieniu wiadomości"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "Po użyciu klawiszy kierunkowych"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Oznacz wiadomość jako przeczytaną"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "po jej zaznaczeniu i po czasie"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "tylko po jej otwarciu w nowym oknie lub odpowiedzeniu na nią"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Pokaż okno \"nie ma żadnych nieprzeczytanych (lub nowych) wiadomości\""
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "Domyślnie 'Tak'"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "Domyślnie 'Nie'"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Wyświetl nadawcę, używając książki adresowej"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "Wątek używa tematu w dodatku do standardowych nagłówków"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Przenoś lub usuwaj wiadomości ze skutkiem natychmiastowym"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18344,57 +18225,57 @@ msgstr ""
 "Gdy nie zaznaczono przenoszenie, kopiowanie i usuwanie wiadomości jest "
 "opóźnione do czasu wybrania 'Narzędzia/Wykonaj'"
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr ""
-"Proś o potwierdzenie przy oznaczaniu wszystkich wiadomości  jako przeczytane"
-" lub nieprzeczytane"
+"Proś o potwierdzenie przy oznaczaniu wszystkich wiadomości  jako przeczytane "
+"lub nieprzeczytane"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Zapytaj przed zmianą kolorowej etykiety"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Pokaż wskazówki"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Domyślne"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Nowe katalogi"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Uszereguj wg"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Numer"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "wg daty wątku"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "Nie szereguj"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Wątkuj widok"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Zwiń wszystkie wątki"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Ukryj przeczytane wiadomości"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Widok podsumowania"
 
@@ -18568,7 +18449,7 @@ msgstr "Bieżące wzorce"
 msgid "Template"
 msgstr "Wzorzec"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Domyślny wewnętrzny wygląd"
 
@@ -18576,21 +18457,16 @@ msgstr "Domyślny wewnętrzny wygląd"
 msgid "Themes"
 msgstr "Wyglądy"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Usuń wygląd systemowy '%s'"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Usuń wygląd '%s'"
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Czy na pewno usunąć ten wygląd?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18599,24 +18475,24 @@ msgstr ""
 "Wystąpił błąd pliku %s\n"
 "podczas usuwania wyglądu."
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Nie udało się usunąć katalogu wyglądu."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Pomyślnie usunięto wygląd"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Wybierz katalog wyglądu"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Wgraj wygląd '%s'"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18624,15 +18500,11 @@ msgstr ""
 "Ten katalog nie wygląda na katalog wyglądu.\n"
 "Czy wgrać mimo tego?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "Czy chcesz wgrać wygląd dla wszystkich użytkowników systemu?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "Wygląd już istnieje"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18644,25 +18516,25 @@ msgstr ""
 "\n"
 "Czy chcesz go zastąpić?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Nie udało się usunąć starego wyglądu w %s."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Nie można utworzyć katalogu docelowego %s."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "Pomyślnie wgrano wygląd."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "Nie udało się wgrać wyglądu"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18671,78 +18543,78 @@ msgstr ""
 "Wystąpił błąd pliku %s\n"
 "podczas wgrywania wyglądu."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Zobacz wszystkie ikony z zestawu"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "dostępne wyglądy- %d (%d użytkownika, %d systemowe, 1 wewnętrzne)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Wewnętrzny wygląd zawiera %d ikon"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "Brak pliku szczegółów dla tego wyglądu"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Błąd: Nie można odczytać stanu wyglądu"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d plików (w tym ikony: %d), rozmiar: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Wybór"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Wgraj nowe..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Pobierz więcej..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Szczegóły"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Autor"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Podgląd"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Zobacz wszystkie"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "Wyświetlanie SVG"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "Włącz kanał alfa"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Wymuś skalowanie"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "Piksele na cal (PPI)"
 
@@ -18891,7 +18763,7 @@ msgstr "Nie określono kluczy odbiorcy."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Błąd podczas dekodowania BASE64]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "Nie można odczytać części wiadomości"
 
@@ -19135,8 +19007,8 @@ msgid ""
 "to attach"
 msgstr ""
 "załącz plik:\n"
-"<span style=\"oblique\">sub_expr </span> zostanie odczytane jako ścieżka"
-" pliku do załączenia"
+"<span style=\"oblique\">sub_expr </span> zostanie odczytane jako ścieżka "
+"pliku do załączenia"
 
 #: src/quote_fmt.c:95
 msgid ""
@@ -19146,9 +19018,8 @@ msgid ""
 "the filename from"
 msgstr ""
 "załącz plik:\n"
-"<span style=\"oblique\">sub_expr </span> zostanie odczytane jako polecenie"
-" wiersza poleceń, "
-"z którego\n"
+"<span style=\"oblique\">sub_expr </span> zostanie odczytane jako polecenie "
+"wiersza poleceń, z którego\n"
 "pobrać nazwę pliku"
 
 #: src/quote_fmt.c:97
@@ -19345,22 +19216,6 @@ msgstr ""
 "Wystąpił błąd podczas wysyłania wiadomości:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Ustawienia skrzynki"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Najpierw wybierz miejsce skrzynki.\n"
-"Jeśli posiadasz, to możesz użyć istniejącej\n"
-"skrzynki w formacie MH.\n"
-"Jeśli nie jesteś pewien, wybierz OK."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Źródło wiadomości"
@@ -19640,11 +19495,11 @@ msgstr "Od: %s, w %s"
 msgid "To: %s, on %s"
 msgstr "Do: %s, w %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "Nie jesteś autorem artykułu."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -19652,83 +19507,83 @@ msgstr[0] "Czy na pewno usunąć %d zaznaczoną wiadomość?"
 msgstr[1] "Czy na pewno usunąć %d zaznaczone wiadomości?"
 msgstr[2] "Czy na pewno usunąć %d zaznaczonych wiadomości?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Usuń wiadomość"
 msgstr[1] "Usuń wiadomości"
 msgstr[2] "Usuń wiadomości"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Wybierz katalog, do którego przenieść zaznaczoną wiadomość"
 msgstr[1] "Wybierz katalog, do którego przenieść zaznaczone wiadomości"
 msgstr[2] "Wybierz katalog, do którego przenieść zaznaczone wiadomości"
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "Katalog docelowy jest taki sam jak bieżący."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Wybierz katalog, do którego skopiować zaznaczoną wiadomość"
 msgstr[1] "Wybierz katalog, do którego skopiować zaznaczone wiadomości"
 msgstr[2] "Wybierz katalog, do którego skopiować zaznaczone wiadomości"
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "Dopisać, czy zastąpić"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Dopisać się, czy zastąpić istniejący plik?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "_Dopisz"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "_Zastąp"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nie można zapisać pliku '%s'."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Nastąpi wydrukowanie %d wiadomości. Czy na pewno to zrobić?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Budowanie wątków..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Pomiń te zasady"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Wykonaj te zasady, bez względu na to z jakim kontem są powiązane"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "Wykonaj te zasady, jeśli powiązane są z bieżącym kontem"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Filtrowanie"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19736,73 +19591,73 @@ msgstr ""
 "Istnieją zasady filtrowania należące do tego konta.\n"
 "Wybierz co z nimi zrobić:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Filtrowanie..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Ustawienia przetwarzania"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Czy na pewno wyzerować kolorową etykietę wszystkim zaznaczonym wiadomościom?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Czy na pewno nadać kolorową etykietę wszystkim zaznaczonym wiadomościom?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Wyzeruj kolorową etykietę"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Ustaw kolorową etykietę"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Pominięty wątek"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Śledzony wątek"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpowiedziano, ale także przekazano - naciśnij, aby zobaczyć odpowiedź"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Odpowiedziano - naciśnij, aby zobaczyć odpowiedź"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "Do przeniesienia"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "Do skopiowania"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "Podpisana, posiada załącznik(i)"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "Wiadomość jest zaszyfrowana i posiada załącznik(i)"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Zaszyfrowana wiadomość"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "Wiadomość posiada załącznik(i)"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19811,11 +19666,11 @@ msgstr ""
 "Błąd regularnego wyrażenia (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Powrót do listy katalogów (Masz nieprzeczytane wiadomości)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Powrót do listy katalogów"
 
@@ -20017,7 +19872,7 @@ msgstr "Odpowiada wszystkim"
 
 #: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
 msgid "Reply to Mailing-list"
-msgstr "Odpowiada na listę dyskusyjną"
+msgstr "Odpowiada na listę wysyłkową"
 
 #: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
@@ -20357,7 +20212,7 @@ msgstr "Możliwości odpowiadania wszystkim"
 
 #: src/toolbar.c:2470
 msgid "Reply to Mailing-list options"
-msgstr "Możliwości odpowiadania do listy dyskusyjnej"
+msgstr "Możliwości odpowiadania na listy wysyłkowej"
 
 #: src/toolbar.c:2487
 msgid "Forward Message options"
@@ -20449,8 +20304,8 @@ msgstr ""
 "-----------------------\n"
 "\n"
 "Twoje konto pocztowe zostało już ustawione, więc możesz pobrać \n"
-"swoją pocztę, naciskając na przycisk \"Pobierz wiadomości\" z paska narzędzi."
-" \n"
+"swoją pocztę, naciskając na przycisk \"Pobierz wiadomości\" z paska "
+"narzędzi. \n"
 "\n"
 "Możliwości programu Claws Mail można rozszerzać za pomocą dodatkowych "
 "wtyczek,\n"
@@ -20476,7 +20331,7 @@ msgstr ""
 "Podręcznik użytkownika: <%s>\n"
 "FAQ:                    <%s>\n"
 "Zestawy ikon:           <%s>\n"
-"Listy dyskusyjne:       <%s>\n"
+"Listy wysyłkowe:       <%s>\n"
 "\n"
 "LICENCJA\n"
 "--------\n"
@@ -20639,9 +20494,9 @@ msgid ""
 msgstr ""
 "Witaj w pomocniku ustawień Claws Mail.\n"
 "\n"
-"Rozpoczniemy od ustawienia podstawowych danych o tobie i wspólnych ustawień"
-" twojej poczty tak, abyś mógł/mogła zacząć używać Claws Mail w mniej niż pięć"
-" minut."
+"Rozpoczniemy od ustawienia podstawowych danych o tobie i wspólnych ustawień "
+"twojej poczty tak, abyś mógł/mogła zacząć używać Claws Mail w mniej niż pięć "
+"minut."
 
 #: src/wizard.c:1882
 msgid "About You"
@@ -20674,56 +20529,3 @@ msgid ""
 msgstr ""
 "Claws Mail jest teraz gotowy.\n"
 "Naciśnij Zapisz, aby zacząć go używać."
-
-#~ msgid "Select preset:"
-#~ msgstr "Wybrany zestaw:"
-
-#~ msgid ""
-#~ "You can also modify each menu shortcut by pressing\n"
-#~ "any key(s) when focusing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Możesz także zmienić każdy skrót menu, naciskając\n"
-#~ "dowolny klawisz(e) po najechaniu myszą na daną rzecz."
-
-#~ msgid "Move Email Addresses to or from Group with arrow buttons"
-#~ msgstr ""
-#~ "Przesuń adresy e-mail z lub do grupy używając przycisków ze strzałkami."
-
-#, c-format
-#~ msgid ""
-#~ "rule is account-based [id=%d, name='%s'], current account [id=%d, "
-#~ "name='%s']\n"
-#~ msgstr ""
-#~ "zasada zależna od konta [id=%d, name='%s'], aktualne konto [id=%d, "
-#~ "name='%s']\n"
-
-#~ msgctxt "IPv6"
-#~ msgid ""
-#~ "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-#~ msgstr ""
-#~ "dodaje obsługę adresów IPv6, nowego internetowego protokołu adresowania\n"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be permanently deleted. Recovery "
-#~ "will not be possible.\n"
-#~ "\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Wszystkie katalogi i wiadomości w '%s' zostaną trwale usunięte.\n"
-#~ "Odzyskanie ich nie będzie możliwe.\n"
-#~ "Naprawdę chcesz usunąć?"
-
-#~ msgid "Skip"
-#~ msgstr "Pomiń"
-
-#~ msgid "Skip all"
-#~ msgstr "Pomiń wszystkie"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be deleted.\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Wszystkie katalogi i wiadomości w '%s' zostaną trwale usunięte.\n"
-#~ "Czy na pewno usunąć?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2709285c2..e884106bd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,21 +4,21 @@
 # as the Claws Mail package, see COPYING file.
 #
 #
-# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2017, 2021, 2022.
+# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2017, 2021, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git127\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-11 10:26+0100\n"
-"PO-Revision-Date: 2022-10-16 13:49-0300\n"
-"Last-Translator: Frederico Gonçalves Guimarães <frederico at teia.bio.br>\n"
+"POT-Creation-Date: 2023-11-13 16:14+0000\n"
+"PO-Revision-Date: 2023-11-19 17:20-0300\n"
+"Last-Translator: Frederico Goncalves Guimaraes <frederico at teia.bio.br>\n"
 "Language-Team: Portuguese <translators at lists.claws-mail.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 21.12.3\n"
+"X-Generator: Lokalize 22.12.3\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -54,8 +54,8 @@ msgstr "_Nova"
 msgid "Create a new account"
 msgstr "Cria uma conta nova"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -67,8 +67,8 @@ msgstr "Edita as preferências da conta selecionada"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -84,8 +84,8 @@ msgstr "E_xcluir"
 msgid "Delete the selected account from the list"
 msgstr "Exclui a conta selecionada da lista"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
@@ -126,26 +126,26 @@ msgstr "Move a conta selecionada para cima"
 msgid " _Set as default account "
 msgstr " Definir como conta _padrão "
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Fechar"
@@ -159,53 +159,52 @@ msgstr "Contas com pastas remotas não podem ser copiadas."
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Deseja realmente excluir a conta '%s'?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Excluir conta"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -214,88 +213,88 @@ msgstr "Excluir conta"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "R"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca as mensagens das contas marcadas"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Servidor"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Não foi possível obter o arquivo da mensagem %d"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "Não foi possível obter parte da mensagem."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Não foi possível obter parte da mensagem com múltiplas partes: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -304,11 +303,11 @@ msgstr ""
 "A ação selecionada não pode ser usada na janela de composição\n"
 "porque ela contem %%f, %%F, %%as ou %%p."
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "Não existe nenhuma ação de filtragem definida"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -317,7 +316,7 @@ msgstr ""
 "Ação(ões) de filtragem inválida(s):\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -328,44 +327,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Completado"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Executando: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Entrada/saída da ação"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "E_xecutar"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "_Parar"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -376,11 +375,11 @@ msgstr ""
 "('%%h' será substituído pelo argumento)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Argumento do usuário para a ação escondido"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -391,26 +390,26 @@ msgstr ""
 "('%%u' será substituído pelo argumento)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Argumento do usuário para ação"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
 "Não é possível copiar a pasta para dentro dela mesma ou de sua sub-estrutura."
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "Não é possível copiar um Livro de Endereços para ele mesmo."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "Não é possível mover uma pasta para dentro dela mesma ou de sua sub-"
 "estrutura."
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Grupo"
@@ -483,40 +482,40 @@ msgstr ""
 "Deseja realmente substituir todos os nomes de\n"
 "atributos pelos valores originais?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_Não"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Sim"
 
@@ -555,31 +554,30 @@ msgstr "_Adicionar"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_Ok"
@@ -611,7 +609,7 @@ msgstr ""
 "O Claws Mail irá agora pesquisar endereços de email duplicados no livro de "
 "endereços."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "Locali_zar"
@@ -626,7 +624,7 @@ msgid "Duplicate email addresses"
 msgstr "Endereços de email duplicados"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Endereço"
@@ -635,11 +633,11 @@ msgstr "Endereço"
 msgid "Address book path"
 msgstr "Caminho do livro de endereços"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "Deseja realmente excluir o(s) endereço(s)?"
 
@@ -647,7 +645,7 @@ msgstr "Deseja realmente excluir o(s) endereço(s)?"
 msgid "Delete address"
 msgstr "Excluir endereço"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr ""
 "Os dados deste endereço são \"somente para leitura\" e não podem ser "
@@ -661,7 +659,7 @@ msgstr "Adicionar ao Livro de Endereços"
 msgid "Contact"
 msgstr "Contato"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Notas"
@@ -670,7 +668,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "Adicionar endereço(s)"
 
@@ -678,50 +676,50 @@ msgstr "Adicionar endereço(s)"
 msgid "Can't add the specified address"
 msgstr "Não foi possível adicionar o endereço especificado"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "Endereço de email"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "Li_vro"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Novo li_vro"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "Nova _pasta"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "Novo _vCard"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "Novo _JPilot"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "Novo Servidor _LDAP"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "_Editar livro"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "E_xcluir livro"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -729,189 +727,189 @@ msgstr "E_xcluir livro"
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "Selecionar _todos"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "_Recortar"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "Novo e_ndereço"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "Novo _grupo"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "Enviar _mensagem para"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "_Mesclar"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "Importar arquivo _LDIF..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "Importar arquivo do _Mutt..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "Importar arquivo do _Pine..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "Exportar _HTML..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "Exportar L_DIF..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Encontrar d_uplicatas..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Editar atributos _personalizados..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "Percorrer a entra_da"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Sucesso"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Argumentos incorretos"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "Arquivo não especificado"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Ocorreu um erro ao abrir o arquivo"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Ocorreu um erro ao ler o arquivo"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Foi encontrado o fim do arquivo"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Ocorreu um erro de alocação de memória"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Formato do arquivo incorreto"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Ocorreu um erro ao escrever no arquivo"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Ocorreu um erro ao abrir o diretório"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "Não foi especificado nenhum caminho"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "Ocorreu um erro ao conectar ao servidor LDAP"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "Ocorreu um erro na inicialização do LDAP"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "Ocorreu um erro durante a conexão com o servidor LDAP"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "Ocorreu um erro durante a pesquisa no banco de dados LDAP"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "Tempo esgotado durante a operação do LDAP"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "Erro no critério de pesquisa no LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "Não foram encontradas entradas LDAP para o critério da pesquisa"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "A pesquisa no LDAP foi terminada sob solicitação"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "Erro ao iniciar a conexão STARTTLS"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Falta o Distinguished Name (dn)"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Faltam informações necessárias"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "Já existe outro contato com essa chave"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "Foi requerida uma autenticação (mais) forte"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Fontes"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Livro de endereços"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Excluir grupo"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -919,28 +917,28 @@ msgstr ""
 "Deseja realmente excluir esse(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr ""
 "Não é possível colar. O livro de endereços de destino é \"somente para "
 "leitura\"."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Não é possível colar em um grupo de endereços."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Deseja excluir os resultados da consulta e endereços em '%s'?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -949,20 +947,20 @@ msgstr ""
 "Deseja excluir '%s'? Se você excluir somente a pasta, os endereços nela "
 "contidos serão movidos para a pasta superior."
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Excluir a pasta"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Excluir somente a _pasta"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Excluir a pasta e os _endereços"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -971,7 +969,7 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos não serão perdidos."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -980,29 +978,29 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos serão perdidos."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Pesquisar '%s'"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Novos contatos"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr ""
 "Novo usuário, não foi possível salvar os arquivos do livros de endereços."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -1010,7 +1008,7 @@ msgstr ""
 "O Livro de Endereços antigo foi convertido,\n"
 "não foi possível salvar o novo arquivo de índice dos endereços."
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1018,7 +1016,7 @@ msgstr ""
 "Não foi possível converter o Livro de\n"
 "Endereços, mas foi criado um novo, em branco."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1026,7 +1024,7 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços,\n"
 "nem foi possível salvar o novo arquivo de índice dos endereços."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1034,52 +1032,52 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços, e não\n"
 "foi possível criar os novos arquivos do Livro de Endereços."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Ocorreu um erro na conversão do Livro de Endereços"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Erro no Livro de Endereços"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice dos endereços"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Ocupado pesquisando..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Livros de Endereços"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPllot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 
@@ -1163,43 +1161,43 @@ msgstr "Coletar endereços de email das mensagens selecionadas"
 msgid "Collect email addresses from folder"
 msgstr "Coletar endereços de email da pasta"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Endereços comuns"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Endereços pessoais"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Endereço comum"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Endereço pessoal"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Atualização de endereço(s)"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 "Não foi possível atualizar. As mudanças não foram escritas no diretório."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Nota"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Erro"
@@ -1318,7 +1316,7 @@ msgstr "A sua versão do Claws Mail é muito antiga para o plugin '%s'."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "A sua versão do Claws Mail é muito antiga para o plugin."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do TLS\n"
 
@@ -1338,7 +1336,7 @@ msgstr "resposta incorreta do SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
@@ -1347,7 +1345,7 @@ msgstr "ocorreu um erro na autenticação\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "A mensagem é muito grande (o tamanho máximo é %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "não foi possível iniciar a sessão STARTTLS\n"
 
@@ -1485,212 +1483,212 @@ msgstr "%d.%02dMiB"
 msgid "%.2fGiB"
 msgstr "%.2fGiB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Janeiro"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Fevereiro"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Março"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Abril"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Maio"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Junho"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Julho"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Agosto"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Setembro"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Outubro"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Novembro"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Dezembro"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Dom"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Seg"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ter"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Qua"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Qui"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Sex"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Sáb"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Fev"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Abr"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Mai"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jun"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Jul"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ago"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Set"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Out"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dez"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "AM"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "PM"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "am"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "pm"
@@ -1707,430 +1705,430 @@ msgstr ""
 "\n"
 "A assinatura e a criptografia foram desabilitadas para esta mensagem."
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "_Adicionar..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "Orto_grafia"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "_Opções"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "_Enviar"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Enviar _mais tarde"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "_Anexar arquivo"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "_Inserir arquivo"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "Inserir assina_tura"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "S_ubstituir assinatura"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Desfazer"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Re_fazer"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Recortar"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "Colar _especial"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Como _citação"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "Com _quebra de linhas"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "_Sem quebra de linhas"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Selecionar _tudo"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "_Avançado"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "Mover um caractere para trás"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "Mover um caractere para frente"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "Mover uma palavra para trás"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "Mover uma palavra para frente"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "Mover para o início da linha"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "Mover para o final da linha"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "Mover para a linha anterior"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "Mover para a próxima linha"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Apagar um caractere para trás"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Apagar um caractere para frente"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Apagar uma palavra para trás"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Apagar uma palavra para frente"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Apagar a linha"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Apagar até o final da linha"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "_Quebrar parágrafo atual"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Quebrar todas as l_inhas longas"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "Editar com um programa e_xterno"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "_Verificar tudo ou somente a seleção"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "_Destacar todas as palavras erradas"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "Verificar palavras erradas _anteriores"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "Avançar para a _próxima palavra errada"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "Modo da _resposta"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "Sistema de _privacidade"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "_Prioridade"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Codificação dos caracteres"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Europeu Ocidental"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chinês"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tailandês"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Livro de endereços"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "_Modelo"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "_Ações"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_Sobre"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "Quebra auto_mática"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Rec_uo automático"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "_Assinar"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "_Criptografar"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "_Solicitar confirmação de recebimento"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "_Remover referências"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Exibir _régua"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Todos"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Remetente"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "_Lista de discussão"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "_Altíssima"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "A_lta"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "_Baixa"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "Bai_xíssima"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automática"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "U_nicode (UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Europeu Central (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "_Grego (ISO-8859-7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Erro no formato do remetente da mensagem."
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Erro no formato do assunto da mensagem."
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "O corpo do modelo \"Nova mensagem\" possui um erro na linha %d."
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Não foi possível responder. A mensagem original provavelmente não existe."
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 "O campo \"De\" do modelo \"Responder\" possui um endereço de email inválido."
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "O corpo do modelo \"Responder\" possui um erro na linha %d."
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 "O campo \"De\" do modelo \"Encaminhar\" possui um endereço de email inválido."
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "O corpo do modelo \"Encaminhar\" possui um erro na linha %d."
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Enc: múltiplos emails"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "O corpo do modelo \"Redirecionar\" possui um erro na linha %d."
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Cco:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Responder para:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Seguindo a:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Em resposta a:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Para:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Não foi possível anexar o arquivo (erro na conversão da codificação dos "
 "caracteres)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2145,16 +2143,16 @@ msgstr[1] ""
 "Os seguintes arquivos foram anexados: \n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "A \"Marca de citação\" do modelo é inválida."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Não foi possível obter o tamanho do arquivo '%s'."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2163,57 +2161,57 @@ msgstr ""
 "Você esta prestes a inserir um arquivo de %s no corpo da mensagem. Deseja "
 "realmente fazer isso?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Arquivo vazio"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "_Anexar mesmo assim"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Editada]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Escrever mensagem%s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Escrever mensagem%s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Escrever mensagem"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2221,62 +2219,62 @@ msgstr ""
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "O único destinatário é o endereço '%s' padrão. Enviar mesmo assim?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "A mensagem está sem assunto. %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Enviar mesmo assim?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Mandar para a Fila de Saída mesmo assim?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "Mandar para a _Fila de Saída"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Enviando para %d destinatários. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2287,7 +2285,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2298,7 +2296,7 @@ msgstr ""
 "\n"
 "Falha na assinatura: %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2309,7 +2307,7 @@ msgstr ""
 "\n"
 "Falha na criptografia: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2319,7 +2317,7 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2329,7 +2327,7 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2338,17 +2336,17 @@ msgstr ""
 "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
 "tentar novamente."
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
-"tentar novamente."
+"Você pode tentar \"Enviar\" novamente ou adicioná-la à Fila de Saída usando "
+"\"Enviar mais tarde\""
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2359,7 +2357,7 @@ msgstr ""
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2372,101 +2370,105 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Aviso de criptografia"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "A conta selecionada não é NNTP: é impossível enviar a mensagem."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "O anexo %s não existe mais. Devo ignorar?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Cancelar o rascunho"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Cancelar o envio"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Ignorar o anexo"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Parte %s original"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Adicionar ao _Livro de Endereços"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Excluir o conteúdo da entrada"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "Nav_egar"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "Selecione a pasta de salvamento da mensagem"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "Ane_xos"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Outros"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "_Assunto:"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2475,19 +2477,19 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "_De:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse email"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Endereço do remetente a ser usado"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2496,50 +2498,50 @@ msgstr ""
 "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
 "assinar ou criptografar essa mensagem."
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "O corpo do modelo possui um erro na linha %d."
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Erro no formato do '%s' do modelo."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2548,14 +2550,14 @@ msgstr ""
 "Não foi possível salvar o corpo da mensagem no arquivo:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr ""
 "A comunicação via socket com um editor externo não está disponível no "
 "Windows."
 
-#: src/compose.c:9710
+#: src/compose.c:9702
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2566,21 +2568,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "O editor externo encerrou com um erro: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "id do processo: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "id do processo: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2591,19 +2588,19 @@ msgstr ""
 "Deseja forçar o término do processo?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."
 
-#: src/compose.c:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "Não foi possível salvar o rascunho"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2611,24 +2608,24 @@ msgstr ""
 "Não foi possível salvar o rascunho.\n"
 "Deseja cancelar a saída ou descartar essa mensagem?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "_Cancelar a saída"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "_Descartar a mensagem"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "Selecione o arquivo"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2637,59 +2634,50 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Essa mensagem foi modificada. Deseja salvar as últimas alterações?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "_Não salvar"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"O tamanho do texto a ser colado excede o limite (%dKiB) para colagens.\n"
-"Anexe-o como um arquivo."
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2704,20 +2692,20 @@ msgstr[1] ""
 "Você deseja inserir o conteúdo dos %d arquivos no corpo da mensagem ou anexá-"
 "los ao email?"
 
-#: src/compose.c:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "_Anexar"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erro no formato da citação, na linha %d."
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2935,7 +2923,7 @@ msgid " Check File "
 msgstr " Verificar o arquivo "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Arquivo"
 
@@ -2980,12 +2968,12 @@ msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Nova pasta"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -3013,13 +3001,13 @@ msgstr "Adicionar uma nova entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Selecionar a base de pesquisa"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Endereço do servidor"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Porta"
@@ -3082,7 +3070,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3252,8 +3240,8 @@ msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 "A senha a ser usada quando se conectar como usuário o \"DN associado\"."
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Exibir a senha"
@@ -3277,11 +3265,11 @@ msgstr ""
 "O número máximo de entradas que devem ser apresentadas como resultado da "
 "pesquisa."
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Básico"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Extendido"
 
@@ -3299,8 +3287,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "Modificar etiquetas"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -3430,15 +3418,15 @@ msgstr "Arquivo HTML de saída"
 msgid "B_rowse"
 msgstr "Explo_rar"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Folha de Estilo"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Nenhum"
 
@@ -3691,7 +3679,7 @@ msgstr "Exportar o Livro de Endereços para um arquivo LDIF"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 
@@ -3785,8 +3773,8 @@ msgid ""
 "rule is account-based, matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
-"a regra é associada à conta, correspondendo à conta atualmente usada "
-"para recuperar mensagens\n"
+"a regra é associada à conta, correspondendo à conta atualmente usada para "
+"recuperar mensagens\n"
 
 #: src/filtering.c:621
 #, c-format
@@ -3824,17 +3812,15 @@ msgstr ""
 msgid ""
 "rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"a regra não é associada à conta, mas, mesmo assim, todas as regras serão"
-" aplicadas, "
-"caso o usuário solicite\n"
+"a regra não é associada à conta, mas, mesmo assim, todas as regras serão "
+"aplicadas, caso o usuário solicite\n"
 
 #: src/filtering.c:665
 msgid ""
 "rule is account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"a regra é associada à conta, mas, mesmo assim, todas as regras serão"
-" aplicadas, "
-"caso o usuário solicite\n"
+"a regra é associada à conta, mas, mesmo assim, todas as regras serão "
+"aplicadas, caso o usuário solicite\n"
 
 #: src/filtering.c:673
 #, c-format
@@ -3842,9 +3828,8 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request anyway\n"
 msgstr ""
-"a regra é associada à conta [id=%d, nome='%s'], mas, mesmo assim, todas as"
-" regras "
-"serão aplicadas, caso o usuário solicite\n"
+"a regra é associada à conta [id=%d, nome='%s'], mas, mesmo assim, todas as "
+"regras serão aplicadas, caso o usuário solicite\n"
 
 #: src/filtering.c:696
 msgid "rule is account-based, skipped on user request\n"
@@ -3867,8 +3852,8 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching current account [id=%d, "
 "name='%s']\n"
 msgstr ""
-"a regra é associada a conta [id=%d, nome='%s'], correspondendo à conta "
-"atual [id=%d, nome='%s']\n"
+"a regra é associada a conta [id=%d, nome='%s'], correspondendo à conta atual "
+"[id=%d, nome='%s']\n"
 
 #: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
@@ -3971,61 +3956,61 @@ msgstr ""
 "filtrando mensagem (%s%s%s)\n"
 "%sarquivo da mensagem: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Fila de Saída"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Copiando %s para %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Sincronizando %s para uso desconectado...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "O nome da pasta não pode começar ou terminar com um ponto."
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "O nome da pasta não pode terminar com um ponto."
 
@@ -4034,7 +4019,7 @@ msgid "Select folder"
 msgstr "Selecione a pasta"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "NovaPasta"
 
@@ -4045,99 +4030,103 @@ msgstr "Propriedades e regras de processamento herdadas da pasta superior"
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "Marcar todas como _lidas"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Marcar todas como não l_idas"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Marcar r_ecursivamente todas como lidas"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Marcar recursi_vamente todas como não lidas"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "E_xecutar regras de processamento"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Pesquisar na pasta..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Abrir ao iniciar"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "Proce_ssamento..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "Esvaziar _Lixeira..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Enviar mensagens da _fila..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Definir colunas visíveis"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Nova"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Não lida"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4145,15 +4134,15 @@ msgstr ""
 "Deseja realmente marcar todas as mensagens desta pasta e suas sub-pastas "
 "como lidas?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Marcar todas como não lidas"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
@@ -4161,95 +4150,95 @@ msgstr ""
 "Deseja realmente marcar todas as mensagens desta pasta e suas sub-pastas "
 "como não lidas?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como não lidas?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Vasculhando a pasta %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Vasculhando a pasta %s..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Reconstruir a árvore de pastas"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "A reconstrução da árvore de pastas irá remover os caches locais. Deseja "
 "continuar?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a árvore de pastas..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Vasculhando a árvore de pastas..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Não foi possível vasculhar a pasta %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Fechando a pasta %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Abrindo a pasta %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "_Esvaziar a Lixeira"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4258,64 +4247,64 @@ msgstr ""
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Copiar a pasta"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Mover a pasta"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "Não é possível copiar a pasta para dentro dela mesma."
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "Não foi possível copiar!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "A pasta de destino só pode ser usada para armazenar sub-pastas."
 
@@ -4360,8 +4349,8 @@ msgid "read-only"
 msgstr "somente leitura"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -4402,13 +4391,13 @@ msgstr ""
 "O Claws Mail é um software livre liberado sob a licença GPL. Se você deseja "
 "fazer doações para o projeto do Claws Mail, você pode fazê-lo em:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "A Equipe do Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
@@ -4443,7 +4432,7 @@ msgstr ""
 "Locale: %s (codificação dos caracteres: %s)\n"
 "Sistema operacional: desconhecido"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "A equipe do Claws Mail"
 
@@ -4566,73 +4555,78 @@ msgstr ""
 "Você deve ter recebido uma cópia da GNU General Public License juntamente "
 "com este programa. Caso contrário, veja "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Estatísticas da sessão\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Início: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Tráfego de entrada\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensagens recebidas: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "Mensagens spam: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Tráfego de saída\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensagens novas/redirecionadas: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensagens respondidas: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensagens encaminhadas: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de mensagens enviadas: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "Sobre o Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "_Informação"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Autores"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "_Recursos"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Licença"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "_Notas do lançamento"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "_Estatísticas"
 
@@ -4841,7 +4835,7 @@ msgid "Configuring..."
 msgstr "Configurando..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Data"
@@ -4850,9 +4844,9 @@ msgstr "Data"
 msgid "Date:"
 msgstr "Data:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "De"
@@ -4873,9 +4867,9 @@ msgstr "Remetente:"
 msgid "Reply-To"
 msgstr "Responder para"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Para"
@@ -4911,9 +4905,9 @@ msgstr "Referências"
 msgid "References:"
 msgstr "Referências:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Assunto"
@@ -4923,7 +4917,7 @@ msgstr "Assunto"
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Comentários"
 
@@ -5037,8 +5031,8 @@ msgid "Seen:"
 msgstr "Visualizado:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Status"
@@ -5111,7 +5105,7 @@ msgstr "Precedência"
 msgid "Precedence:"
 msgstr "Precedência:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Organização"
 
@@ -5431,9 +5425,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5447,7 +5440,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5462,7 +5455,7 @@ msgstr "_Carregar..."
 msgid "_Unload"
 msgstr "_Descarregar"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Descrição"
 
@@ -5486,8 +5479,8 @@ msgid "Loaded plugins"
 msgstr "Plugins carregados"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -5500,10 +5493,10 @@ msgid "_Hide"
 msgstr "_Esconder"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Conta"
@@ -5575,17 +5568,17 @@ msgid "forwarded messages"
 msgstr "mensagens encaminhadas"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "mensagens que tenham anexos"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "mensagens que contenham S em qualquer nome ou valor de cabeçalho"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "mensagens que contenham S no valor de qualquer cabeçalho"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "mensagens que tenham anexos"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "mensagens que contenham S no cabeçalho Message-Id"
@@ -5675,20 +5668,20 @@ msgid "unread messages"
 msgstr "mensagens não lidas"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "mensagens que contenham V no cabeçalho H"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "mensagens que contenham S no cabeçalho 'References'"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "mensagens que retornaram 0 quando foram passadas para o comando - %F é um "
 "arquivo de mensagem"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "mensagens que contenham S no cabeçalho 'X-Label'"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "operador lógico 'E'"
@@ -5739,55 +5732,55 @@ msgstr ""
 "Ocorreu algum problema durante a pesquisa. Por favor, verifique seus "
 "relatórios."
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "De/Para/Cc/Assunto/Etiqueta"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Recursivo"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Manter filtro"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Pesquisar enquanto digita"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Executar na seleção"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Limpar a pesquisa atual"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Editar os critérios da pesquisa"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Informação"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Informação sobre os símbolos extendidos"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "E_ditar"
 
@@ -5966,16 +5959,16 @@ msgstr "(Sem assunto)"
 msgid "Error:"
 msgstr "Erro:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Tamanho do arquivo:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Carregar imagem"
 
@@ -6167,7 +6160,7 @@ msgstr "erro no TLS"
 msgid "Unknown error [%d]"
 msgstr "Erro desconhecido [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6179,7 +6172,7 @@ msgstr ""
 "Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin CRAM-MD5 SASL instalado."
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6191,7 +6184,7 @@ msgstr ""
 "Autenticações DIGEST-MD5 funcionam somente se a libetpan estiver compilada "
 "com suporte a SASL e o plugin DIGEST-MD5 SASL estiver instalado."
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6203,7 +6196,55 @@ msgstr ""
 "Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL estiver instalado."
 
-#: src/imap.c:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Autenticações SCRAM-SHA-224 funcionam somente se a libetpan estiver "
+"compilada com suporte a SASL e o plugin SCRAM SASL estiver instalado."
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Autenticações SCRAM-SHA-256 funcionam somente se a libetpan estiver "
+"compilada com suporte a SASL e o plugin SCRAM SASL estiver instalado."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Autenticações SCRAM-SHA-384 funcionam somente se a libetpan estiver "
+"compilada com suporte a SASL e o plugin SCRAM SASL estiver instalado."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Autenticações SCRAM-SHA-512 funcionam somente se a libetpan estiver "
+"compilada com suporte a SASL e o plugin SCRAM SASL estiver instalado."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6215,7 +6256,7 @@ msgstr ""
 "Autenticações PLAIN funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin PLAIN SASL estiver instalado."
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6227,7 +6268,7 @@ msgstr ""
 "Autenticações LOGIN funcionam somente se a libetpan estiver compilada com "
 "suporte a SASL e o plugin LOGIN SASL estiver instalado."
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6237,37 +6278,37 @@ msgstr ""
 "\n"
 "Erro no OAuth2. Verifique e corrija as configurações do OAuth2 da sua conta."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Erro na conexão com %s: login recusado.%s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Erro na conexão com %s: login recusado.%s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP com %s foi interrompida. Reconectando...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6280,108 +6321,108 @@ msgstr ""
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor IMAP: %s:%d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "Não foi possível iniciar sessão STARTTLS.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Não foi possível autenticar-se no servidor IMAP %s.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "Não foi possível realizar a pesquisa devido a um erro no servidor."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não inscritas em %s..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "Marcando as mensagens..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "O servidor depende do STARTTLS para efetuar a autenticação.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6390,20 +6431,24 @@ msgstr ""
 "Ocorreu uma falha na conexão com %s: o servidor requer STARTTLS, mas o Claws "
 "Mail foi compilado sem o suporte a STARTTLS.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Expurgando as mensagens excluídas..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6434,7 +6479,7 @@ msgid "Cop_y folder..."
 msgstr "_Copiar pasta..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "E_xcluir pasta..."
 
@@ -6454,7 +6499,7 @@ msgstr "_Inscrições"
 msgid "_Subscribe..."
 msgstr "I_nscrever..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "Cance_lar inscrição..."
 
@@ -6486,21 +6531,21 @@ msgstr ""
 "sub-pastas e não mensagens, adicione '/' ao final do nome)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Entre com o novo nome para '%s':"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Renomear a pasta"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6519,7 +6564,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "Selecione a pasta para onde a pasta '%s' será copiada"
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6533,8 +6578,8 @@ msgstr ""
 "Confirma a exclusão?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."
@@ -6842,8 +6887,8 @@ msgstr "Ocorreu uma falha na conexão"
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Travada"
 
@@ -7014,8 +7059,8 @@ msgstr "A incorporação foi cancelada\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "segundos"
 
@@ -7078,7 +7123,7 @@ msgstr "Erro no LDAP (pesquisa): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Apelido"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7087,7 +7132,7 @@ msgstr ""
 "O arquivo '%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7096,7 +7141,7 @@ msgstr ""
 "Foi encontrada uma configuração para %s.\n"
 "Deseja migrar essa configuração?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7109,11 +7154,11 @@ msgstr ""
 "As suas regras de filtragem do Sylpheed podem ser\n"
 "convertidas por um script disponível em %s."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Manter a configuração antiga"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7123,27 +7168,27 @@ msgstr ""
 "consumir um tempo se você tem dados de IMAP ou News no cache, além de ocupar "
 "um espaço extra no seu disco."
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Migração de configuração"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Copiando a configuração... Isso pode demorar um pouco..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Falha na migração!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Migrando a configuração..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(ou mais antiga)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7162,7 +7207,7 @@ msgstr[1] ""
 "plugins para maiores informações:\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7173,7 +7218,7 @@ msgstr ""
 "de pastas\" no menu de contexto da pasta raiz da pasta da caixa postal para "
 "tentar consertá-la."
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7183,76 +7228,76 @@ msgstr ""
 "carregá-la. Ela provavelmente foi fornecida por um plugin externo "
 "desatualizado. Por favor, reinstale o plugin e tente novamente."
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Falta o nome do arquivo\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "Não foi possível abrir o arquivo para leitura\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Cabeçalho malformatado\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Cabeçalho 'To:' duplicado\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "Falta o cabeçalho 'To:' (e ele é necessário)\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Tente -h ou --help para o uso.\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Falta o argumento de arquivo para a opção %s"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Argumento de URI ausente ou em branco, para a opção %s"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Falta o argumento de URI para a opção %s"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "Falta ao menos um argumento não vazio de arquivo para a opção %s"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "Faltam os argumentos de pasta, tipo e requisição para a opção %s"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Faltam os argumentos de tipo e requisição para a opção %s"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Falta o argumento de requisição para a opção %s"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilização: %s [OPÇÕES]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endereço]   abre a janela de composição de mensagens"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7273,11 +7318,11 @@ msgstr ""
 "                         linha em branco e o corpo do email até o fim do "
 "arquivo."
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe uri      assina a URI fornecida, caso seja possível"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7288,7 +7333,7 @@ msgstr ""
 "arquivos\n"
 "                         especificados"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7299,23 +7344,23 @@ msgstr ""
 "arquivos\n"
 "                         especificados"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensagens"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     cancela o recebimento de mensagens"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       cancela o envio de mensagens"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7335,15 +7380,15 @@ msgstr ""
 "                         recursive: falso se o argumento começar com 0, n, "
 "N, f ou F"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da Fila de Saída"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...    mostra o número total de mensagens"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7351,15 +7396,15 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         mostra o status de cada pasta"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           exibe as estatísticas da sessão"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     reinicia as estatísticas de sessão"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7369,46 +7414,46 @@ msgstr ""
 "                         pasta é uma id de pasta, como 'pasta/sub_pasta', "
 "uma uri do tipo arquivo:// ou um caminho absoluto"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online               alterna para o modo conectado"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              alterna para o modo desconectado"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sai do Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d                modo de depuração"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         alterna o mode de debug"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              exibe essa tela de ajuda"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           exibe a versão do programa"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      exibe a versão do programa e informações sobre os "
 "recursos internos"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           exibe o diretório de configurações"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7416,7 +7461,7 @@ msgstr ""
 "  --alternate-config-dir diretório\n"
 "                         usa o diretório de configurações especificado"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7424,50 +7469,50 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         define a geometria da janela principal"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Falta o argumento de diretório para a opção %s"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Falta o argumento de geometria para a opção %s"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Falta o argumento de pasta para a opção %s"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Opção desconhecida %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processando (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "pasta do nível mais acima"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Mensagens na Fila de Saída"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar "
 "agora?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: a rede está conectada.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: a rede está desconectada.\n"
 
@@ -7651,11 +7696,11 @@ msgstr "Próxima pa_sta não lida"
 msgid "F_older..."
 msgstr "P_asta..."
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Próxima parte"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Parte anterior"
 
@@ -7897,7 +7942,7 @@ msgstr "E_tiquetas"
 msgid "Re-_edit"
 msgstr "Reedi_tar"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "Verificar assinatura"
 
@@ -8102,7 +8147,7 @@ msgstr "_Cabeçalhos das colunas"
 msgid "Th_read view"
 msgstr "A_grupar por assunto"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Ocultar discussões lidas"
 
@@ -8110,7 +8155,7 @@ msgstr "Ocultar discussões lidas"
 msgid "_Hide read messages"
 msgstr "Ocultar mensagens _lidas"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Ocultar as mensagens excluídas"
 
@@ -8222,11 +8267,11 @@ msgstr "Pelo tra_vamento"
 msgid "D_on't sort"
 msgstr "Não _ordenar"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "Crescente"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "Decrescente"
 
@@ -8234,7 +8279,7 @@ msgstr "Decrescente"
 msgid "_Auto detect"
 msgstr "_Autodetectar"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Modificar etiquetas..."
 
@@ -8273,7 +8318,7 @@ msgstr "relatório de filtragem desabilitado\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Sem título"
 
@@ -8281,19 +8326,19 @@ msgstr "Sem título"
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "Não sair"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Adicionar caixa postal"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8307,18 +8352,18 @@ msgstr ""
 "Se for especificada a localização de uma caixa postal já\n"
 "existente, ela será verificada automaticamente."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa postal '%s' já existe."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Caixa postal"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8328,58 +8373,58 @@ msgstr ""
 "Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
 "pasta."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Não foi encontrada nenhuma mensagem duplicada na pasta selecionada.\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "%d mensagem duplicada foi excluída na pasta selecionada.\n"
 msgstr[1] "%d mensagens duplicadas foram excluídas na pasta selecionada.\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, 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"
@@ -8388,113 +8433,113 @@ msgstr[0] ""
 msgstr[1] ""
 "%d mensagens duplicadas foram marcadas para exclusão na pasta selecionada.\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Excluindo mensagens duplicadas em todas as pastas..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi excluída %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram excluídas %d mensagens duplicadas em %d pastas.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Não foi encontrada nenhuma mensagem duplicada em %d pastas.\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Selecione a pasta de destino"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível obter o caminho "
 "do executável."
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "O Claws Mail foi registrado como o cliente padrão."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível escrever no "
 "registro."
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Vasculhando a pasta %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d senha esquecida em %d contas.\n"
 msgstr[1] "%d senhas esquecidas em %d contas.\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "cabeçalho %s"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "cabeçalho"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "linha do cabeçalho"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "linha do corpo"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "etiqueta"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "Não diferenciar maiúsc./minúsc."
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "verificando se as mensagens correspondem [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "a mensagem corresponde\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "a mensagem não corresponde\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(nenhuma)"
 
@@ -8531,7 +8576,7 @@ msgstr "Sobrescrever o arquivo mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
@@ -8766,8 +8811,8 @@ msgstr ""
 "\n"
 "  A mensagem foi excluída ou movida para outra pasta"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
@@ -8807,64 +8852,68 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Remover a caixa postal"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "Abrir _com..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "_Enviar para..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "Exibir como _texto"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "_Salvar como..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "Salvar _todos..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Salvar todos os anexos..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Exibir informações completas"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Verificar novamente"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Clique no ícone verificá-la."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Clique no ícone ou pressione '%s' para verificá-la."
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Tempo esgotado durante a checagem da assinatura. Clique no ícone para tentar "
 "novamente."
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8872,40 +8921,40 @@ msgstr ""
 "Tempo esgotado durante a checagem da assinatura. Clique no ícone ou "
 "pressione '%s' para tentar novamente."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr ""
 "Erro durante a checagem da assinatura. Clique no ícone para tentar novamente."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Erro durante a checagem da assinatura. Clique no ícone ou pressione '%s' "
 "para tentar novamente."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "Verificando a assinatura..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 "Não foi possível salvar uma das partes da mensagem com múltiplas partes: %s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
 #, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
@@ -8914,59 +8963,59 @@ msgstr ""
 "Ocorreu um erro no salvamento da parte %d da mensagem. Deseja cancelar a "
 "operação ou ignorar o erro e continuar?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "Erro no salvamento de parte da mensagem"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "Ignorar todos"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d arquivo foi salvo com sucesso."
 msgstr[1] "%d arquivos foram salvos com sucesso."
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d arquivo foi salvo com sucesso"
 msgstr[1] "%d arquivos foram salvos com sucesso"
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d arquivo apresentou erro."
 msgstr[1] "%s, %d arquivos apresentaram erro."
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Salvar como"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Abrir com"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8975,7 +9024,7 @@ msgstr ""
 "Digite o comando para abrir o arquivo:\n"
 "('%s' será substituído pelo nome do arquivo)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8986,11 +9035,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Executar binário não confiável?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -9002,20 +9051,20 @@ msgstr ""
 "\n"
 "Deseja executar esse arquivo?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "Executar o binário"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9128,90 +9177,90 @@ msgstr "Cancelar a inscrição no Newsgroup"
 msgid "Rename newsgroup folder"
 msgstr "Renomear a pasta do Newsgroup"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "Falta o código de autorização do OAuth2\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "Erro na conexão com o OAuth2\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "Erro na conexão TLS com o OAuth2\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "O token de acesso ao OAuth2 foi obtido\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "O token de acesso ao OAuth2 não foi obtido\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "O token de atualização do OAuth2 foi obtido\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "O token de atualização do OAuth2 não foi obtido\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "O token de substituição do OAuth2 foi fornecido\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "O token de substituição do OAuth2 não foi fornecido\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "Erro na escrita do socket do OAuth2\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "Erro de limite de tempo do socket do OAuth2\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "O token de acesso ao OAuth2 ainda está válido\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "Obtendo token de acesso ao OAuth2 através do token de atualização\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr ""
 "Tentando obter um token de novo acesso ao OAuth2 com o código de "
 "autorização\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "O token de acesso e atualização ao OAuth2 foi atualizado\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 original: %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 codificado: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
 "\n"
 msgstr "OAuth2 decodificado: %s\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Digite a senha primária"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Senha primária incorreta."
 
@@ -9632,7 +9681,7 @@ msgstr "Sim"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Não"
 
@@ -9649,7 +9698,7 @@ msgid "Delete selected files"
 msgstr "Excluir arquivos selecionados"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Selecionar mensagens anteriores a"
 
@@ -9663,97 +9712,97 @@ msgstr ""
 "Selecione o nome de arquivo para o pacote [o sufixo deve indicar o tipo de "
 "pacote, ex. .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Criar pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Digite os argumentos para o empacotador"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Pasta para o pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Pasta onde está a raiz do pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Clique nesse botão para selecionar a pasta que será a raiz do pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Nome para o pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Localização e nome do pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Selecionar"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr "Clique nesse botão para selecionar o nome a localização para o pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Escolha a compressão"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Selecione essa opção para aplicar a compressão %s ao pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Escolha o formato"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Selecione essa opção para usar %s como formato do pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Outras opções"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Recursivo"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Selecione essa opção para incluir as subpastas no pacote"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9763,11 +9812,11 @@ msgstr ""
 "pacote. Saiba, entretanto, que isso aumentará significativamente o\n"
 "tempo de criação do pacote."
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "R_enomear"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9778,7 +9827,7 @@ msgstr ""
 "pacote. O esquema de nome é: data_de at para@assunto.\n"
 "Os nomes serão truncados no limite de 96 caracteres."
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9786,11 +9835,11 @@ msgstr ""
 "Selecione essa opção para excluir as mensagens após o empacotamento.\n"
 "Apenas para IMAP4, caixa postal local e POP3."
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Opções de seleção"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9883,7 +9932,7 @@ msgstr "Remover anexos"
 msgid "Remove"
 msgstr "Remover"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Anexos"
@@ -10048,19 +10097,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Excluir"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -10070,15 +10119,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: buscando conteúdo..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrando as mensagens..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -10090,7 +10139,7 @@ msgstr ""
 "Use \"/Marcar/Marcar como spam\" e \"Marcar/Marcar como não-spam\" para "
 "treinar o Bogofilter com algumas centenas de mensagens de spam e legítimas."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -10099,21 +10148,21 @@ msgstr ""
 "O plugin Bogofilter não conseguiu filtrar uma mensagem. Não foi possível "
 "executar o comando `%s %s %s`."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: aprendendo com a mensagem..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Erro no aprendizado; `%s` retornou o status %d."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: aprendendo com as mensagens..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10122,7 +10171,7 @@ msgstr ""
 "Erro no aprendizado; `%s%s%s` retornou o erro:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10150,13 +10199,13 @@ msgstr ""
 "As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
 "Bogofilter."
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Detecção de spam"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Aprendizado de spam"
 
@@ -10180,7 +10229,7 @@ msgstr "Mensagens maiores que isso não serão verificadas"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "KiB"
 
@@ -10288,19 +10337,19 @@ msgstr "Caminho para o programa Bogofilter"
 msgid "Mark spam as read"
 msgstr "Marcar spam como lido"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: buscando o corpo..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrando a mensagem..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10312,7 +10361,7 @@ msgstr ""
 "Use \"/Marcar/Marcar como spam\" e \"/Marcar/Marcar como não-spam\" para "
 "treinar o Bsfilter com algumas centenas de spams e não-spams."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -10321,11 +10370,11 @@ msgstr ""
 "O plugin do Bsfilter não conseguiu filtrar a mensagem. Não foi possível "
 "executar o comando `%s`."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: aprendendo com a mensagem..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10671,65 +10720,52 @@ msgstr ""
 "\n"
 "Ele definitivamente não é muito útil."
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Exibir imagens"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Exibir Imagens incorporadas"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Executar Javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Executar Javascript incorporado"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Executar applets Java"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Executar applets Java incorporados"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Renderizar objetos usando plugins"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Renderizar objetos incorporados usando plugins"
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Abrir no visualizador (conteúdo remoto está habilitado)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "Não fazer nada (o conteúdo remoto está desabilitado)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Proxy"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "Usar as configurações de proxy do GNOME"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "Usar proxy"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Recursos remotos"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10742,115 +10778,120 @@ msgstr ""
 "à rede. A renderização de imagens, scripts, objetos de plugin ou applets\n"
 "Java ainda podem estar habilitados para os conteúdos anexados ao email."
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Habilitar a carga de conteúdo remoto"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "Ao clicar em um link, por padrão"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Abra em um navegador externo"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "O CSS desse arquivo será aplicado em todas as partes HTML"
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "E_xplorar"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Selecione a folha de estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "A recuperação de conteúdo remoto está desabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Carregar imagens"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Habilitar conteúdo remoto"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Habilitar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Habilitar plugins"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Habilitar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Abrir os links com um navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocorreu um erro: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s é uma fonte malformada ou não suportada"
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Abrir no visualizador"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Abrir no navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Abrir a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Copiar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Baixar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Salvar imagem como"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Copiar a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Importar a fonte"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Fancy"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "Não foi possível encontrar o complemento da extensão WebKit %s"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Visualizador HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10955,194 +10996,6 @@ msgstr ""
 "Adiciona o cabeçalho X-FETCH-TIME com a data e hora do recebimento da "
 "mensagemno formato RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "Plugin GData: É necessária a autorização"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"Você deve autorizar o Claws Mail a acessar sua lista de contatos da Google "
-"para usar o plugin GData.\n"
-"\n"
-"Visite a página de autorização da Google pressionando o botão abaixo. Após a "
-"confirmação da autorização, você receberá um código de autorização. Digite "
-"esse código no campo abaixo para garantir ao Claws Mail o acesso à sua lista "
-"de contatos da Google."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "Passo 1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
-"Clique aqui para abrir a página de autorização da Google no seu navegador"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "Passo 2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Digite o código:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "Plugin GData: Erro na solicitação de contatos: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "Adicionado %d de"
-msgstr[1] "Adicionados %d de"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "1 contato para o cache"
-msgstr[1] "%d contatos para o cache"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "Plugin GData: Iniciando solicitação assíncrona de contatos\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "Plugin GData: Erro na solicitação de grupos: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "Plugin GData: Os grupos foram recebidos\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "Plugin GData: Iniciando solicitação assíncrona de grupos\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "Plugin GData: Erro na autorização: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "Plugin GData: A autorização foi bem sucedida\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "Plugin GData: Iniciando autorização interativa\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr ""
-"Plugin GData: Código de autorização recebido, requisitando a autorização\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"Plugin GData: Não foi recebido nenhum código de autorização, a solicitação "
-"de autorização foi cancelada\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"Plugin GData: Autorização interativa ainda ativa, não foi iniciada nenhuma "
-"sessão adicional\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "Plugin GData: Erro na atualização da autorização: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "Plugin GData: A atualização da autorização foi bem sucedida\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"Plugin GData: Tempo decorrido desde a última atualização: %d minutos, "
-"atualizando agora\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "Plugin GData: Tentando atualizar a autorização\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Nome de usuário:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Intervalo entre consultas (segundos):"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Número máximo de resultados:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Não foi possível registrar o gancho de complementação de endereço no plugin "
-"GData"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr ""
-"Não foi possível registrar o gancho de mudança para offline no plugin GData"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Este plugin fornece acesso ao protocolo GData para o Claws Mail.\n"
-"\n"
-"O protocolo GData é uma interface para os serviços da Google.\n"
-"Atualmente, a única funcionalidade implementada é a de incluir os Contatos "
-"Google na complementação de endereços via tecla Tab.\n"
-"\n"
-"Qualquer retorno para <berndth at gmx.de> é bem-vindo."
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "Integração com GData"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11312,8 +11165,8 @@ msgid "Cache refresh interval"
 msgstr "Intervalo de atualização do cache"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "horas"
 
@@ -11461,11 +11314,11 @@ msgstr "Tamanho do cache de imagens em megabytes"
 msgid "Default font"
 msgstr "Fonte padrão"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Abrir o link"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Copiar a localização do link"
 
@@ -11561,7 +11414,7 @@ msgstr "O método de autenticação não está disponível"
 msgid "sending error on Sieve session: %s\n"
 msgstr "erros de envio na sessão Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Filtrar"
 
@@ -11696,7 +11549,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Habilitar Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Informações do servidor"
 
@@ -11733,8 +11586,12 @@ msgstr "Usar STARTTLS quando disponível"
 msgid "Require STARTTLS"
 msgstr "Exigir STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Autenticação"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Sem autenticação"
 
@@ -11748,28 +11605,28 @@ msgstr "Especificar a autenticação"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "ID do usuário"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Senha"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Automático"
 
@@ -12088,7 +11945,7 @@ msgid "Never"
 msgstr "Nunca"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Sempre"
 
@@ -12700,9 +12557,9 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 "Se for definida como '0', a senha será armazenada durante toda a sessão"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minutos"
 
@@ -12916,109 +12773,109 @@ msgstr "A assinatura de \"%s\" é inválida"
 msgid "The signature has not been checked"
 msgstr "A assinatura não foi verificada"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "Ocorreu um erro na verificação da assinatura: sem status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Erro durante a verificação da assinatura: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Assinatura feita em %s usando %s ID da chave %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Assinatura boa de \"%s\" (validade: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "A chave uid \"%s\" expirou\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Assinatura expirada de \"%s\" (validade: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "A chave uid \"%s\" foi revogada\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "A assinatura de \"%s\" é INVÁLIDA\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Validade: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "Revogada"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Confiabilidade do proprietário: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Nenhuma chave!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Impressão digital primária da chave:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVISO: O endereço \"%s\" do signatário não equivale à entrada DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "O endereço verificado do signatário é \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Não foi possível obter nenhum dado da mensagem, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Não foi possível inicializar os dados, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "A especificação da chave secreta é ambígua"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Chave secreta não encontrada (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Ocorreu um erro ao configurar a chave secreta: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s' não foi instalado "
 "corretamente."
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -13027,12 +12884,12 @@ msgstr ""
 "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s', versão %s está "
 "instalado, mas é necessária a versão %s.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "O protocolo Gpgme '%s' está inutilizável (problema desconhecido)"
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -13040,7 +12897,7 @@ msgstr ""
 "O GnuPG não está instalado adequadamente, ou precisa ser atualizado.\n"
 "O suporte ao OpenPGP estará desativado."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -13048,11 +12905,11 @@ msgstr ""
 "Para conseguir gerar o par de chaves, é necessário, primeiro, salvar as "
 "informações da conta, pressionando o \"Ok\".\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "Não foi encontrada nenhuma chave PGP"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -13062,12 +12919,12 @@ msgstr ""
 "você não poderá assinar suas mensagens ou receber emails criptografados.\n"
 "Deseja criar um novo par de chaves agora?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Não foi possível gerar o novo par de chaves: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13075,11 +12932,11 @@ msgstr ""
 "Gerando seu novo par de chaves... Por favor, movimente o mouse "
 "aleatoriamente para ajudar a gerar entropia..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Não foi possível gerar o novo par de chaves: erro desconhecido"
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13092,15 +12949,15 @@ msgstr ""
 "\n"
 "Deseja exportá-lo para um servidor de chaves?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Chaves geradas"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Chaves exportadas."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "Não foi possível exportar as chaves."
 
@@ -13308,12 +13165,12 @@ msgid "Show Python console..."
 msgstr "Exibir o console Python..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Navegar"
@@ -13432,31 +13289,31 @@ msgstr ""
 "Não foi possível ler o conteúdo do antigo arquivo de fontes xml:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 "RSSyl: Ocorreu um erro ao escrever '%s' na lista de exportação de fontes.\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Não foi possível excluir o antigo arquivo OPML '%s': %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 "RSSyl: Não foi possível abrir o arquivo '%s' para a exportação da lista de "
 "fontes: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr ""
 "RSSyl: Ocorreu um erro durante a escrita do arquivo de exportação de "
 "fontes.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13469,7 +13326,7 @@ msgstr ""
 "\n"
 "O nome de pasta '%s' não é permitido."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13483,140 +13340,140 @@ msgstr ""
 "Cada fonte de notícia irá criar uma pasta com as entradas apropriadas, "
 "buscadas na Web. Você pode lê-las e excluir ou manter as entradas antigas."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "Fonte RSS"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(vazio)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Atualizar todas as fontes"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Assinar a fonte"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Digite a URL da fonte de notícias à qual você deseja assinar:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' não pode ser usado no nome da pasta."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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] "O Claws Mail necessita de acesso à rede para atualizar a fonte."
 msgstr[1] "O Claws Mail necessita de acesso à rede para atualizar as fontes."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Deseja realmente remover a árvore da fonte '%s'?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Remover a árvore da fonte"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "Selecione um arquivo OPML"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: Assinando uma nova fonte %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: Nova fonte assinada: '%s' (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Atualizando a fonte %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: A atualização da fonte foi finalizada: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: Ocorreu um erro na recuperação da fonte em '%s': %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: Não foi encontrada nenhuma fonte válida em '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: Não foi possível processar a fonte em '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 "RSSyl: A aplicação está encerrando, não possível encerrar a atualização do "
 "feed em '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "Autenticação HTTP básica"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Use o intervalo padrão de atualização"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Manter itens antigos"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "_Aparar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 "Fonte atualizada, excluindo itens que já não existem mais na origem da fonte"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Buscar comentários, se possível"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Sempre marcar como nova"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "Marcar como nova somente se o texto tiver sido alterado"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "Nunca marcar como nova"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "Adicionar o título do item no topo da mensagem"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Ignorar a renomeação do título"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13624,94 +13481,94 @@ msgstr ""
 "Habilite isso para manter o nome atual da pasta, mesmo que o autor da fonte "
 "altere o seu título."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "Verificar a validade do certificado TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Nome de usuário"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "URL de origem"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "Buscar comentários em publicações mais recentes que"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dias"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "Defina como -1 para buscar todos os comentários"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Se um item mudar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Itens"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Intervalo de atualização"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Defina como 0 para desabilitar a atualização automática dessa fonte"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Definir as propriedades da fonte"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "Atualizar a _fonte"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "_Propriedades da fonte"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "Reno_mear..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "Atualizar recursivamente"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "Assinar uma _nova fonte..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "Criar nova _pasta..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Importar lista de fontes..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Remover a árvore"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "Adicionar árvore de pastas RSS"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Digite o nome para a nova árvore de pastas RSS."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13721,57 +13578,57 @@ msgstr ""
 "Talvez alguns arquivos já existam ou você não tenha permissão para escrever "
 "lá."
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Minhas fontes"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Selecione o arquivo de cookie"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Intervalo padrão de atualização"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
 msgstr "Atualizar todas as fontes ao iniciar o programa"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Verificar a validade dos certificados TLS para novas fontes"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Caminho para o arquivo de cookies"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 "Caminho para o arquivo cookies.txt (estilo Netscape), contendo seus cookies"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Atualizando"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Segurança e privacidade"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "Não foi possível criar a pasta para a nova fonte '%s'."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Assinar a nova fonte?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Pasta da fonte:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
@@ -13779,35 +13636,35 @@ msgstr ""
 "Ao invés de usar o título oficial, você pode digitar um nome de pasta "
 "diferente para a nova fonte."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "_Editar as propriedades da fonte após assiná-la"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Atualizando os comentários para '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Requer autorização)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Não autorizado)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Não encontrado)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Erro %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13821,7 +13678,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13830,21 +13687,21 @@ msgstr ""
 "Não foi encontrada nenhuma fonte válida em\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Fonte sem título"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Possível fonte válida sem título em '%s'\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Atualizando a fonte '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13858,11 +13715,11 @@ msgstr ""
 "Por favor, entre em contato com os desenvolvedores. Isso não poderia ter "
 "acontecido."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "O Claws Mail necessita de acesso à rede para atualizar suas fontes."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13967,41 +13824,45 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "Relatando o spam"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Encaminhar para:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Nome de usuário:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "O plugin SpamAssassin não conseguiu conectar-se ao spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "O plugin SpamAssassin não conseguiu efetuar a filtragem.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "O plugin SpamAssassin está desabilitado por suas preferências.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando as mensagens..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -14011,7 +13872,7 @@ msgstr ""
 "desse erro é um servidor spamd inalcançável. Por favor, certifique-se de que "
 "o spamd está em execução e acessível."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -14019,17 +13880,17 @@ msgstr ""
 "O Claws Mail necessita de acesso à rede para enviar essa mensagem ao "
 "servidor de aprendizado remoto."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Não foi possível obter o nome de usuário"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "O plugin SpamAssassin foi carregado, mas está desabilitado por suas "
 "preferências.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14494,63 +14355,68 @@ msgstr "Participantes:"
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Nova reunião..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Exportar agenda..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "_Assinar o Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "_Atualizar assinaturas"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "Visão em _lista"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "Visão _semanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "Visão _mensal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Reuniões"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[sem sumário]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "no passado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "hoje"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "amanhã"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "essa semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "mais tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14559,21 +14425,21 @@ msgstr ""
 "\n"
 "Esses são os eventos planejados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tempo esgotado (%d segundos) ao tentar conectar com %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (Não autorizado)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Erro %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14586,7 +14452,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14597,110 +14463,110 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Não foi possível criar o diretório %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "O Claws Mail necessita de acesso à rede para atualizar a fonte Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Buscando a agenda de %s ..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "nova assinatura"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "O Claws Mail necessita de acesso à rede para atualizar a assinatura."
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Assinar o Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "Digite a URL do WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "Não foi possível analisar a URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Deseja realmente cancelar a assinatura?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Excluir a assinatura"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "aceito"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "aceito provisoriamente"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "recusado"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "sem resposta"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "individual"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "grupo"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "recursos"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "sala"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "Passado"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Hoje"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Amanhã"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "Essa semana"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "Mais tarde"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Aceito: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Recusado: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Aceito provisoriamente: "
 
@@ -15113,95 +14979,95 @@ msgstr "Erro de sintaxe na marca de hora durante a saudação\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Erro de sintaxe na marca de hora durante a saudação (não é ASCII)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "Erro do protocolo POP\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL inválida: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Excluindo a mensagem expirada %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Ignorando mensagem %d [%s] (%d bytes)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "a caixa postal está travada\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "Tempo da sessão esgotado\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "comando não suportado\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "ocorreu um erro na sessão POP\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Nenhum (somente SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Nome da conta"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Definir como padrão"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Informações pessoais"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "Endereço de email"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Configuração automática"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15209,81 +15075,81 @@ msgstr ""
 "Aviso: essa versão do Claws Mail\n"
 "foi compilada sem suporte a IMAP e Newsgroups."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Caixa postal local"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "Caixa de Entrada padrão"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "Autenticar antes da conexão POP"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Remover após"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dia e 0 hora: excluir imediatamente"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15291,94 +15157,98 @@ msgstr ""
 "Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, "
 "você poderá obtê-las por inteiro ou exclui-las."
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Mostrar apenas pastas inscritas"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 "Módulo de eficiência de banda (impede a recuperação de etiquetas remotas)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Esse modo usa menos banda, mas pode ser mais lento com alguns servidores."
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Tamanho do lote"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificação automática"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Usar as configurações globais"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Verificar por novas mensagens a cada"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permite filtrar usando plugins, durante o recebimento"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar o endereço de email da conta na Message-ID"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Adicionar cabeçalho user agent"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15386,218 +15256,218 @@ msgstr ""
 "Deixe estes campos em branco, para utilizar os mesmos usuário e senha de "
 "recebimento."
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "Autenticar via POP antes de enviar"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "Tempo esgotado para autenticação POP"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Autorização"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Selecione o provedor de serviço de email OAuth2"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "ID do cliente"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "Segredo do cliente"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Obter código de autorização"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "Abrir o navegador padrão ao requisitar"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Copiar o link"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Código de autorização"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr "Colar a URL completa do navegador ou o token de autorização fornecido"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Autorização completa"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "Inserir a assinatura automaticamente"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Saída do comando"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem ortográfica"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Dicionário alternativo padrão"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "Sempre assinar as mensagens em resposta a mensagens assinadas"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Criptografar as mensagens enviadas com sua própria chave além da dos "
 "destinatários"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "Não usar TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usar o comando STARTTLS para iniciar sessão criptografada"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Não usar TLS (mas, se necessário, usar STARTTLS)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "Certificados do cliente"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Certificado para recebimento"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado do cliente como um arquivo PKCS12 ou PEM"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Certificado para envio"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Aceitar automaticamente certificados TLS válidos"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Utilizar TLS não bloqueador"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via TLS"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Usar um servidor proxy"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Utilizar as configurações padrão"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Usar as configurações de servidor proxy do sistema"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Usar o servidor proxy para envio"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15606,27 +15476,27 @@ msgstr ""
 "com o servidor de envios configurado, ignorando qualquer servidor proxy "
 "configurado."
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "Porta POP"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "Porta IMAP"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15634,174 +15504,178 @@ msgstr ""
 "O nome do domínio será utilizado na Message-ID gerada e durante a conexão "
 "com os servidores SMTP."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "O endereço de email não foi informado."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "O servidor POP não foi informado."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "O servidor IMAP não foi informado."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "o comando de email não foi informado."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "O ID do usuário não pode conter o caractere de quebra de linha."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "A senha não pode conter um caractere de quebra de linha."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "O ID do usuário SMTP não pode conter o caractere de quebra de linha."
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "A senha do SMTP não pode conter um caractere de quebra de linha."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "o domínio não está especificado."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "a pasta Enviados não está selecionada."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "a pasta Fila de Saída não está selecionada."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "a pasta Rascunhos não está selecionada."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "a pasta Lixeira não está selecionada."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Preferências da nova conta"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Falha (endereço errado)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Selecione o arquivo do certificado"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin não carregado)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "Autorização concluída"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "Seu código de autorização OAuth2 foi recebido pelo Claws Mail"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "Autorização NÃO concluída"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "Seu código de autorização OAuth2 não foi recebido pelo Claws Mail"
 
@@ -16039,7 +15913,7 @@ msgstr "aplica as ações de filtragem entre {} nas mensagens selecionadas"
 msgid "for a literal %"
 msgstr "para um % literal"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Ações"
 
@@ -16348,7 +16222,7 @@ msgstr "Esconder"
 msgid "Message flags"
 msgstr "Marcas da mensagem"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Marcar"
@@ -16374,7 +16248,7 @@ msgstr "Marcar como _não-spam"
 msgid "Execute"
 msgstr "Executar"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Rótulo colorido"
 
@@ -16389,7 +16263,7 @@ msgstr "Redirecionar"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Pontuação"
@@ -16659,8 +16533,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Colunas ocultas"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Colunas exibidas"
 
@@ -16866,7 +16740,7 @@ msgstr "Usar uma fonte diferente para imprimir"
 msgid "Message Printing"
 msgstr "Impressão da mensagem"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Exibir"
@@ -17120,11 +16994,11 @@ msgstr "trecho do corpo"
 msgid "whole message"
 msgstr "toda a mensagem"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "Marcada"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Excluída"
 
@@ -17132,11 +17006,11 @@ msgstr "Excluída"
 msgid "Replied"
 msgstr "Respondida"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Encaminhada"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Spam"
@@ -17145,7 +17019,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Possui anexo"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "Assinada"
 
@@ -17657,7 +17531,7 @@ msgstr "Seleção de cor para as linhas com as diferenças"
 msgid "Hunk lines"
 msgstr "Linhas com as diferenças"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Lista de pastas"
 
@@ -18145,112 +18019,116 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "Verificador ortográfico"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "o nome abreviado do dia da semana"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "o nome abreviado do mês"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "a data e as horas preferidas para o locale atual"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "as horas no formato 24 horas"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "as horas no formato 12 horas"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "os minutos"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "usar AM ou PM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "os segundos"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para o locale atual"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "os dois últimos dígitos do ano"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "o ano"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "o fuso horário, o nome ou a abreviação"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Formato da data"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "Código"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Exibir número de mensagens ao lado do nome da pasta"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Mensagens não lidas"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Mensagens não lidas e totais"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
 msgstr "Abrir a última pasta aberta, ao iniciar"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "Abrir a pasta selecionada, ao iniciar"
+
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18258,100 +18136,100 @@ msgstr ""
 "Executar regras de processamento antes de marcar todas as mensagens em uma "
 "pasta como lidas ou não lidas"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nomes de newsgroup maiores que"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "Lista de mensagens"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Travar cabeçalhos das colunas"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Exibidos na coluna De"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Nome e endereço"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Ajuda do formato da data"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Defina a seleção de mensagem ao entrar em uma pasta"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Abrir a mensagem ao selecioná-la"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "Ao abrir uma pasta"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "Ao exibir os resultados da pesquisa"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 "Ao selecionar a mensagem anterior ou posterior usando atalhos de teclado"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "Ao excluir ou mover mensagens"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "Ao usar teclas direcionais"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Marcar a mensagem como lida"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "quando selecionada, após"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "apenas quando aberta em uma nova janela ou respondida"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Exibir o aviso \"nenhuma mensagem não lida (ou nova)\""
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "Assumir 'Sim'"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "Assumir 'Não'"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Nomear o remetente utilizando o Livro de Endereços"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "Agrupar discussão utilizando o assunto além dos cabeçalhos padrão"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente ao mover ou excluir mensagens"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18359,55 +18237,55 @@ msgstr ""
 "Se estiver desmarcado, a movimentação, cópia ou exclusão as mensagens será "
 "adiata até que se selecione 'Ferramentas/Executar'"
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr "Confirmar ao marcar todas as mensagens como lidas ou não lidas"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Confirmar ao alterar rótulos de cor"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Exibir dicas"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Padrões"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Novas pastas"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Número"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "Data da discussão"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "Não ordenar"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Visão da discussão"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Recolher todas as discussões"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Ocultar mensagens lidas"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Sumários"
 
@@ -18581,7 +18459,7 @@ msgstr "Modelos atuais"
 msgid "Template"
 msgstr "Modelo"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Tema interno padrão"
 
@@ -18589,21 +18467,16 @@ msgstr "Tema interno padrão"
 msgid "Themes"
 msgstr "Temas"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Remover o tema do sistema '%s'"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Remover o tema '%s'"
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Deseja realmente remover esse tema?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18612,24 +18485,24 @@ msgstr ""
 "Ocorreu um erro no arquivo %s\n"
 "durante a remoção do tema."
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "O diretório do tema não foi removido."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "O tema foi removido com sucesso"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Selecione a pasta do tema"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Instalar o tema '%s'"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18637,15 +18510,11 @@ msgstr ""
 "Essa não parece ser uma pasta de tema.\n"
 "Instalar mesmo assim?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "Deseja instalar o tema para todos os usuários?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "O tema já existe"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18657,25 +18526,25 @@ msgstr ""
 "\n"
 "Deseja substitui-lo?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Não foi possível excluir o tema antigo em %s."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Não foi possível criar o diretório de destino %s."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "O tema foi instalado com sucesso."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "O tema não foi instalado"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18684,78 +18553,78 @@ msgstr ""
 "Ocorreu um erro no arquivo %s\n"
 "durante a instalação do tema."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Ver todos os ícones do tema"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d temas disponíveis (%d do usuário, %d do sistema, 1 interno)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "O tema interno possui %d ícones"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "Não existe um arquivo de informações para esse tema"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Erro: não foi possível obter o status do tema"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d arquivos (%d ícones), tamanho: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Seletor"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Instalar novo..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Obter mais..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Informação"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Autor"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Visualização"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Ver tudo"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "Renderização SVG"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "Habilitar canal alfa"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Forçar a escala"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "Pontos por polegada (PPI)"
 
@@ -18904,7 +18773,7 @@ msgstr "Não foi definida nenhuma chave de destinatário."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "Não foi possível decodificar parte da mensagem"
 
@@ -19356,22 +19225,6 @@ msgstr ""
 "Ocorreu um erro durante o envio da mensagem:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Configuração da caixa postal"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Inicialmente, você precisa definir a localização da\n"
-"caixa postal (mailbox). Você pode utilizar uma\n"
-"existente no formato MH, se possuir uma.\n"
-"Se não tiver certeza, apenas clique em OK."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Código-fonte da mensagem"
@@ -19647,66 +19500,66 @@ msgstr "De: %s, em %s"
 msgid "To: %s, on %s"
 msgstr "Para: %s, em %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "Você não é o autor do artigo."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Deseja realmente excluir a mensagem selecionada?"
 msgstr[1] "Deseja realmente excluir as %d mensagens selecionadas?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Excluir a mensagem"
 msgstr[1] "Excluir as mensagens"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "As pastas de destino e a atual são a mesma."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Selecione a pasta para onde a mensagem selecionada será movida"
 msgstr[1] "Selecione a pasta para onde as mensagens selecionadas serão movidas"
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "Você está tentando copiar para a mesma pasta."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Selecione a pasta para onde a mensagem selecionada será copiada"
 msgstr[1] ""
 "Selecione a pasta para onde as mensagens selecionadas serão copiadas"
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "Acrescentar ou sobrescrever"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Acrescentar ao arquivo ou sobrescrevê-lo?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "_Acrescentar"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Não foi possível salvar o arquivo '%s'."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -19714,27 +19567,27 @@ msgstr ""
 "Você esta prestes a imprimir %d mensagens, uma a uma. Deseja realmente "
 "continuar?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Agrupando discussões..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Ignorar estas regras"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplicar estas regras independente da conta à qual elas pertençam"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar estas regras caso elas refiram-se à conta atual"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Filtragem"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19742,75 +19595,75 @@ msgstr ""
 "Existem algumas regras de filtragem que pertencem a uma conta.\n"
 "Por favor, escolha o que fazer com estas regras:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Configuração do processamento"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Deseja realmente reiniciar o rótulo de cor de todas as mensagens "
 "selecionadas?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Deseja realmente aplicar esse rótulo de cor a todas as mensagens "
 "selecionadas?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Reiniciar rótulo de cor"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Definir rótulo de cor"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Discussão ignorada"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Discussão observada"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Respondida, mas também encaminhada - clique para ver a resposta"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Respondida - clique para ver a resposta"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "A ser movida"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "A ser copiada"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "Assinada, possui anexo(s)"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "Criptografada, possui anexo(s)"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Criptografada"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "Possui anexo(s)"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19819,11 +19672,11 @@ msgstr ""
 "Erro na expressão regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Voltar à lista de pastas (se você tiver mensagens não lidas)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Voltar à lista de pastas"
 
@@ -20682,61 +20535,3 @@ msgid ""
 msgstr ""
 "O Claws Mail está pronto.\n"
 "Clique em Salvar para iniciar."
-
-#~ msgid "Move Email Addresses to or from Group with arrow buttons"
-#~ msgstr "Mover os endereços de email do ou para o grupo com botões de setas"
-
-#, c-format
-#~ msgid ""
-#~ "rule is account-based [id=%d, name='%s'], current account [id=%d, "
-#~ "name='%s']\n"
-#~ msgstr ""
-#~ "a regra é associada a conta [id=%d, nome='%s'], conta atual [id=%d, "
-#~ "nome='%s']\n"
-
-#~ msgctxt "IPv6"
-#~ msgid ""
-#~ "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-#~ msgstr ""
-#~ "adiciona suporte a endereços IPv6, o novo protocolo de endereçamento da "
-#~ "Internet\n"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be permanently deleted. Recovery "
-#~ "will not be possible.\n"
-#~ "\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Todas as pastas e mensagens dentro de '%s' serão excluídas. Não será "
-#~ "possível recuperá-las.\n"
-#~ "\n"
-#~ "Confirma a exclusão?"
-
-#~ msgid "Skip"
-#~ msgstr "Ignorar"
-
-#~ msgid "Skip all"
-#~ msgstr "Ignorar tudo"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be deleted.\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Todas as pastas e mensagens dentro de '%s' serão excluídas.\n"
-#~ "Deseja realmente fazer isso?"
-
-#, fuzzy
-#~ msgid "ThNULL, e entry was not saved. Close anyway?"
-#~ msgstr "A entrada não foi salva. Fechar mesmo assim?"
-
-#~ msgid "Select preset:"
-#~ msgstr "Selecionar pré-definido:"
-
-#~ msgid ""
-#~ "You can also modify each menu shortcut by pressing\n"
-#~ "any key(s) when focusing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Você também pode modificar os atalhos de menu pressionando\n"
-#~ "a(s) tecla(s) ao colocar o ponteiro do mouse sobre o item."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 42b51594f..78378f869 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Hugo Carvalho <hugokarvalho at hotmail.com>
+# Hugo Carvalho <hugokarvalho at hotmail.com>, 2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 4.1.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
 "POT-Creation-Date: 2023-08-11 11:31+0100\n"
-"PO-Revision-Date: 2023-08-09 23:14+0100\n"
+"PO-Revision-Date: 2023-08-12 14:39+0100\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho at hotmail.com>\n"
 "Language-Team: Portuguese <hugokarvalho at hotmail.com>\n"
 "Language: pt_PT\n"
@@ -26,7 +26,7 @@ msgid ""
 "Please close all the composing windows before editing accounts."
 msgstr ""
 "Algumas janelas de composição estão abertas.\n"
-"Por favor, feche todas estas janelas antes de editar as contas."
+"Feche todas estas janelas antes de editar as contas."
 
 #: src/account.c:447
 msgid "Can't create folder."
@@ -52,7 +52,7 @@ msgstr "_Nova"
 
 #: src/account.c:787
 msgid "Create a new account"
-msgstr "Cria uma conta nova"
+msgstr "Criar uma nova conta"
 
 #: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
 #: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:615
@@ -162,7 +162,7 @@ msgstr "Cópia de %s"
 #: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "Deseja realmente eliminar a conta '%s'?"
+msgstr "Deseja eliminar a conta '%s'?"
 
 #: src/account.c:1140
 msgid "(Untitled)"
@@ -256,7 +256,7 @@ msgstr "R"
 
 #: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
-msgstr "'Receber correio' obtém as mensagens das contas marcadas"
+msgstr "'Receber correio' obtém as mensagens das contas selecionadas"
 
 #: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
 #: src/addressbook.c:127 src/compose.c:7499 src/editaddress.c:1478
@@ -302,7 +302,7 @@ msgid ""
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
 "A ação selecionada não pode ser usada na janela de composição\n"
-"porque ela contem %%f, %%F, %%as ou %%p."
+"porque a mesma contém %%f, %%F, %%as ou %%p."
 
 #: src/action.c:728
 msgid "There is no filtering action set"
@@ -378,7 +378,7 @@ msgstr ""
 
 #: src/action.c:1653
 msgid "Action's hidden user argument"
-msgstr "Argumento do utilizador para a ação escondido"
+msgstr "Argumento do utilizador para a ação ocultado"
 
 #: src/action.c:1657
 #, c-format
@@ -402,7 +402,7 @@ msgstr ""
 
 #: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
-msgstr "Não é possível copiar um Livro de Endereços para ele mesmo."
+msgstr "Não é possível copiar um livro de endereços para ele mesmo."
 
 #: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
@@ -473,14 +473,14 @@ msgstr "Deseja realmente eliminar este nome de atributo?"
 
 #: src/addrcustomattr.c:197
 msgid "Reset to default"
-msgstr "Restaurar os valores originais"
+msgstr "Repor os valores originais"
 
 #: src/addrcustomattr.c:198
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
-"Deseja realmente substituir todos os nomes de\n"
+"Substituir todos os nomes de\n"
 "atributos pelos valores originais?"
 
 #: src/addrcustomattr.c:199 src/compose.c:9831 src/exphtmldlg.c:181
@@ -527,7 +527,7 @@ msgstr "Eliminar _tudo"
 
 #: src/addrcustomattr.c:220
 msgid "_Reset to default"
-msgstr "_Restaurar os valores originais"
+msgstr "_Repor os valores originais"
 
 #: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
@@ -582,7 +582,7 @@ msgstr "_Adicionar"
 #: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
-msgstr "_Ok"
+msgstr "_OK"
 
 #: src/addrcustomattr.c:520
 msgid ""
@@ -590,25 +590,25 @@ msgid ""
 "contacts."
 msgstr ""
 "A adição ou remoção de nomes de atributos não afetará os atributos já "
-"definidos para os contatos."
+"definidos para os contactos."
 
 #: src/addrduplicates.c:127
 msgid "Show duplicates in the same book"
-msgstr "Mostrar duplicatas no mesmo livro"
+msgstr "Mostrar duplicados no mesmo livro"
 
 #: src/addrduplicates.c:133
 msgid "Show duplicates in different books"
-msgstr "Mostrar duplicatas em livros diferentes"
+msgstr "Mostrar duplicados em livros diferentes"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
-msgstr "Encontrar emails duplicados no livro de endereços"
+msgstr "Localizar e-mails duplicados no livro de endereços"
 
 #: src/addrduplicates.c:145
 msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr ""
-"O Claws Mail irá agora pesquisar endereços de email duplicados no livro de "
+"O Claws Mail irá agora pesquisar endereços de e-mail duplicados no livro de "
 "endereços."
 
 #: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:671
@@ -619,11 +619,11 @@ msgstr "Locali_zar"
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr ""
-"Não foi encontrado nenhum endereço de email duplicado no livro de endereços"
+"Não foi localizado nenhum endereço de e-mail duplicado no livro de endereços"
 
 #: src/addrduplicates.c:347
 msgid "Duplicate email addresses"
-msgstr "Endereços de email duplicados"
+msgstr "Endereços de e-mail duplicados"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
 #: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
@@ -641,7 +641,7 @@ msgstr "Eliminar endereço(s)"
 
 #: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
-msgstr "Deseja realmente eliminar o(s) endereço(s)?"
+msgstr "Deseja eliminar o(s) endereço(s)?"
 
 #: src/addrduplicates.c:841
 msgid "Delete address"
@@ -668,7 +668,7 @@ msgstr "Notas"
 
 #: src/addressadd.c:288 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
-msgstr "Selecione a pasta do Livro de Endereços"
+msgstr "Selecionar a pasta do livro de endereços"
 
 #: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
@@ -735,7 +735,7 @@ msgstr "Selecionar _tudo"
 
 #: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
-msgstr "_Recortar"
+msgstr "C_ortar"
 
 #: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
 #: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
@@ -764,11 +764,11 @@ msgstr "Importar ficheiro _LDIF..."
 
 #: src/addressbook.c:442
 msgid "Import M_utt file..."
-msgstr "Importar ficheiro do _Mutt..."
+msgstr "Importar ficheiro _Mutt..."
 
 #: src/addressbook.c:443
 msgid "Import _Pine file..."
-msgstr "Importar ficheiro do _Pine..."
+msgstr "Importar ficheiro _Pine..."
 
 #: src/addressbook.c:445
 msgid "Export _HTML..."
@@ -780,7 +780,7 @@ msgstr "Exportar L_DIF..."
 
 #: src/addressbook.c:448
 msgid "Find duplicates..."
-msgstr "Encontrar d_uplicatas..."
+msgstr "Encontrar d_uplicados..."
 
 #: src/addressbook.c:449
 msgid "Edit custom attributes..."
@@ -868,7 +868,7 @@ msgstr "Erro no critério de pesquisa no LDAP"
 
 #: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
-msgstr "Não foram encontradas entradas LDAP para o critério da pesquisa"
+msgstr "Não foram localizadas entradas LDAP para o critério da pesquisa"
 
 #: src/addressbook.c:532
 msgid "LDAP search terminated on request"
@@ -880,7 +880,7 @@ msgstr "Erro ao iniciar a ligação STARTTLS"
 
 #: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
-msgstr "Falta o Distinguished Name (dn)"
+msgstr "Nome Distinto (dn) está em falta"
 
 #: src/addressbook.c:535
 msgid "Missing required information"
@@ -888,7 +888,7 @@ msgstr "Faltam informações necessárias"
 
 #: src/addressbook.c:536
 msgid "Another contact exists with that key"
-msgstr "Já existe outro contato com esta chave"
+msgstr "Já existe outro contacto com essa chave"
 
 #: src/addressbook.c:537
 msgid "Strong(er) authentication required"
@@ -916,18 +916,18 @@ msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
-"Deseja realmente eliminar este(s) grupo(s)?\n"
+"Deseja eliminar este(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 
 #: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr ""
-"Não é possível colar. O livro de endereços de destino é \"somente para "
+"Não foi possível colar. O livro de endereços de destino é \"apenas para "
 "leitura\"."
 
 #: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
-msgstr "Não é possível colar num grupo de endereços."
+msgstr "Não foi possível colar num grupo de endereços."
 
 #: src/addressbook.c:2959
 #, c-format
@@ -946,8 +946,8 @@ msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
-"Deseja eliminar '%s'? Se você eliminar somente a pasta, os endereços nela "
-"contidos serão movidos para a pasta superior."
+"Deseja eliminar '%s'? Se eliminar apenas a pasta, os endereços nela contidos "
+"serão movidos para a pasta superior."
 
 #: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
@@ -956,7 +956,7 @@ msgstr "Eliminar a pasta"
 
 #: src/addressbook.c:2976
 msgid "Delete _folder only"
-msgstr "Eliminar somente a _pasta"
+msgstr "Eliminar apenas a _pasta"
 
 #: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
@@ -987,7 +987,7 @@ msgstr "Pesquisar '%s'"
 
 #: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
-msgstr "Novos contatos"
+msgstr "Novos contactos"
 
 #: src/addressbook.c:4136
 msgid "New user, could not save index file."
@@ -1001,14 +1001,14 @@ msgstr ""
 
 #: src/addressbook.c:4150
 msgid "Old address book converted successfully."
-msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
+msgstr "A versão anterior do livro de endereços foi convertida com sucesso."
 
 #: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
-"O Livro de Endereços antigo foi convertido,\n"
+"O livro de endereços antigo foi convertido,\n"
 "não foi possível guardar o novo ficheiro de índice dos endereços."
 
 #: src/addressbook.c:4168
@@ -1024,7 +1024,7 @@ msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
-"Não foi possível converter o Livro de Endereços,\n"
+"Não foi possível converter o livro de endereços,\n"
 "nem foi possível guardar o novo ficheiro de índice dos endereços."
 
 #: src/addressbook.c:4179
@@ -1032,16 +1032,16 @@ msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
-"Não foi possível converter o Livro de Endereços, e não\n"
-"foi possível criar os novos ficheiros do Livro de Endereços."
+"Não foi possível converter o livro de endereços, e não\n"
+"foi possível criar os novos ficheiros do livro de endereços."
 
 #: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
-msgstr "Ocorreu um erro na conversão do Livro de Endereços"
+msgstr "Ocorreu um erro na conversão do livro de endereços"
 
 #: src/addressbook.c:4306
 msgid "Addressbook Error"
-msgstr "Erro no Livro de Endereços"
+msgstr "Erro no livro de endereços"
 
 #: src/addressbook.c:4307
 msgid "Could not read address index"
@@ -1087,15 +1087,15 @@ msgstr "Consulta LDAP"
 #: src/addressbook_foldersel.c:203 src/exphtmldlg.c:374 src/expldifdlg.c:388
 #: src/exporthtml.c:981 src/importldif.c:541
 msgid "Address Book"
-msgstr "Livro de Endereços"
+msgstr "Livro de endereços"
 
 #: src/addrgather.c:179
 msgid "Please specify name for address book."
-msgstr "Por favor, especifique um nome para o Livro de Endereços."
+msgstr "Por favor, especifique um nome para o livro de endereços."
 
 #: src/addrgather.c:186
 msgid "No available address book."
-msgstr "Não existe nenhum Livro de Endereços disponível."
+msgstr "Não existe nenhum livro de endereços disponível."
 
 #: src/addrgather.c:207
 msgid "Please select the mail headers to search."
@@ -1103,7 +1103,7 @@ msgstr "Por favor, selecione os cabeçalhos da mensagem a serem pesquisados."
 
 #: src/addrgather.c:214
 msgid "Collecting addresses..."
-msgstr "Coletando endereços..."
+msgstr "A recolher endereços..."
 
 #: src/addrgather.c:254
 msgid "address added by Claws Mail"
@@ -1111,7 +1111,7 @@ msgstr "endereço adicionado pelo Claws Mail"
 
 #: src/addrgather.c:285
 msgid "Addresses collected successfully."
-msgstr "Os endereços foram coletados com sucesso."
+msgstr "Os endereços foram recolhidos com sucesso."
 
 #: src/addrgather.c:358
 msgid "Current folder:"
@@ -1119,17 +1119,17 @@ msgstr "Pasta atual:"
 
 #: src/addrgather.c:367
 msgid "Address book name:"
-msgstr "Nome do Livro de Endereços:"
+msgstr "Nome do livro de endereços:"
 
 #: src/addrgather.c:395
 msgid "Address book folder size:"
-msgstr "Tamanho da pasta do Livro de Endereços:"
+msgstr "Tamanho da pasta do livro de endereços:"
 
 #: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr ""
-"Número máximo de entradas por pasta dentro no recém-criado Livro de Endereços"
+"Número máximo de entradas por pasta dentro no recém-criado livro de endereços"
 
 #: src/addrgather.c:412
 msgid "Process these mail header fields"
@@ -1158,11 +1158,11 @@ msgstr "Finalizar"
 
 #: src/addrgather.c:643
 msgid "Collect email addresses from selected messages"
-msgstr "Coletar endereços de email das mensagens selecionadas"
+msgstr "Recolher endereços de e-mail das mensagens selecionadas"
 
 #: src/addrgather.c:647
 msgid "Collect email addresses from folder"
-msgstr "Coletar endereços de email da pasta"
+msgstr "Recolher endereços de e-mail da pasta"
 
 #: src/addrindex.c:124
 msgid "Common addresses"
@@ -1384,7 +1384,7 @@ msgstr "escrever em fd%d: %s\n"
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr ""
-"Não foi possível verificar o status do ficheiro de certificado P12 (%s)\n"
+"Não foi possível verificar o estado do ficheiro de certificado P12 (%s)\n"
 
 #: src/common/ssl_certificate.c:342
 #, c-format
@@ -1703,10 +1703,10 @@ msgid ""
 "\n"
 "Signing and encrypting have been disabled for this message."
 msgstr ""
-"Você optou por assinar e/ou encriptar esta mensagem, mas não selecionou "
-"nenhum sistema de privacidade.\n"
+"Optou por assinar e/ou encriptar esta mensagem, mas não selecionou nenhum "
+"sistema de privacidade.\n"
 "\n"
-"A assinatura e a encriptação foram desabilitadas para esta mensagem."
+"A assinatura e a encriptação foram desativadas para esta mensagem."
 
 #: src/compose.c:604
 msgid "_Add..."
@@ -1779,7 +1779,7 @@ msgstr "Re_fazer"
 
 #: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
-msgstr "_Recortar"
+msgstr "_Cortar"
 
 #: src/compose.c:647
 msgid "_Special paste"
@@ -1876,7 +1876,7 @@ msgstr "Editar com um programa e_xterno"
 
 #: src/compose.c:680
 msgid "_Check all or check selection"
-msgstr "_Verificar tudo ou somente a seleção"
+msgstr "_Verificar tudo ou apenas a seleção"
 
 #: src/compose.c:681
 msgid "_Highlight all misspelled words"
@@ -1972,11 +1972,11 @@ msgstr "_Assinar"
 
 #: src/compose.c:730
 msgid "_Encrypt"
-msgstr "_Criptografar"
+msgstr "_Encriptar"
 
 #: src/compose.c:731
 msgid "_Request Return Receipt"
-msgstr "_Solicitar confirmação de recebimento"
+msgstr "_Solicitar recibo de leitur"
 
 #: src/compose.c:732
 msgid "Remo_ve references"
@@ -2006,7 +2006,7 @@ msgstr "_Lista de discussão"
 
 #: src/compose.c:746
 msgid "_Highest"
-msgstr "_Altíssima"
+msgstr "_Muito alta"
 
 #: src/compose.c:747
 msgid "Hi_gh"
@@ -2018,7 +2018,7 @@ msgstr "_Baixa"
 
 #: src/compose.c:750
 msgid "_Lowest"
-msgstr "Bai_xíssima"
+msgstr "Muito b_aixa"
 
 #: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
@@ -2038,7 +2038,7 @@ msgstr "Europeu Central (ISO-8859-_2)"
 
 #: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
-msgstr "_Grego (ISO-8859-7)"
+msgstr "Grego (ISO-8859-_7)"
 
 #: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
@@ -2067,7 +2067,7 @@ msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
-"O campo \"De\" do modelo \"Responder\" possui um endereço de email inválido."
+"O campo \"De\" do modelo \"Responder\" possui um endereço de e-mail inválido."
 
 #: src/compose.c:1668 src/quote_fmt.c:585
 #, c-format
@@ -2079,7 +2079,8 @@ msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
-"O campo \"De\" do modelo \"Encaminhar\" possui um endereço de email inválido."
+"O campo \"De\" do modelo \"Encaminhar\" possui um endereço de e-mail "
+"inválido."
 
 #: src/compose.c:1870 src/quote_fmt.c:605
 #, c-format
@@ -2088,7 +2089,7 @@ msgstr "O corpo do modelo \"Encaminhar\" possui um erro na linha %d."
 
 #: src/compose.c:2053
 msgid "Fw: multiple emails"
-msgstr "Enc: múltiplos emails"
+msgstr "Enc: múltiplos e-mails"
 
 #: src/compose.c:2575
 #, c-format
@@ -2161,8 +2162,8 @@ msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
-"Você esta prestes a inserir um ficheiro de %s no corpo da mensagem. Deseja "
-"realmente fazer isso?"
+"Está prestes a inserir um ficheiro de %s no corpo da mensagem. Deseja fazer "
+"isso?"
 
 #: src/compose.c:3701
 msgid "Are you sure?"
@@ -2275,7 +2276,7 @@ msgstr "A enviar para %d destinatários. %s"
 
 #: src/compose.c:5281
 msgid "Could not queue message."
-msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
+msgstr "Não foi possível adicionar a mensagem à fila de espera."
 
 #: src/compose.c:5284
 #, c-format
@@ -2284,7 +2285,7 @@ msgid ""
 "\n"
 "%s."
 msgstr ""
-"Não foi possível adicionar a mensagem à Fila de Saída:\n"
+"Não foi possível adicionar a mensagem à fila de espera:\n"
 "\n"
 "%s."
 
@@ -2295,7 +2296,7 @@ msgid ""
 "\n"
 "Signature failed: %s"
 msgstr ""
-"Não foi possível acrescentar a mensagem à Fila de Saída:\n"
+"Não foi possível acrescentar a mensagem à fila de espera:\n"
 "\n"
 "Falha na assinatura: %s"
 
@@ -2306,7 +2307,7 @@ msgid ""
 "\n"
 "Encryption failed: %s"
 msgstr ""
-"Não foi possível acrescentar a mensagem à Fila de Saída:\n"
+"Não foi possível acrescentar a mensagem à fila de espera:\n"
 "\n"
 "Falha na encriptação: %s"
 
@@ -2316,7 +2317,7 @@ msgid ""
 "\n"
 "Charset conversion failed."
 msgstr ""
-"Não foi possível acrescentar a mensagem à Fila de Saída:\n"
+"Não foi possível acrescentar a mensagem à fila de espera:\n"
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
@@ -2326,7 +2327,7 @@ msgid ""
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
-"Não foi possível acrescentar a mensagem à Fila de Saída:\n"
+"Não foi possível acrescentar a mensagem à fila de espera:\n"
 "\n"
 "Não foi possível obter a chave de encriptação do destinatário."
 
@@ -2335,8 +2336,8 @@ msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
-"A mensagem está na Fila de Saída, mas não foi possível enviá-la.\n"
-"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
+"A mensagem está na fila de espera, mas não foi possível enviá-la.\n"
+"Use \"Enviar mensagens da fila de espera\" a partir da janela principal para "
 "tentar novamente."
 
 #: src/compose.c:5421
@@ -2345,6 +2346,9 @@ msgid ""
 "%s\n"
 "You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
+"%s\n"
+"Pode tentar \"Enviar\" novamente ou colocar a mensagem em fila de espera com "
+"\"Enviar mais tarde\""
 
 #: src/compose.c:5818
 #, c-format
@@ -2406,7 +2410,7 @@ msgstr "Parte %s original"
 
 #: src/compose.c:7093
 msgid "Add to address _book"
-msgstr "Adicionar ao _Livro de Endereços"
+msgstr "Adicionar ao _livro de endereços"
 
 #: src/compose.c:7248
 msgid "Delete entry contents"
@@ -2415,7 +2419,7 @@ msgstr "Eliminar o conteúdo da entrada"
 #: src/compose.c:7252 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
-"Use <tab> para completar automaticamente a partir do Livro de Endereços"
+"Use <tab> para completar automaticamente a partir do livro de endereços"
 
 #: src/compose.c:7487
 msgid "Mime type"
@@ -2479,7 +2483,7 @@ msgstr "_De:"
 
 #: src/compose.c:8475
 msgid "Account to use for this email"
-msgstr "Conta a ser usada por este email"
+msgstr "Conta a ser usada por este e-mail"
 
 #: src/compose.c:8477
 msgid "Sender address to be used"
@@ -2491,8 +2495,8 @@ msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
-"Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
-"assinar ou encriptar esta mensagem."
+"Não foi possível carregar o sistema de privacidade '%s'. Não poderá assinar "
+"ou encriptar esta mensagem."
 
 #: src/compose.c:8770 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
@@ -2685,8 +2689,8 @@ msgstr[0] ""
 "Deseja inserir o conteúdo do ficheiro no corpo da mensagem ou anexá-lo ao e-"
 "mail?"
 msgstr[1] ""
-"Você deseja inserir o conteúdo dos %d ficheiros no corpo da mensagem ou "
-"anexá-los ao email?"
+"Deseja inserir o conteúdo dos %d ficheiros no corpo da mensagem ou anexá-los "
+"ao e-mail?"
 
 #: src/compose.c:11719
 msgid "Insert or attach?"
@@ -2707,8 +2711,8 @@ msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr ""
-"Você esta prestes a responder %d mensagens. Abrir as janelas de composição "
-"pode demorar algum tempo. Deseja realmente continuar?"
+"Está prestes a responder %d mensagens. Abrir as janelas de composição pode "
+"demorar algum tempo. Deseja continuar?"
 
 #: src/crash.c:140
 #, c-format
@@ -2773,7 +2777,7 @@ msgstr ""
 " - Primeiro nome\n"
 " - Sobrenome\n"
 " - Apelido\n"
-" - qualquer endereço de email\n"
+" - qualquer endereço de e-mail\n"
 " - qualquer atributo adicional\n"
 "\n"
 "Clique em Ok para continuar editando este contato.\n"
@@ -2795,7 +2799,7 @@ msgstr ""
 "uma das informações seguintes seja definida:\n"
 " - Primeiro nome\n"
 " - Sobrenome\n"
-" - qualquer endereço de email\n"
+" - qualquer endereço de e-mail\n"
 " - qualquer atributo adicional\n"
 "\n"
 "Clique em Ok para continuar editando este contato.\n"
@@ -2807,11 +2811,11 @@ msgstr "Editar os detalhes da pessoa"
 
 #: src/editaddress.c:507
 msgid "An Email address must be supplied."
-msgstr "Você deve informar um endereço de email."
+msgstr "Deve fornecer um endereço de e-mail."
 
 #: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:204
 msgid "A Name and Value must be supplied."
-msgstr "Você deve informar um nome e um valor."
+msgstr "Deve fornecer um nome e um valor."
 
 #: src/editaddress.c:820 src/prefs_folder_item.c:1827
 msgid "Discard"
@@ -2883,7 +2887,7 @@ msgstr "Dados do _utilizador"
 
 #: src/editaddress.c:1598
 msgid "_Email Addresses"
-msgstr "Endereços de _email"
+msgstr "Endereços de _e-mail"
 
 #: src/editaddress.c:1601 src/editaddress.c:1604
 msgid "O_ther Attributes"
@@ -2904,7 +2908,7 @@ msgstr "O ficheiro parece estar ok."
 
 #: src/editbook.c:111
 msgid "File does not appear to be a valid address book format."
-msgstr "O ficheiro não parece estar num formato de Livro de Endereços válido."
+msgstr "O ficheiro não parece estar num formato de livro de endereços válido."
 
 #: src/editbook.c:114 src/editjpilot.c:190 src/editvcard.c:97
 msgid "Could not read file."
@@ -2925,11 +2929,11 @@ msgstr "Ficheiro"
 
 #: src/editbook.c:277
 msgid "Add New Addressbook"
-msgstr "Adicionar um novo Livro de Endereços"
+msgstr "Adicionar um novo livro de endereços"
 
 #: src/editgroup.c:97
 msgid "A Group Name must be supplied."
-msgstr "Você deve informar um nome para o grupo."
+msgstr "Deve fornecer um nome para o grupo."
 
 #: src/editgroup.c:292
 msgid "Edit group data"
@@ -2987,7 +2991,7 @@ msgstr "Editar a entrada JPilot"
 
 #: src/editjpilot.c:281
 msgid "Additional e-Mail address item(s)"
-msgstr "Item(ns) adicional(is) do endereço de email"
+msgstr "Item(ns) adicional(is) do endereço de e-mail"
 
 #: src/editjpilot.c:371
 msgid "Add New JPilot Entry"
@@ -3024,19 +3028,19 @@ msgstr ""
 
 #: src/editldap_basedn.c:329 src/editldap.c:281
 msgid "Could not connect to server"
-msgstr "Não foi possível conectar ao servidor"
+msgstr "Não foi possível ligar ao servidor"
 
 #: src/editldap.c:152
 msgid "A Name must be supplied."
-msgstr "Você deve informar um nome."
+msgstr "Deve fornecer um nome."
 
 #: src/editldap.c:164
 msgid "A Hostname must be supplied for the server."
-msgstr "Você deve informar um endereço para o servidor."
+msgstr "Deve fornecer um endereço para o servidor."
 
 #: src/editldap.c:177
 msgid "At least one LDAP search attribute should be supplied."
-msgstr "Você deve informar ao menos um atributo de pesquisa no LDAP."
+msgstr "Deve fornecer ao menos um atributo de pesquisa no LDAP."
 
 #: src/editldap.c:278
 msgid "Connected successfully to server"
@@ -3048,7 +3052,7 @@ msgstr "Editar o servidor LDAP"
 
 #: src/editldap.c:436
 msgid "A name that you wish to call the server."
-msgstr "O nome pelo qual você deseja chamar o servidor."
+msgstr "O nome pelo qual deseja chamar o servidor."
 
 #: src/editldap.c:449
 msgid ""
@@ -3058,9 +3062,9 @@ msgid ""
 "computer as Claws Mail."
 msgstr ""
 "Este é o endereço do servidor. Por exemplo, \"ldap.exemplo.org\" pode ser "
-"apropriado para a organização \"exemplo.org\". Você também pode usar um "
-"endereço IP. Você deve especificar \"localhost\" se estiver executando um "
-"servidor LDAP no mesmo computador que o Claws Mail."
+"apropriado para a organização \"exemplo.org\". Também pode usar um endereço "
+"IP. Deve especificar \"localhost\" se estiver a executar um servidor LDAP no "
+"mesmo computador que o Claws Mail."
 
 #: src/editldap.c:467
 msgid "STARTTLS"
@@ -3078,8 +3082,8 @@ msgid ""
 "TLS_REQCERT fields)."
 msgstr ""
 "Ativar ligação segura com o servidor LDAP via STARTTLS. A ligação é iniciada "
-"descriptografada e se torna segura pelo comando STARTTLS. Caso a ligação não "
-"se efetue, certifique-se de verificar a configuração correta em ldap.conf "
+"desencriptada e se torna segura pelo comando STARTTLS. Caso a ligação não se "
+"efetue, certifique-se de verificar a configuração correta em ldap.conf "
 "(campos TLS_CACERTDIR e TLS_REQCERT)."
 
 #: src/editldap.c:477
@@ -3234,7 +3238,7 @@ msgstr "Palavra-passe associada"
 #: src/editldap.c:724
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
-"A palavra-passe a ser usada quando se conectar como utilizador o \"DN "
+"A palavra-passe a ser usada quando se ligar como utilizador o \"DN "
 "associado\"."
 
 #: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
@@ -3308,7 +3312,7 @@ msgstr "Deseja realmente eliminar todas as etiquetas?"
 #: src/edittags.c:441
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
-"Você digitou um nome reservado para esta etiqueta. Por favor, escolha outro."
+"Inseriu um nome reservado para esta etiqueta. Por favor, escolha outro."
 
 #: src/edittags.c:572
 msgid "New tag:"
@@ -3472,7 +3476,7 @@ msgstr "Faixa de cores"
 
 #: src/exphtmldlg.c:476
 msgid "Format Email Links"
-msgstr "Formatar os links do email"
+msgstr "Formatar os links do e-mail"
 
 #: src/exphtmldlg.c:480
 msgid "Format User Attributes"
@@ -3492,7 +3496,7 @@ msgstr "Abrir com o navegador Web"
 
 #: src/exphtmldlg.c:572
 msgid "Export Address Book to HTML File"
-msgstr "Exportar o Livro de Endereços para um ficheiro HTML"
+msgstr "Exportar o livro de endereços para um ficheiro HTML"
 
 #: src/exphtmldlg.c:606 src/expldifdlg.c:671 src/importldif.c:923
 #: src/message_search.c:228 src/summary_search.c:485 src/wizard.c:1830
@@ -3553,8 +3557,8 @@ msgid ""
 "A suffix is required if data is to be used for an LDAP server. Are you sure "
 "you wish to proceed without a suffix?"
 msgstr ""
-"É  necessário um sufixo caso os dados sejam usados para um servidor LDAP. "
-"Você tem certeza que deseja prosseguir snum sufixo?"
+"É necessário um sufixo caso os dados sejam usados para um servidor LDAP. "
+"Deseja prosseguir sem num sufixo?"
 
 #: src/expldifdlg.c:261
 msgid "Error creating LDIF file"
@@ -3574,7 +3578,7 @@ msgid ""
 "to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"O campo ID Única do Livro de Endereços é usado para criar um DN que tnum "
+"O campo ID Única do livro de endereços é usado para criar um DN que tnum "
 "formato similar a:\n"
 "  uid=102376,ou=pessoas,dc=claws-mail,dc=org"
 
@@ -3584,7 +3588,7 @@ msgid ""
 "similar to:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"O campo Nome Exibido do Livro de Endereços é usado para criar um DN que tnum "
+"O campo Nome Exibido do livro de endereços é usado para criar um DN que tnum "
 "formato similar a:\n"
 "  cn=Fulano de Tal,ou=pessoas,dc=claws-mail,dc=org"
 
@@ -3594,7 +3598,7 @@ msgid ""
 "formatted similar to:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 msgstr ""
-"O primeiro endereço de email pertencente a uma pessoa  é usado para criar um "
+"O primeiro endereço de e-mail pertencente a uma pessoa é usado para criar um "
 "DN que tnum formato similar a:\n"
 "  mail=fulano.tal at dominio.com,ou=pessoas,dc=claws-mail,dc=org"
 
@@ -3632,8 +3636,8 @@ msgid ""
 "Distinguished Name\" (or RDN) to create the DN. Please select one of the "
 "available RDN options that will be used to create the DN."
 msgstr ""
-"O ficheiro LDIF contém vários registros que são geralmente carregados num "
-"servidor LDAP. Cada registro no ficheiro LDIF é identificado com "
+"O ficheiro LDIF contém vários registos que são geralmente carregados num "
+"servidor LDAP. Cada registo no ficheiro LDIF é identificado com "
 "exclusividade por um \"Distinguished Name\" (ou DN). O sufixo é adicionado "
 "ao \"Relative Distinguished Name\" (ou RDN) para criar o DN. Por favor, "
 "selecione uma das opções de RDN disponíveis que serão utilizadas para criar "
@@ -3650,27 +3654,27 @@ msgid ""
 "address book data, may be used in the exported LDIF file. The RDN selected "
 "above will be used if the DN user attribute is not found."
 msgstr ""
-"O Livro de Endereços pode conter entradas importadas previamente de um "
+"O livro de endereços pode conter entradas importadas previamente de um "
 "ficheiro LDIF. Caso o atributo de utilizador \"Distinguished Name\" (DN) "
-"esteja presente nos dados do Livro de Endereços, ele pode ser usado no "
+"esteja presente nos dados do livro de endereços, ele pode ser usado no "
 "ficheiro LDIF exportado. O RDN selecionado acima será usado se o atributo de "
 "utilizador DN não for encontrado."
 
 #: src/expldifdlg.c:544
 msgid "Exclude record if no Email Address"
-msgstr "Eliminar os registros que não possuam endereço de email"
+msgstr "Eliminar os registos que não possuam endereço de e-mail"
 
 #: src/expldifdlg.c:548
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
 msgstr ""
-"Um Livro de Endereços pode conter entradas snum endereço de email. Marque "
-"esta opção para ignorar estes registros."
+"Um livro de endereços pode conter entradas sem num endereço de e-mail. "
+"Selecione esta opção para ignorar estes registos."
 
 #: src/expldifdlg.c:637
 msgid "Export Address Book to LDIF File"
-msgstr "Exportar o Livro de Endereços para um ficheiro LDIF"
+msgstr "Exportar o livro de endereços para um ficheiro LDIF"
 
 #: src/expldifdlg.c:704
 msgid "Distinguished Name"
@@ -3723,7 +3727,7 @@ msgstr "Atributos"
 
 #: src/exporthtml.c:971
 msgid "Claws Mail Address Book"
-msgstr "Livro de Endereços do Claws Mail"
+msgstr "Livro de endereços do Claws Mail"
 
 #: src/exporthtml.c:1066 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
@@ -3877,27 +3881,27 @@ msgstr "não foi possível aplicar a ação\n"
 #: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
-msgstr "não outro procestamento após a ação [ %s ]\n"
+msgstr "não outro processamento após a ação [ %s ]\n"
 
 #: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
-msgstr "regra de procestamento '%s' [ %s ]\n"
+msgstr "regra de processamento '%s' [ %s ]\n"
 
 #: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
-msgstr "regra de procestamento <sem nome> [ %s ]\n"
+msgstr "regra de processamento <sem nome> [ %s ]\n"
 
 #: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
-msgstr "regra desabilitada '%s' [ %s ]\n"
+msgstr "regra desativada '%s' [ %s ]\n"
 
 #: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
-msgstr "regra desabilitada <sem nome> [ %s ]\n"
+msgstr "regra desativada <sem nome> [ %s ]\n"
 
 #: src/filtering.c:927
 msgid "undetermined"
@@ -3913,15 +3917,15 @@ msgstr "manualmente"
 
 #: src/filtering.c:939
 msgid "folder processing"
-msgstr "procestamento da pasta"
+msgstr "processamento da pasta"
 
 #: src/filtering.c:943
 msgid "pre-processing"
-msgstr "pré-procestamento"
+msgstr "pré-processamento"
 
 #: src/filtering.c:947
 msgid "post-processing"
-msgstr "pós-procestamento"
+msgstr "pós-processamento"
 
 #: src/filtering.c:962
 #, c-format
@@ -3964,7 +3968,7 @@ msgstr "Enviadas"
 #: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
-msgstr "Fila de Saída"
+msgstr "Fila de espera"
 
 #: src/folder.c:1608 src/prefs_folder_item.c:328
 msgid "Trash"
@@ -3977,17 +3981,17 @@ msgstr "Rascunhos"
 #: src/folder.c:2043
 #, c-format
 msgid "Processing (%s)...\n"
-msgstr "Procestando (%s)...\n"
+msgstr "A processar (%s)...\n"
 
 #: src/folder.c:3295
 #, c-format
 msgid "Copying %s to %s...\n"
-msgstr "Copiando %s para %s...\n"
+msgstr "A copiar %s para %s...\n"
 
 #: src/folder.c:3295
 #, c-format
 msgid "Moving %s to %s...\n"
-msgstr "Movendo %s para %s...\n"
+msgstr "A mover %s para %s...\n"
 
 #: src/folder.c:3613
 #, c-format
@@ -4022,7 +4026,7 @@ msgstr "NovaPasta"
 
 #: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
-msgstr "Propriedades e regras de procestamento herdadas da pasta superior"
+msgstr "Propriedades e regras de processamento herdadas da pasta superior"
 
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
@@ -4066,16 +4070,15 @@ msgstr "Marcar recursi_vamente todas como não lidas"
 
 #: src/folderview.c:255
 msgid "R_un processing rules"
-msgstr "E_xecutar regras de procestamento"
+msgstr "E_xecutar regras de processamento"
 
 #: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Pesquisar na pasta..."
 
 #: src/folderview.c:257
-#, fuzzy
 msgid "Open on start-up"
-msgstr "Esconder ao iniciar"
+msgstr "Abrir ao arrancar"
 
 #: src/folderview.c:259
 msgid "Process_ing..."
@@ -4155,12 +4158,12 @@ msgstr "Deseja realmente marcar todas as mensagens desta pasta como não lidas?"
 #: src/folderview.c:1078 src/imap.c:4755
 #, c-format
 msgid "Scanning folder %s/%s..."
-msgstr "Vasculhando a pasta %s/%s..."
+msgstr "A analisar a pasta %s/%s..."
 
 #: src/folderview.c:1081 src/imap.c:4759 src/mainwindow.c:5270 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
-msgstr "Vasculhando a pasta %s..."
+msgstr "A analisar a pasta %s..."
 
 #: src/folderview.c:1112
 msgid "Rebuild folder tree"
@@ -4179,7 +4182,7 @@ msgstr "Reconstruindo a árvore de pastas..."
 
 #: src/folderview.c:1125
 msgid "Scanning folder tree..."
-msgstr "Vasculhando a árvore de pastas..."
+msgstr "A analisar a árvore de pastas..."
 
 #: src/folderview.c:1214
 #, c-format
@@ -4188,17 +4191,17 @@ msgstr "Não foi possível vasculhar a pasta %s\n"
 
 #: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
-msgstr "Verificando se há novas mensagens em todas as pastas..."
+msgstr "A verificar se há novas mensagens em todas as pastas..."
 
 #: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
-msgstr "Fechando a pasta %s..."
+msgstr "A fechar a pasta %s..."
 
 #: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
-msgstr "Abrindo a pasta %s..."
+msgstr "A abrir a pasta %s..."
 
 #: src/folderview.c:2364
 msgid "Folder could not be opened."
@@ -4206,7 +4209,7 @@ msgstr "Não foi possível abrir a pasta."
 
 #: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
-msgstr "Esvaziar Lixo"
+msgstr "Esvaziar lixo"
 
 #: src/folderview.c:2505
 msgid "Delete all messages in trash?"
@@ -4214,27 +4217,27 @@ msgstr "Eliminar todas as mensagens do lixo?"
 
 #: src/folderview.c:2506
 msgid "_Empty trash"
-msgstr "_Esvaziar o lixo"
+msgstr "_Esvaziar lixo"
 
 #: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
-msgstr "Aviso de modo desconectado"
+msgstr "Aviso de modo offline"
 
 #: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
-msgstr "Você está trabalhando em modo desconectado. Redefinir?"
+msgstr "Está a trabalhar em modo offline. Redefinir?"
 
 #: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
-msgstr "Enviar mensagens da Fila de Saída"
+msgstr "Enviar mensagens da fila de espera"
 
 #: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
-msgstr "Enviar todas as mensagens da Fila de Saída?"
+msgstr "Enviar todas as mensagens da fila de espera?"
 
 #: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
-msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
+msgstr "Ocorreram erros durante o envio das mensagens da fila de espera."
 
 #: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
@@ -4242,18 +4245,18 @@ msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
-"Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
+"Ocorreram erros durante o envio de mensagens da fila de espera:\n"
 "%s"
 
 #: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
-msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
+msgstr "Deseja copiar a pasta '%s' para '%s'?"
 
 #: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
-msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
+msgstr "Deseja tornar a pasta '%s' uma subpasta de '%s'?"
 
 #: src/folderview.c:2673
 msgid "Copy folder"
@@ -4266,12 +4269,12 @@ msgstr "Mover a pasta"
 #: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
-msgstr "Copiando %s para %s..."
+msgstr "A copiar %s para %s..."
 
 #: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
-msgstr "Movendo %s para %s..."
+msgstr "A mover %s para %s..."
 
 #: src/folderview.c:2718
 msgid "Source and destination are the same."
@@ -4300,7 +4303,7 @@ msgstr "Não foi possível mover!"
 #: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
-msgstr "Configuração de procestamento da pasta %s"
+msgstr "Configuração de processamento da pasta %s"
 
 #: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
@@ -4344,7 +4347,7 @@ msgstr "moderado"
 
 #: src/grouplistdialog.c:356
 msgid "read-only"
-msgstr "somente leitura"
+msgstr "apenas leitura"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
 #: src/plugins/vcalendar/vcal_manager.c:115
@@ -4368,11 +4371,11 @@ msgstr "%d newsgroups recebidos (%s lidos)"
 #: src/gtk/about.c:134
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
-"O Claws Mail é um cliente de email leve, rápido e altamente configurável."
+"O Claws Mail é um cliente de e-mail leve, rápido e altamente configurável."
 
 #: src/gtk/about.c:137
 msgid "For further information visit the Claws Mail website:"
-msgstr "Para maiores informações, visite o site do Claws Mail:"
+msgstr "Para mais informações, visite o site do Claws Mail:"
 
 #: src/gtk/about.c:142
 msgid ""
@@ -4386,18 +4389,17 @@ 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:"
 msgstr ""
-"O Claws Mail é um software livre liberado sob a licença GPL. Se você deseja "
-"fazer doações para o projeto do Claws Mail, você pode fazê-lo em:"
+"O Claws Mail é um software livre disponibilizado sob a licença GPL. Se "
+"deseja fazer doações para o projeto do Claws Mail, pode fazê-lo em:"
 
 #: src/gtk/about.c:164 src/gtk/about.c:876
-#, fuzzy
 msgid ""
 "Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2022\n"
-"A Equipe do Claws Mail\n"
+"Copyright (C) 1999-2023\n"
+"A equipa do Claws Mail\n"
 "e Hiroyuki Yamamoto"
 
 #: src/gtk/about.c:169
@@ -4441,11 +4443,11 @@ msgstr "Membros anteriores da equipe"
 
 #: src/gtk/about.c:292
 msgid "The translation team"
-msgstr "A equipe de tradução"
+msgstr "A equipa de tradução"
 
 #: src/gtk/about.c:311
 msgid "Documentation team"
-msgstr "A equipe de documentação"
+msgstr "A equipa de documentação"
 
 #: src/gtk/about.c:329
 msgid "Logo"
@@ -4476,7 +4478,7 @@ msgstr "adiciona suporte à verificação ortográfica\n"
 #: src/gtk/about.c:453
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
-msgstr "adiciona suporte a conexões criptografadas a servidores\n"
+msgstr "adiciona suporte a ligações encriptadas a servidores\n"
 
 #: src/gtk/about.c:463
 msgctxt "iconv"
@@ -4496,7 +4498,7 @@ msgstr "adiciona suporte a livros de endereços do PalmOS\n"
 #: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
-msgstr "adiciona suporte a livros de endereços compartilhados via LDAP\n"
+msgstr "adiciona suporte a livros de endereços partilhados via LDAP\n"
 
 #: src/gtk/about.c:503
 msgctxt "libetpan"
@@ -4529,9 +4531,9 @@ msgid ""
 "under the terms of the GNU General Public License as published by the Free "
 "Software Foundation; either version 3, or (at your option) any later version."
 msgstr ""
-"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo "
-"de acordo com os termos da GNU General Public License tal qual publicada "
-"pela Free Software Foundation; tanto a versão 3, ou (opcionalmente) qualquer "
+"Este programa é um software livre; pode redistribuí-lo e/ou modificá-lo de "
+"acordo com os termos da GNU General Public License tal qual publicada pela "
+"Free Software Foundation; tanto a versão 3, ou (opcionalmente) qualquer "
 "versão posterior."
 
 #: src/gtk/about.c:583
@@ -4543,7 +4545,7 @@ msgid ""
 msgstr ""
 "Este programa é distribuido com na expectativa de ser útil, mas SEM NENHUMA "
 "GARANTIA; nem mesmo a garantia implícita de COMERCIALIDADE ou ADEQUAÇÃO PARA "
-"ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License para maiores "
+"ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License para mais "
 "detalhes."
 
 #: src/gtk/about.c:601
@@ -4551,8 +4553,8 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
 msgstr ""
-"Você deve ter recebido uma cópia da GNU General Public License juntamente "
-"com este programa. Caso contrário, veja "
+"Deve ter recebido uma cópia da GNU General Public License juntamente com "
+"este programa. Caso contrário, veja "
 
 #: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
@@ -4573,9 +4575,9 @@ msgid "Received messages: %d\n"
 msgstr "Mensagens recebidas: %d\n"
 
 #: src/gtk/about.c:764 src/main.c:2772
-#, fuzzy, c-format
+#, c-format
 msgid "Spam messages: %d\n"
-msgstr "Mensagens respondidas: %d\n"
+msgstr "Mensagens de spam: %d\n"
 
 #: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
@@ -4655,7 +4657,7 @@ msgstr "Verde"
 
 #: src/gtk/colorlabel.c:44 src/prefs_common.c:388
 msgid "Brown"
-msgstr "Marrom"
+msgstr "Castanho"
 
 #: src/gtk/colorlabel.c:45 src/prefs_common.c:392
 msgid "Grey"
@@ -4663,7 +4665,7 @@ msgstr "Cinza"
 
 #: src/gtk/colorlabel.c:46 src/prefs_common.c:396
 msgid "Light brown"
-msgstr "Marrom claro"
+msgstr "Castanho claro"
 
 #: src/gtk/colorlabel.c:47 src/prefs_common.c:400
 msgid "Dark red"
@@ -4747,8 +4749,8 @@ msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr ""
-"Pressione a tecla Control junto com Enter para\n"
-"o verificador aprender com o erro.\n"
+"Manter premida a tecla Control enquanto prime Enter\n"
+"irá aprender com o erro.\n"
 
 #: src/gtk/gtkaspell.c:1801 src/gtk/gtkaspell.c:1938
 msgid "More..."
@@ -4818,7 +4820,7 @@ msgstr ""
 
 #: src/gtk/gtkutils.c:1743
 msgid "Failed: no service record found."
-msgstr "Falha: não foi encontrado nenhum registro do serviço."
+msgstr "Falha: não foi encontrado nenhum registo do serviço."
 
 #: src/gtk/gtkutils.c:1746
 msgid "Failed: network error."
@@ -4831,7 +4833,7 @@ msgstr "Falha: erro desconhecido (%d)."
 
 #: src/gtk/gtkutils.c:1819
 msgid "Configuring..."
-msgstr "Configurando..."
+msgstr "A configurar..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
 #: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
@@ -4893,7 +4895,7 @@ msgstr "ID da Mensagem:"
 
 #: src/gtk/headers.h:17
 msgid "In-Reply-To"
-msgstr "Respondendo a"
+msgstr "Em resposta a"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
 #: src/prefs_matcher.c:2221 src/quote_fmt.c:59
@@ -5058,19 +5060,19 @@ msgstr "Destinatário da notificação de disposição:"
 
 #: src/gtk/headers.h:40
 msgid "Return-Receipt-To"
-msgstr "Destinatário da confirmação de recebimento"
+msgstr "Destinatário do recibo de leitura"
 
 #: src/gtk/headers.h:40
 msgid "Return-Receipt-To:"
-msgstr "Destinatário da confirmação de recebimento:"
+msgstr "Destinatário do recibo de leitura:"
 
 #: src/gtk/headers.h:41
 msgid "User-Agent"
-msgstr "Cliente de email do remetente"
+msgstr "Cliente de e-mail do remetente"
 
 #: src/gtk/headers.h:41
 msgid "User-Agent:"
-msgstr "Cliente de email do remetente:"
+msgstr "Cliente de e-mail do remetente:"
 
 #: src/gtk/headers.h:42
 msgid "Content-Type"
@@ -5178,11 +5180,11 @@ msgstr "Rótulo definido pelo utilizador:"
 
 #: src/gtk/headers.h:57
 msgid "X-Mailer"
-msgstr "Cliente de email do rementente"
+msgstr "Cliente de e-mail do remetente"
 
 #: src/gtk/headers.h:57
 msgid "X-Mailer:"
-msgstr "Cliente de email do rementente:"
+msgstr "Cliente de e-mail do remetente:"
 
 #: src/gtk/headers.h:58
 msgid "X-Status"
@@ -5274,7 +5276,7 @@ msgstr "Mensagem assinada digitalmente"
 
 #: src/gtk/icon_legend.c:77
 msgid "Encrypted message"
-msgstr "Mensagem criptografada"
+msgstr "Mensagem encriptada"
 
 #: src/gtk/icon_legend.c:78
 msgid "Message is signed and has attachment(s)"
@@ -5282,7 +5284,7 @@ msgstr "A mensagem está assinada e possui anexo(s)"
 
 #: src/gtk/icon_legend.c:79
 msgid "Message is encrypted and has attachment(s)"
-msgstr "A mensagem está criptografada e possui anexo(s)"
+msgstr "A mensagem está encriptada e possui anexo(s)"
 
 #: src/gtk/icon_legend.c:81
 msgid "Marked message"
@@ -5318,7 +5320,7 @@ msgstr "A pasta contém mensagens marcadas"
 
 #: src/gtk/icon_legend.c:91
 msgid "IMAP folder which contains subfolders only"
-msgstr "Pasta IMAP que contém somente sub-pastas"
+msgstr "Pasta IMAP que contém apenas sub-pastas"
 
 #: src/gtk/icon_legend.c:92
 msgid "IMAP mailbox showing only subscribed folders"
@@ -5332,7 +5334,7 @@ msgstr "Texto do ícone"
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
-"Os seguintes ícones são usados para mostrar o status das mensagens e pastas:"
+"Os seguintes ícones são usados para mostrar o estado das mensagens e pastas:"
 
 #: src/gtk/inputdialog.c:227 src/gtk/inputdialog.c:249
 #, c-format
@@ -5463,8 +5465,8 @@ msgstr "Descrição"
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
-"Para maiores informações sobre os plugins, dê uma olhada no %ssite web do "
-"Claws Mail%s."
+"Para mais informações sobre os plugins, dê uma olhada no %ssite web do Claws "
+"Mail%s."
 
 #: src/gtk/pluginwindow.c:419
 msgid "Click here to load one or more plugins"
@@ -5613,7 +5615,7 @@ msgstr "mensagens incompletas (que não foram recebidas integralmente)"
 
 #: src/gtk/quicksearch.c:436
 msgid "messages which you have replied to"
-msgstr "mensagens que você respondeu"
+msgstr "mensagens que respondeu"
 
 #: src/gtk/quicksearch.c:437
 msgid "read messages"
@@ -5792,7 +5794,7 @@ msgstr "Correto%s"
 #: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
 #: src/ssl_manager.c:304 src/ssl_manager.c:308
 msgid " (expired)"
-msgstr "(expirado)"
+msgstr " (expirado)"
 
 #: src/gtk/sslcertwindow.c:186
 msgid "Owner"
@@ -5842,8 +5844,8 @@ msgid ""
 "You may be connecting to a rogue server.\n"
 "\n"
 msgstr ""
-"O certificado é para  %s, mas a ligação é com %s.\n"
-"Você pode estar se conectando a um servidor hostil.\n"
+"O certificado é para %s, mas a ligação é com %s.\n"
+"Pode estar a ligar-se a um servidor hostil.\n"
 "\n"
 
 #: src/gtk/sslcertwindow.c:409
@@ -6169,7 +6171,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
+"Autenticações CRAM-MD5 apenas funcionam se a libetpan estiver compilada com "
 "suporte a SASL e o plugin CRAM-MD5 SASL instalado."
 
 #: src/imap.c:1011
@@ -6181,7 +6183,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações DIGEST-MD5 funcionam somente se a libetpan estiver compilada "
+"Autenticações DIGEST-MD5 apenas funcionam se a libetpan estiver compilada "
 "com suporte a SASL e o plugin DIGEST-MD5 SASL estiver instalado."
 
 #: src/imap.c:1017
@@ -6193,11 +6195,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
+"Autenticações SCRAM-SHA-1 apenas funcionam se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL estiver instalado."
 
 #: src/imap.c:1023
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -6206,11 +6207,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
+"Autenticações SCRAM-SHA-224 apenas funcionam se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL estiver instalado."
 
 #: src/imap.c:1029
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -6219,11 +6219,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
+"Autenticações SCRAM-SHA-256 apenas funcionam se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL estiver instalado."
 
 #: src/imap.c:1035
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -6232,11 +6231,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
+"Autenticações SCRAM-SHA-384 apenas funcionam se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL estiver instalado."
 
 #: src/imap.c:1041
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -6245,7 +6243,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações SCRAM-SHA-1 funcionam somente se a libetpan estiver compilada "
+"Autenticações SCRAM-SHA-512 apenas funcionam se a libetpan estiver compilada "
 "com suporte a SASL e o plugin SCRAM SASL estiver instalado."
 
 #: src/imap.c:1047
@@ -6257,7 +6255,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações PLAIN funcionam somente se a libetpan estiver compilada com "
+"Autenticações PLAIN apenas funcionam se a libetpan estiver compilada com "
 "suporte a SASL e o plugin PLAIN SASL estiver instalado."
 
 #: src/imap.c:1053
@@ -6269,7 +6267,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Autenticações LOGIN funcionam somente se a libetpan estiver compilada com "
+"Autenticações LOGIN apenas funcionam se a libetpan estiver compilada com "
 "suporte a SASL e o plugin LOGIN SASL estiver instalado."
 
 #: src/imap.c:1059
@@ -6280,7 +6278,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Erro no OAuth2. Verifique e corrija as configurações do OAuth2 da sua conta."
+"Erro no OAuth2. Verifique e corrija as preferências do OAuth2 da sua conta."
 
 #: src/imap.c:1065
 #, c-format
@@ -6300,17 +6298,17 @@ msgstr "Erro na ligação com %s"
 #: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
-msgstr "A ligação IMAP com %s foi interrompida. Reconectando...\n"
+msgstr "A ligação IMAP com %s foi interrompida. A restabelecer a ligação...\n"
 
 #: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
 #: src/imap.c:4736 src/imap.c:5547
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
-"O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
+"O Claws Mail necessita de acesso à rede para se ligar ao servidor IMAP."
 
 #: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
-msgstr "Conexão não-segura"
+msgstr "Ligação insegura"
 
 #: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
@@ -6323,7 +6321,7 @@ msgstr ""
 "Essa ligação está configurada para ser segura usando TLS, mas o TLS não está "
 "disponível nesta compilação do Claws Mail. \n"
 "\n"
-"Você quer continuar a ligação ao servidor? A comunicação não será segura."
+"Quer continuar a ligação ao servidor? A comunicação não será segura."
 
 #: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
@@ -6337,12 +6335,12 @@ msgstr "Conta '%s': Conectando ao servidor IMAP: %s:%d..."
 #: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
-msgstr "Não foi possível conectar com o servidor IMAP: %s:%d"
+msgstr "Não foi possível ligar com o servidor IMAP: %s:%d"
 
 #: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
-msgstr "Não foi possível conectar com o servidor IMAP: %s:%d\n"
+msgstr "Não foi possível ligar com o servidor IMAP: %s:%d\n"
 
 #: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
@@ -6356,15 +6354,15 @@ msgstr "Não foi possível autenticar-se no servidor IMAP %s.\n"
 #: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
-msgstr "Não foi possível conectar-se ao servidor IMAP %s."
+msgstr "Não foi possível ligar-se ao servidor IMAP %s."
 
 #: src/imap.c:1857
 msgid "Adding messages..."
-msgstr "Adicionando mensagens..."
+msgstr "A adicionar mensagens..."
 
 #: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
-msgstr "Copiando mensagens..."
+msgstr "A copiar mensagens..."
 
 #: src/imap.c:2588
 msgid "Search failed due to server error."
@@ -6411,7 +6409,7 @@ msgstr "Erro no comando LIST\n"
 
 #: src/imap.c:3968
 msgid "Flagging messages..."
-msgstr "Marcando as mensagens..."
+msgstr "A marcar as mensagens..."
 
 #: src/imap.c:4071
 #, c-format
@@ -6437,11 +6435,11 @@ msgstr ""
 
 #: src/imap.c:4246
 msgid "Server logins are disabled.\n"
-msgstr "As autenticações no servidor estão desabilitadas.\n"
+msgstr "As autenticações no servidor estão desativadas.\n"
 
 #: src/imap.c:4469
 msgid "Fetching message..."
-msgstr "Buscando a mensagem..."
+msgstr "A obter a mensagem..."
 
 #: src/imap.c:5170
 #, c-format
@@ -6455,11 +6453,10 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Você possui uma ou mais contas IMAP definidas. Entretanto, esta versão do "
-"Claws Mail foi compilada sem suporte ao IMAP; suas contas IMAP serão "
-"desabilitadas.\n"
+"Possui uma ou mais contas IMAP definidas. Entretanto, esta versão do Claws "
+"Mail foi compilada sem suporte ao IMAP; suas contas IMAP serão desativadas.\n"
 "\n"
-"Você provavelmente precisa instalar a libetpan e recompilar o Claws Mail."
+"Provavelmente precisa instalar a libetpan e recompilar o Claws Mail."
 
 #: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:60
 msgid "Create _new folder..."
@@ -6810,7 +6807,7 @@ msgstr "Registros importados:"
 
 #: src/importldif.c:889
 msgid "Import LDIF file into Address Book"
-msgstr "Incorporar o ficheiro LDIF ao Livro de Endereços"
+msgstr "Incorporar o ficheiro LDIF ao livro de endereços"
 
 #: src/importldif.c:927
 msgid "Proceed"
@@ -6826,7 +6823,7 @@ msgstr "Selecione o ficheiro do MUTT"
 
 #: src/importmutt.c:202
 msgid "Import MUTT file into Address Book"
-msgstr "Incorporar o ficheiro do MUTT ao Livro de Endereços"
+msgstr "Incorporar o ficheiro do MUTT ao livro de endereços"
 
 #: src/importmutt.c:290 src/importpine.c:290
 msgid "Please select a file to import."
@@ -6842,7 +6839,7 @@ msgstr "Selecione o ficheiro do Pine"
 
 #: src/importpine.c:201
 msgid "Import Pine file into Address Book"
-msgstr "Incorporar o ficheiro do Pine ao Livro de Endereços"
+msgstr "Incorporar o ficheiro do Pine ao livro de endereços"
 
 #: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
@@ -6921,38 +6918,38 @@ msgstr "Conta '%s': Conectando ao servidor POP3: %s:%d..."
 #: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
-msgstr "Não foi possível conectar ao servidor POP3: %s:%d"
+msgstr "Não foi possível ligar ao servidor POP3: %s:%d"
 
 #: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
-msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
+msgstr "Não foi possível ligar ao servidor POP3: %s:%d\n"
 
 #: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
 #: src/send_message.c:522
 msgid "Authenticating..."
-msgstr "Autenticando..."
+msgstr "A autenticar..."
 
 #: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
-msgstr "Recuperando mensagens de %s (%s)..."
+msgstr "A obter mensagens de %s (%s)..."
 
 #: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
-msgstr "Obtendo o número de novas mensagens (STAT)..."
+msgstr "A obter o número de novas mensagens (STAT)..."
 
 #: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
-msgstr "Obtendo o número de novas mensagens (LAST)..."
+msgstr "A obter o número de novas mensagens (LAST)..."
 
 #: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
-msgstr "Obtendo o número de novas mensagens (UIDL)..."
+msgstr "A obter o número de novas mensagens (UIDL)..."
 
 #: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
-msgstr "Obtendo o tamanho das mensagens (LIST)..."
+msgstr "A obter o tamanho das mensagens (LIST)..."
 
 #: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
@@ -6961,7 +6958,7 @@ msgstr "Saindo"
 #: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
-msgstr "Recuperando a mensagem (%d / %d) (%s / %s)"
+msgstr "A recuperar a mensagem (%d / %d) (%s / %s)"
 
 #: src/inc.c:1082
 #, c-format
@@ -6977,7 +6974,7 @@ msgstr "Ocorreu uma falha na ligação com %s:%d."
 
 #: src/inc.c:1242
 msgid "Error occurred while processing mail."
-msgstr "Ocorreu um erro durante o procestamento da mensagem."
+msgstr "Ocorreu um erro durante o processamento da mensagem."
 
 #: src/inc.c:1248
 #, c-format
@@ -6985,7 +6982,7 @@ msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
-"Ocorreu um erro durante o procestamento da mensagem:\n"
+"Ocorreu um erro durante o processamento da mensagem:\n"
 "%s"
 
 #: src/inc.c:1254
@@ -7045,8 +7042,8 @@ msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
-"O tempo da sessão está esgotado. Você pode recuperá-la aumentando o valor do "
-"tempo limite em Preferências/Outros/Miscelânea."
+"O tempo da sessão está esgotado. Pode recuperá-la aumentando o valor do "
+"tempo limite em Preferências/Outros/Diversos."
 
 #: src/inc.c:1306
 #, c-format
@@ -7080,12 +7077,12 @@ msgstr[1] "horas"
 #: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
-msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir por %d %s?"
+msgstr "%s%sEstá a trabalhar offline. Redefinir por %d %s?"
 
 #: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
-msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir?"
+msgstr "%s%sEstá a trabalhar offline. Redefinir?"
 
 #: src/inc.c:1677
 msgid "On_ly once"
@@ -7122,7 +7119,7 @@ msgstr "Erro no LDAP (pesquisa): %d (%s)\n"
 
 #: src/ldif.c:763
 msgid "Nick Name"
-msgstr "Apelido"
+msgstr "Alcunha"
 
 #: src/main.c:250
 #, c-format
@@ -7165,9 +7162,9 @@ msgid ""
 "a while if you have cached IMAP or News data, and will take some extra room "
 "on your disk."
 msgstr ""
-"Manter um backup permite que você retroceda a uma versão anterior, mas pode "
-"consumir um tempo se você tem dados de IMAP ou News no cache, além de ocupar "
-"um espaço extra no seu disco."
+"Manter um backup permite-lhe voltar a uma versão anterior, mas pode consumir "
+"um tempo se tem dados de IMAP ou News no cache, além de ocupar um espaço "
+"extra no seu disco."
 
 #: src/main.c:408
 msgid "Migration of configuration"
@@ -7175,7 +7172,7 @@ msgstr "Migração de configuração"
 
 #: src/main.c:419
 msgid "Copying configuration... This may take a while..."
-msgstr "Copiando a configuração... Isso pode demorar um pouco..."
+msgstr "A copiar a configuração... Isto pode demorar um pouco..."
 
 #: src/main.c:428
 msgid "Migration failed!"
@@ -7201,11 +7198,11 @@ msgid_plural ""
 "%s"
 msgstr[0] ""
 "Não foi possível carregar o plugin abaixo. Verifique a configuração dos "
-"plugins para maiores informações:\n"
+"plugins para mais informações:\n"
 "%s"
 msgstr[1] ""
 "Não foi possível carregar os plugins abaixo. Verifique a configuração dos "
-"plugins para maiores informações:\n"
+"plugins para mais informações:\n"
 "%s"
 
 #: src/main.c:1577
@@ -7243,16 +7240,16 @@ msgstr "Cabeçalho malformatado\n"
 
 #: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
-msgstr "Cabeçalho 'To:' duplicado\n"
+msgstr "Cabeçalho 'Para:' duplicado\n"
 
 #: src/main.c:1863
 msgid "Missing required 'To:' header\n"
-msgstr "Falta o cabeçalho 'To:' (e ele é necessário)\n"
+msgstr "Falta o cabeçalho 'Para:' (e ele é necessário)\n"
 
 #: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
-msgstr "%s. Tente -h ou --help para o uso.\n"
+msgstr "%s. Tente -h ou --help para o utilização.\n"
 
 #: src/main.c:1916 src/main.c:1979
 #, c-format
@@ -7316,7 +7313,7 @@ msgstr ""
 "                         entrada padrão;\n"
 "                         formato do conteúdo: cabeçalhos (To: é obrigatório) "
 "até uma\n"
-"                         linha em branco e o corpo do email até o fim do "
+"                         linha em branco e o corpo do e-mail até o fim do "
 "ficheiro."
 
 #: src/main.c:2073
@@ -7355,7 +7352,7 @@ msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
 #: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
-msgstr "  --cancel-receiving     cancela o recebimento de mensagens"
+msgstr "  --cancel-receiving     cancela a recepção de mensagens"
 
 #: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
@@ -7383,19 +7380,19 @@ msgstr ""
 
 #: src/main.c:2091
 msgid "  --send                 send all queued messages"
-msgstr "  --send                 envia todas as mensagens da Fila de Saída"
+msgstr "  --send                 envia todas as mensagens da fila de espera"
 
 #: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
-msgstr "  --status [pasta]...    mostra o número total de mensagens"
+msgstr "  --estado [pasta]...    mostra o número total de mensagens"
 
 #: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
-"  --status-full [pasta]...\n"
-"                         mostra o status de cada pasta"
+"  --estado-full [pasta]...\n"
+"                         mostra o estado de cada pasta"
 
 #: src/main.c:2095
 msgid "  --statistics           show session statistics"
@@ -7452,7 +7449,7 @@ msgstr ""
 
 #: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
-msgstr "  --config-dir           exibe o diretório de configurações"
+msgstr "  --config-dir           exibe o diretório de configuração"
 
 #: src/main.c:2108
 msgid ""
@@ -7460,7 +7457,7 @@ msgid ""
 "                         use specified configuration directory"
 msgstr ""
 "  --alternate-config-dir diretório\n"
-"                         usa o diretório de configurações especificado"
+"                         usa o diretório de configuração especificado"
 
 #: src/main.c:2110
 msgid ""
@@ -7493,7 +7490,7 @@ msgstr "Opção desconhecida %s"
 #: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
-msgstr "Procestando (%s)..."
+msgstr "A processar (%s)..."
 
 #: src/main.c:2201
 msgid "top level folder"
@@ -7501,12 +7498,12 @@ msgstr "pasta do nível mais acima"
 
 #: src/main.c:2283
 msgid "Queued messages"
-msgstr "Mensagens na Fila de Saída"
+msgstr "Mensagens na fila de espera"
 
 #: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
-"Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar "
+"Ainda existem mensagens da fila de espera que não foram enviadas. Finalizar "
 "agora?"
 
 #: src/main.c:3006
@@ -7779,11 +7776,11 @@ msgstr "_Cancelar a recepção"
 
 #: src/mainwindow.c:657
 msgid "_Send queued messages"
-msgstr "_Enviar mensagens da Fila de Saída"
+msgstr "_Enviar mensagens da fila de espera"
 
 #: src/mainwindow.c:662
 msgid "Compose a_n email message"
-msgstr "Escrever uma mensa_gem de email"
+msgstr "Escrever uma mensa_gem de e-mail"
 
 #: src/mainwindow.c:663
 msgid "Compose a news message"
@@ -7953,7 +7950,7 @@ msgstr "Adicionar remetente ao Li_vro de Endereços"
 
 #: src/mainwindow.c:739
 msgid "C_ollect addresses"
-msgstr "_Coletar endereços"
+msgstr "_Recolher endereços"
 
 #: src/mainwindow.c:740
 msgid "From current _folder..."
@@ -7973,7 +7970,7 @@ msgstr "Filtrar as mensagens _selecionadas"
 
 #: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
-msgstr "E_xecutar regras de procestamento da pasta"
+msgstr "E_xecutar regras de processamento da pasta"
 
 #: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
@@ -8006,7 +8003,7 @@ msgstr "Pelo _emissor"
 
 #: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
-msgstr "Criar re_gra de procestamento"
+msgstr "Criar re_gra de processamento"
 
 #: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
@@ -8082,11 +8079,11 @@ msgstr "_Preferências..."
 
 #: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
-msgstr "P_ré-procestamento..."
+msgstr "P_ré-processamento..."
 
 #: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
-msgstr "Pó_s-procestamento..."
+msgstr "Pó_s-processamento..."
 
 #: src/mainwindow.c:805
 msgid "_Filtering..."
@@ -8306,11 +8303,11 @@ msgstr "Relatório da rede"
 
 #: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
-msgstr "Relatório de depuração da filtragem/procestamento"
+msgstr "Relatório de depuração da filtragem/processamento"
 
 #: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
-msgstr "relatório de filtragem habilitado\n"
+msgstr "relatório de filtragem ativado\n"
 
 #: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
@@ -8371,7 +8368,7 @@ msgid ""
 "there."
 msgstr ""
 "Não foi possível criar a caixa postal.\n"
-"Talvez já existam ficheiros, ou você não possui permissão para escrita nesta "
+"Talvez já existam ficheiros, ou não possui permissão para escrita nesta "
 "pasta."
 
 #: src/mainwindow.c:3389
@@ -8422,7 +8419,7 @@ msgstr "Não foi encontrada nenhuma mensagem duplicada na pasta selecionada.\n"
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
-msgstr[0] "%d mensagem duplicada foi excluída na pasta selecionada.\n"
+msgstr[0] "%d mensagem duplicada foi eliminada na pasta selecionada.\n"
 msgstr[1] "%d mensagens duplicadas foram eliminadas na pasta selecionada.\n"
 
 #: src/mainwindow.c:4715
@@ -8443,7 +8440,7 @@ msgstr "Excluindo mensagens duplicadas em todas as pastas..."
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
-msgstr[0] "Foi excluída %d mensagem duplicada em %d pastas.\n"
+msgstr[0] "Foi eliminada %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram eliminadas %d mensagens duplicadas em %d pastas.\n"
 
 #: src/mainwindow.c:4764
@@ -8457,11 +8454,11 @@ msgstr "Selecione a pasta de destino"
 
 #: src/mainwindow.c:5029 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
-msgstr "Regras de procestamento a serem aplicadas antes das regras das pastas"
+msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
 #: src/mainwindow.c:5037
 msgid "Processing rules to apply after folder rules"
-msgstr "Regras de procestamento a serem aplicadas após as regras das pastas"
+msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
 #: src/mainwindow.c:5045 src/summaryview.c:5944
 msgid "Filtering configuration"
@@ -8482,19 +8479,19 @@ msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Não foi possível registrar como cliente padrão: impossível escrever no "
-"registro."
+"registo."
 
 #: src/mainwindow.c:5265 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
-msgstr "Vasculhando a pasta %s%c%s..."
+msgstr "A analisar a pasta %s%c%s..."
 
 #: src/mainwindow.c:5409
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d palavra-passe esquecida em %d contas.\n"
-msgstr[1] "%d palavra-passes esquecidas em %d contas.\n"
+msgstr[1] "%d palavras-passe esquecidas em %d contas.\n"
 
 #: 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:222 src/matcher.c:223
@@ -8551,7 +8548,7 @@ msgid ""
 "Could not stat mbox file:\n"
 "%s\n"
 msgstr ""
-"Não foi possível verificar o status do ficheiro mbox:\n"
+"Não foi possível verificar o estado do ficheiro mbox:\n"
 "%s\n"
 
 #: src/mbox.c:100
@@ -8580,7 +8577,7 @@ msgstr "O ficheiro já existe. Deseja sobrescrevê-lo?"
 
 #: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:600
 msgid "Overwrite"
-msgstr "Sobrescrever"
+msgstr "Substituir"
 
 #: src/mbox.c:558
 #, c-format
@@ -8661,7 +8658,7 @@ msgstr "_Não enviar"
 #: src/messageview.c:1372
 #, c-format
 msgid "Fetching message (%s)..."
-msgstr "Buscando a mensagem (%s)..."
+msgstr "A obter mensagem (%s)..."
 
 #: src/messageview.c:1408 src/procmime.c:1026
 #, c-format
@@ -8681,27 +8678,26 @@ msgstr "Exibir todos os %s."
 
 #: src/messageview.c:1883
 msgid "Only the first megabyte of text is shown."
-msgstr "É exibido somente o primeiro megabyte do texto."
+msgstr "É exibido apenas o primeiro megabyte do texto."
 
 #: src/messageview.c:1914
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
-"Você recebeu uma confirmação de recebimento nesta mensagem: ela foi exibida "
-"pelo recebedor."
+"Recebeu um recibo de leitura nesta mensagem: ela foi exibida pelo recebedor."
 
 #: src/messageview.c:1917
 msgid "You asked for a return receipt in this message."
-msgstr "Você solicitou uma confirmação de recebimento nesta mensagem."
+msgstr "Solicitou um recibo de leitura nesta mensagem."
 
 #: src/messageview.c:1923
 msgid "This message asks for a return receipt."
-msgstr "O remetente solicitou uma confirmação de recebimento."
+msgstr "O remetente solicitou um recibo de leitura."
 
 #: src/messageview.c:1924
 msgid "Send receipt"
-msgstr "Enviar a confirmação de recebimento"
+msgstr "Enviar o recibo de leitura"
 
 #: src/messageview.c:1967
 msgid ""
@@ -8709,7 +8705,7 @@ msgid ""
 "and has been deleted from the server."
 msgstr ""
 "Essa mensagem foi recebida parcialmente,\n"
-"e foi excluída no servidor."
+"e foi eliminada no servidor."
 
 #: src/messageview.c:1973
 #, c-format
@@ -8735,7 +8731,7 @@ msgid ""
 "it is %s and will be downloaded."
 msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
-"ela é %s e será baixada."
+"ela é %s e será descarregada."
 
 #: src/messageview.c:1988 src/messageview.c:2001
 #: src/prefs_filtering_action.c:174 src/toolbar.c:516
@@ -8749,7 +8745,7 @@ msgid ""
 "it is %s and will be deleted."
 msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
-"ela é %s e será excluída."
+"ela é %s e será eliminada."
 
 #: src/messageview.c:2071
 #, c-format
@@ -8760,18 +8756,18 @@ msgid ""
 "officially addressed to you.\n"
 "It is advised to not send the return receipt."
 msgstr ""
-"Essa mensagem está solicitando uma confirmação de recebimento\n"
+"Essa mensagem está a solicitar um recibo de leitura\n"
 "mas, de acordo com os cabeçalhos '%s' e '%s' ela não foi\n"
-"oficialmente endereçada à você.\n"
-"Não é aconselhável enviar a confirmação de recebimento."
+"oficialmente endereçada a si.\n"
+"Não é aconselhável enviar o recibo de leitura."
 
 #: src/messageview.c:2079 src/messageview.c:2086
 msgid "Return Receipt Notification"
-msgstr "Confirmação de recebimento"
+msgstr "Notificação de recibo de leitura"
 
 #: src/messageview.c:2080 src/messageview.c:2091
 msgid "_Send Notification"
-msgstr "_Enviar confirmação"
+msgstr "_Enviar notificação"
 
 #: src/messageview.c:2087
 msgid ""
@@ -8782,8 +8778,8 @@ msgid ""
 msgstr ""
 "Mais de uma das suas contas utiliza o endereço de destinatário desta "
 "mensagem.\n"
-"Por favor, selecione qual a conta que você deseja utilizar para enviar a "
-"confirmação de recebimento:"
+"Por favor, selecione qual a conta que deseja utilizar para enviar o recibo "
+"de leitura:"
 
 #: src/messageview.c:2183 src/messageview.c:2202
 msgid "Cannot print: the message doesn't contain text."
@@ -8803,7 +8799,7 @@ msgid ""
 "  Message has been deleted"
 msgstr ""
 "\n"
-"  A mensagem foi excluída"
+"  A mensagem foi eliminada"
 
 #: src/messageview.c:2967
 msgid ""
@@ -8811,7 +8807,7 @@ msgid ""
 "  Message has been deleted or moved to another folder"
 msgstr ""
 "\n"
-"  A mensagem foi excluída ou movida para outra pasta"
+"  A mensagem foi eliminada ou movida para outra pasta"
 
 #: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
 #: src/summaryview.c:7295
@@ -8820,11 +8816,11 @@ msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
 #: src/mh.c:528
 msgid "Moving messages..."
-msgstr "Movendo as mensagens..."
+msgstr "A mover as mensagens..."
 
 #: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:836
 msgid "Deleting messages..."
-msgstr "Excluindo mensagens..."
+msgstr "A eliminar mensagens..."
 
 #: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:68
 msgid "Remove _mailbox..."
@@ -8883,9 +8879,8 @@ msgid "Save _all..."
 msgstr "Guardar _tudo..."
 
 #: src/mimeview.c:236
-#, fuzzy
 msgid "Save all attachments..."
-msgstr "Remover anexos..."
+msgstr "Guardar todos os anexos..."
 
 #: src/mimeview.c:309
 msgid "MIME Type"
@@ -8894,7 +8889,7 @@ msgstr "Tipo MIME"
 #: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
 #: src/mimeview.c:1082
 msgid "View full information"
-msgstr "Exibir informações completas"
+msgstr "Exibir informação completa"
 
 #: src/mimeview.c:1089
 msgid "Check again"
@@ -8913,32 +8908,33 @@ msgstr "%s Clique no ícone ou pressione '%s' para verificá-la."
 #: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
-"Tempo esgotado durante a checagem da assinatura. Clique no ícone para tentar "
-"novamente."
+"Tempo esgotado durante a verificação da assinatura. Clique no ícone para "
+"tentar novamente."
 
 #: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
-"Tempo esgotado durante a checagem da assinatura. Clique no ícone ou "
+"Tempo esgotado durante a verificação da assinatura. Clique no ícone ou "
 "pressione '%s' para tentar novamente."
 
 #: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr ""
-"Erro durante a checagem da assinatura. Clique no ícone para tentar novamente."
+"Erro durante a verificação da assinatura. Clique no ícone para tentar "
+"novamente."
 
 #: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
-"Erro durante a checagem da assinatura. Clique no ícone ou pressione '%s' "
+"Erro durante a verificação da assinatura. Clique no ícone ou pressione '%s' "
 "para tentar novamente."
 
 #: src/mimeview.c:1241
 msgid "Checking signature..."
-msgstr "Verificando a assinatura..."
+msgstr "A verificar a assinatura..."
 
 #: src/mimeview.c:1296
 msgid "Go back to email"
@@ -8955,7 +8951,7 @@ msgstr ""
 #: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
-msgstr "Sobrescrever o ficheiro %s existente?"
+msgstr "Substituirr o ficheiro %s existente?"
 
 #: src/mimeview.c:1850
 #, c-format
@@ -8963,12 +8959,12 @@ msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
 "saving or ignore error and continue?"
 msgstr ""
-"Ocorreu um erro no guardadamento da parte %d da mensagem. Deseja cancelar a "
-"operação ou ignorar o erro e continuar?"
+"Ocorreu um erro ao guardar parte %d da mensagem. Deseja cancelar a operação "
+"ou ignorar o erro e continuar?"
 
 #: src/mimeview.c:1853
 msgid "Error saving message part"
-msgstr "Erro no guardadamento de parte da mensagem"
+msgstr "Erro ao guardar de parte da mensagem"
 
 #: src/mimeview.c:1854
 msgid "Ignore"
@@ -8982,15 +8978,15 @@ msgstr "Ignorar tudo"
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
-msgstr[0] "%d ficheiro foi salvo com sucesso."
-msgstr[1] "%d ficheiros foram salvos com sucesso."
+msgstr[0] "%d ficheiro foi guardado com sucesso."
+msgstr[1] "%d ficheiros foram guardados com sucesso."
 
 #: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
-msgstr[0] "%d ficheiro foi salvo com sucesso"
-msgstr[1] "%d ficheiros foram salvos com sucesso"
+msgstr[0] "%d ficheiro foi guardado com sucesso"
+msgstr[1] "%d ficheiros foram guardados com sucesso"
 
 #: src/mimeview.c:1883
 #, c-format
@@ -9112,7 +9108,7 @@ msgstr "Erro na autenticação com %s:%d...\n"
 #: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
-"O Claws Mail necessita de acesso à rede para se conectar ao servidor de News."
+"O Claws Mail necessita de acesso à rede para se ligar ao servidor de News."
 
 #: src/news.c:875
 #, c-format
@@ -9136,7 +9132,7 @@ msgstr "não foi possível obter xhdr\n"
 #: src/news.c:1247
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
-msgstr "obtendo xover %d - %d em %s...\n"
+msgstr "a obter xover %d - %d em %s...\n"
 
 #: src/news.c:1262
 msgid "couldn't get xover\n"
@@ -9153,28 +9149,28 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Você possui uma ou mais contas de Newsgroup definidas. Entretanto, esta "
-"versão do Claws Mail foi compilada sem suporte ao Newsgroup; suas contas de "
-"Newsgroup serão desabilitadas.\n"
+"Possui uma ou mais contas de Newsgroup definidas. Entretanto, esta versão do "
+"Claws Mail foi compilada sem suporte ao Newsgroup; suas contas de Newsgroup "
+"serão desativadas.\n"
 "\n"
-"Você provavelmente precisa instalar a libetpan e recompilar o Claws Mail."
+"Provavelmente precisa instalar a libetpan e recompilar o Claws Mail."
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
-msgstr "_Inscrever-se no Newsgroup..."
+msgstr "_Subscrever-se no Newsgroup..."
 
 #: src/news_gtk.c:57
 msgid "_Unsubscribe newsgroup"
-msgstr "_Cancelar a inscrição no Newsgroup"
+msgstr "_Cancelar a subscrição no Newsgroup"
 
 #: src/news_gtk.c:250
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
-msgstr "Deseja realmente cancelar a inscrição no Newsgroup '%s'?"
+msgstr "Deseja realmente cancelar a subscrição no Newsgroup '%s'?"
 
 #: src/news_gtk.c:251
 msgid "Unsubscribe newsgroup"
-msgstr "Cancelar a inscrição no Newsgroup"
+msgstr "Cancelar a subscrição no Newsgroup"
 
 #: src/news_gtk.c:294
 msgid "Rename newsgroup folder"
@@ -9230,7 +9226,7 @@ msgstr "O token de acesso ao OAuth2 ainda está válido\n"
 
 #: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
-msgstr "Obtendo token de acesso ao OAuth2 através do token de atualização\n"
+msgstr "A obter token de acesso ao OAuth2 através do token de atualização\n"
 
 #: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
@@ -9269,7 +9265,7 @@ msgstr "Palavra-passe primária incorreta."
 
 #: src/password_gtk.c:66
 msgid "New passphrases do not match, try again."
-msgstr "As novas palavra-passes não conferem, tente novamente."
+msgstr "As novas palavras-passe não conferem, tente novamente."
 
 #: src/password_gtk.c:79
 msgid "Incorrect old primary passphrase entered, try again."
@@ -9309,7 +9305,7 @@ msgid ""
 "You can get it from http://www.cakey.de/acerhk/"
 msgstr ""
 "Certifique-se de que o módulo do kernel 'acerhk' foi carregado.\n"
-"Você pode obtê-lo em http://www.cakey.de/acerhk/"
+"Pode obtê-lo em http://www.cakey.de/acerhk/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid ""
@@ -9317,7 +9313,7 @@ msgid ""
 "You can get it from http://code.google.com/p/aceracpi/"
 msgstr ""
 "Certifique-se de que o módulo do kernel 'acer_acpi' foi carregado.\n"
-"Você pode obtê-lo em http://code.google.com/p/aceracpi/"
+"Pode obtê-lo em http://code.google.com/p/aceracpi/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
@@ -9337,13 +9333,13 @@ msgid ""
 "You can get it from http://apanel.sourceforge.net/"
 msgstr ""
 "Certifique-se de que apanelc está instalado.\n"
-"Você pode obtê-lo em http://apanel.sourceforge.net/"
+"Pode obtê-lo em http://apanel.sourceforge.net/"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:210
 #: src/plugins/acpi_notifier/acpi_notifier.c:216
 #: src/plugins/acpi_notifier/acpi_notifier.c:418
 msgid "Control file doesn't exist."
-msgstr "O ficheiro de controle não existe."
+msgstr "O ficheiro de controlo não existe."
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:299
 msgid " : no new or unread mail"
@@ -9361,19 +9357,19 @@ msgstr " : mensagem nova"
 #: src/plugins/acpi_notifier/acpi_notifier.c:309
 #: src/plugins/acpi_notifier/acpi_notifier.c:315
 msgid "off"
-msgstr "apagado"
+msgstr "desligado"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:305
 #: src/plugins/acpi_notifier/acpi_notifier.c:311
 #: src/plugins/acpi_notifier/acpi_notifier.c:317
 msgid "blinking"
-msgstr "piscando"
+msgstr "intermitente"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:307
 #: src/plugins/acpi_notifier/acpi_notifier.c:313
 #: src/plugins/acpi_notifier/acpi_notifier.c:319
 msgid "on"
-msgstr "em"
+msgstr "ligado"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:340
 #: src/plugins/acpi_notifier/acpi_notifier.c:349
@@ -9418,8 +9414,8 @@ msgstr "Não foi possível registrar a checagem antes de enviar o gancho"
 #: src/plugins/address_keeper/address_keeper.c:292
 msgid "Keeps all recipient addresses in an addressbook folder."
 msgstr ""
-"Mantenha todos os endereços dos destinatários numa pasta do Livro de "
-"Endereços."
+"Mantenha todos os endereços dos destinatários numa pasta do livro de "
+"endereços."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
@@ -9437,7 +9433,7 @@ msgstr "Enviar para a pasta"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:124
 msgid "Address book path where addresses are kept"
-msgstr "Caminho no Livro de Endereços onde os endereços serão armazenados"
+msgstr "Caminho no livro de endereços onde os endereços serão armazenados"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:126
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
@@ -9473,7 +9469,7 @@ msgstr "Empacotador de mensagens"
 
 #: src/plugins/archive/archiver.c:56
 msgid "Create Archive..."
-msgstr "Criar pacote..."
+msgstr "Criar arquivo..."
 
 #: src/plugins/archive/archiver.c:123
 #, c-format
@@ -9504,7 +9500,7 @@ msgstr ""
 "Ativa a seleção de uma pasta de mensagens que deseja arquivar, a seleção de "
 "um nome, formato e localização para o arquivo. Subpastas podem ser incluídas "
 "e somas de verificação MD5 podem ser adicionadas para cada ficheiro no "
-"pacote. Existem várias opções de arquivamento.\n"
+"arquivo. Existem várias opções de arquivamento.\n"
 "\n"
 "O arquivo pode ser armazenado como:\n"
 "%s\n"
@@ -9530,11 +9526,11 @@ msgstr "Empacotando"
 
 #: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
-msgstr "Pressione o botão Cancelar para interromper o empacotamento"
+msgstr "Pressione o botão Cancelar para interromper o arquivamento"
 
 #: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
-msgstr "Empacotando:"
+msgstr "Arquivamento:"
 
 #: src/plugins/archive/archiver_gtk.c:527
 #, c-format
@@ -9591,7 +9587,7 @@ msgstr "%s: erro desconhecido. Não é possível continuar"
 #: src/plugins/archive/archiver_gtk.c:574
 #: src/plugins/archive/archiver_gtk.c:621
 msgid "Creating archive"
-msgstr "Criando o pacote"
+msgstr "A criar arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:587
 #, c-format
@@ -9632,12 +9628,12 @@ msgid ""
 "Archive creation error:\n"
 "%s"
 msgstr ""
-"Erro na criação do pacote:\n"
+"Erro na criação do arquivo:\n"
 "%s"
 
 #: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
-msgstr "Resultado do pacote"
+msgstr "Resultado do arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
@@ -9649,7 +9645,7 @@ msgstr "Pacote"
 
 #: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
-msgstr "Formato do pacote"
+msgstr "Formato do arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
@@ -9661,7 +9657,7 @@ msgstr "Número de ficheiros"
 
 #: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
-msgstr "Tamanho do pacote"
+msgstr "Tamanho do arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
@@ -9707,13 +9703,13 @@ msgstr "Selecionar mensagens anteriores a"
 
 #: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
-msgstr "Selecione a pasta para o pacote"
+msgstr "Selecione a pasta para o arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:941
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
-"Selecione o nome de ficheiro para o pacote [o sufixo deve indicar o tipo de "
-"pacote, ex. .tgz]"
+"Selecione o nome de ficheiro para o arquivo [o sufixo deve indicar o tipo de "
+"arquivo, ex. .tgz]"
 
 #: src/plugins/archive/archiver_gtk.c:987
 #, c-format
@@ -9722,7 +9718,7 @@ msgstr "%ld de %ld"
 
 #: src/plugins/archive/archiver_gtk.c:1040
 msgid "Create Archive"
-msgstr "Criar pacote"
+msgstr "Criar arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1055
 msgid "Enter Archiver arguments"
@@ -9730,23 +9726,23 @@ msgstr "Introduza os argumentos para o empacotador"
 
 #: src/plugins/archive/archiver_gtk.c:1069
 msgid "Folder to archive"
-msgstr "Pasta para o pacote"
+msgstr "Pasta para o arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1076
 msgid "Folder which is the root of the archive"
-msgstr "Pasta onde está a raiz do pacote"
+msgstr "Pasta onde está a raiz do arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1081
 msgid "Click this button to select a folder which is to be root of the archive"
-msgstr "Clique neste botão para selecionar a pasta que será a raiz do pacote"
+msgstr "Clique neste botão para selecionar a pasta que será a raiz do arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1087
 msgid "Name for archive"
-msgstr "Nome para o pacote"
+msgstr "Nome para o arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1093
 msgid "Archive location and name"
-msgstr "Localização e nome do pacote"
+msgstr "Localização e nome do arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
@@ -9756,7 +9752,7 @@ msgstr "_Selecionar"
 
 #: src/plugins/archive/archiver_gtk.c:1098
 msgid "Click this button to select a name and location for the archive"
-msgstr "Clique neste botão para selecionar o nome a localização para o pacote"
+msgstr "Clique neste botão para selecionar o nome a localização para o arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1100
 msgid "Choose compression"
@@ -9775,7 +9771,7 @@ msgstr "Escolha a compressão"
 #: src/plugins/archive/archiver_gtk.c:1180
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
-msgstr "Selecione esta opção para aplicar a compressão %s ao pacote"
+msgstr "Selecione esta opção para aplicar a compressão %s ao arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1229
 msgid "Choose format"
@@ -9787,7 +9783,7 @@ msgstr "Escolha o formato"
 #: src/plugins/archive/archiver_gtk.c:1259
 #, c-format
 msgid "Choose this to use %s as format for the archive"
-msgstr "Selecione esta opção para usar %s como formato do pacote"
+msgstr "Selecione esta opção para usar %s como formato do arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1279
 msgid "Miscellaneous options"
@@ -9799,7 +9795,7 @@ msgstr "_Recursivo"
 
 #: src/plugins/archive/archiver_gtk.c:1292
 msgid "Choose this option to include subfolders in the archive"
-msgstr "Selecione esta opção para incluir as subpastas no pacote"
+msgstr "Selecione esta opção para incluir as subpastas no arquivo"
 
 #: src/plugins/archive/archiver_gtk.c:1294
 msgid "_MD5sum"
@@ -9857,8 +9853,7 @@ msgstr "Pasta de guardadamento padrão"
 #: src/plugins/archive/archiver_prefs.c:228
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
-"Clique neste botão para selecionar a localização padrão para guardadamento "
-"de pacotes"
+"Clique neste botão para selecionar a localização padrão para guardar arquivos"
 
 #: src/plugins/archive/archiver_prefs.c:237
 msgid "Default compression"
@@ -9897,7 +9892,7 @@ msgstr "Padrões para outras opções"
 
 #: src/plugins/archive/archiver_prefs.c:417
 msgid "Choose this option to include subfolders in the archives by default"
-msgstr "Selecione esta opção para incluir as subpastas no pacote como padrão"
+msgstr "Selecione esta opção para incluir as subpastas no arquivo como padrão"
 
 #: src/plugins/archive/archiver_prefs.c:418
 msgid "MD5sum"
@@ -9911,8 +9906,8 @@ msgid ""
 "will take to create the archives"
 msgstr ""
 "Selecione esta opção para adicionar, como padrão, checksums MD5 a\n"
-"cada ficheiro do pacote. Saiba, entretanto, que isso aumentará \n"
-"significativamente o tempo de criação do pacote"
+"cada ficheiro do arquivo. Saiba, entretanto, que isso aumentará \n"
+"significativamente o tempo de criação dos arquivos"
 
 #: src/plugins/archive/archiver_prefs.c:424
 msgid "Rename"
@@ -10005,9 +10000,8 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Um anexo foi mencionado na mensagem que você está enviando, mas nenhum "
-"ficheiro foi anexado. A menção aparece na linha %d, que começa com o texto: "
-"%s\n"
+"Um anexo foi mencionado na mensagem que está a enviar, mas nenhum ficheiro "
+"foi anexado. A menção aparece na linha %d, que começa com o texto: %s\n"
 "\n"
 "%s"
 
@@ -10159,7 +10153,7 @@ msgstr "Bogofilter: aprendendo com a mensagem..."
 #: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
-msgstr "Erro no aprendizado; `%s` retornou o status %d."
+msgstr "Erro no aprendizado; `%s` retornou o estado %d."
 
 #: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
@@ -10287,13 +10281,13 @@ msgstr "Inserir cabeçalho X-Bogosity"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:246
 msgid "Only done for messages in MH folders"
-msgstr "Efetuado somente em mensagens nas pastas MH"
+msgstr "Efetuado apenas em mensagens nas pastas MH"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:190
 #: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Whitelist senders found in address book/folder"
-msgstr "Remetentes da lista limpa presentes no Livro de Endereços/pasta"
+msgstr "Remetentes da lista limpa presentes no livro de endereços/pasta"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:194
@@ -10302,7 +10296,7 @@ msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgstr ""
-"Mensagens oriundas de contatos do seu Livro de Endereços serão recebidas na "
+"Mensagens oriundas de contatos do seu livro de endereços serão recebidas na "
 "pasta normal, mesmo se forem identificadas como spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
@@ -10310,13 +10304,13 @@ msgstr ""
 #: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
-"Clique neste botão para selecionar um livro ou uma pasta no Livro de "
-"Endereços"
+"Clique neste botão para selecionar um livro ou uma pasta no livro de "
+"endereços"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:206
 msgid "Learn whitelisted emails as ham"
-msgstr "Aprender os emails da lista limpa como não-spam"
+msgstr "Aprender os e-mails da lista limpa como não-spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:270
 msgid ""
@@ -10416,7 +10410,7 @@ msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
 msgstr ""
-"Se o Bsfilter identificar um email como spam ou incerto, mas ele estiver na "
+"Se o Bsfilter identificar um e-mail como spam ou incerto, mas ele estiver na "
 "lista limpa, será interpretado como não-spam."
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:217
@@ -10525,7 +10519,7 @@ msgstr ""
 "recebidas de uma conta IMAP, LOCAL ou POP.\n"
 "\n"
 "Quando um vírus é encontrado no anexo de alguma mensagem, ele pode ser "
-"excluído ou salvo numa pasta específica\n"
+"excluído ou guardado numa pasta específica\n"
 "\n"
 "Uma vez que este plugin comunica-se com o Clamd através\n"
 "de um soquete Unix, existem alguns requisitos mínimos para\n"
@@ -10533,9 +10527,9 @@ msgstr ""
 "os utilizadors devem ter, no mínimo, permissão de execução\n"
 "nestas pastas.\n"
 "\n"
-"Para evitar alterações nas permissões, você pode configurar\n"
+"Para evitar alterações nas permissões, pode configurar\n"
 "o clamav-daemon para se comunicar através de um soquete\n"
-"TCP e selecionar as configurações manuais para o clamd.\n"
+"TCP e selecionar a configuração manual para o clamd.\n"
 "\n"
 "As opções podem ser encontradas em /Configuração/Preferências/Plugins/Clam "
 "AntiVirus"
@@ -10717,7 +10711,7 @@ msgid ""
 "\n"
 "It is not really useful."
 msgstr ""
-"Este plugin é somente uma demonstração de como escrever plugins para o Claws "
+"Este plugin é apenas uma demonstração de como escrever plugins para o Claws "
 "Mail. Ele instala um gancho para uma saída nova de relatório e a escreve na "
 "stdout.\n"
 "\n"
@@ -10757,7 +10751,7 @@ msgstr "Renderizar objetos incorporados usando plugins"
 
 #: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
-msgstr "Abrir no visualizador (conteúdo remoto está habilitado)"
+msgstr "Abrir no visualizador (conteúdo remoto está ativado)"
 
 #: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
@@ -10777,9 +10771,9 @@ msgid ""
 "in the email."
 msgstr ""
 "Carregar recursos remotos pode gerar alguns problemas de privacidade.\n"
-"Quando a carga de conteúdo remoto está desabilitada, nada é solicitado\n"
+"Quando a carga de conteúdo remoto está desativada, nada é solicitado\n"
 "à rede. A renderização de imagens, scripts, objetos de plugin ou applets\n"
-"Java ainda podem estar habilitados para os conteúdos anexados ao email."
+"Java ainda podem estar ativados para os conteúdos anexados ao e-mail."
 
 #: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
@@ -10812,7 +10806,7 @@ msgstr "Selecione a folha de estilos"
 
 #: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
-msgstr "A recuperação de conteúdo remoto está desabilitada."
+msgstr "A recuperação de conteúdo remoto está desativada."
 
 #: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
@@ -10996,8 +10990,8 @@ msgid ""
 "Adds the X-FETCH-TIME header with the date and time of message retrieval in "
 "RFC822 format"
 msgstr ""
-"Adiciona o cabeçalho X-FETCH-TIME com a data e hora do recebimento da "
-"mensagemno formato RFC822"
+"Adiciona o cabeçalho X-FETCH-TIME com a data e hora da recepção da mensagem "
+"no formato RFC822"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
@@ -11013,13 +11007,13 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
-"Você deve autorizar o Claws Mail a acestar sua lista de contatos da Google "
-"para usar o plugin GData.\n"
+"Deve autorizar o Claws Mail a acessar a sua lista de contatos da Google para "
+"usar o plugin GData.\n"
 "\n"
 "Visite a página de autorização da Google pressionando o botão abaixo. Após a "
-"confirmação da autorização, você receberá um código de autorização. "
-"Introduza este código no campo abaixo para garantir ao Claws Mail o acesso à "
-"sua lista de contatos da Google."
+"confirmação da autorização, receberá um código de autorização. Introduza "
+"este código no campo abaixo para garantir ao Claws Mail o acesso à sua lista "
+"de contactos da Google."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:147
 msgid "Step 1:"
@@ -11268,12 +11262,12 @@ msgstr ""
 "http://www.libravatar.org/. Caso o perfil existe no gravatar.com,\n"
 "mas não no libravatar, suas imagens também podem ser\n"
 "recuperadas (quando os redirecionamentos estiverem ativados\n"
-"nas configurações do plugin). A página de configuração do\n"
+"na configuração do plugin). A página de configuração do\n"
 "plugin está disponível a partir da janela principal em:\n"
 "/Configuração/Preferências/Plugins/Libravatar.\n"
 "Este plugin usa a libcurl para recuperar as imagens, por isso,\n"
 "caso sua ligação passe por um proxy, por favor verifique o\n"
-"manual digital do curl(1) para maiores detalhes na configuração\n"
+"manual digital do curl(1) para mais detalhes na configuração\n"
 "do 'http_proxy'. Mais informações sobre esta e outras questões\n"
 "podem ser obtidas no ficheiro README.\n"
 "\n"
@@ -11434,9 +11428,9 @@ 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 ""
-"Introduza a URL para a qual você deve ser direcionado caso não exista um "
-"ícone de utilizador disponível. Deixe em branco para usar o ícone laranja "
-"padrão da libravatar."
+"Introduza a URL para a qual deve ser direcionado caso não exista um ícone de "
+"utilizador disponível. Deixe em branco para usar o ícone laranja padrão da "
+"libravatar."
 
 #: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
@@ -11481,7 +11475,7 @@ msgstr "Cache de ícone"
 
 #: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
-msgstr "Modo de ícone faltante padrão"
+msgstr "Modo de ícone em falta padrão"
 
 #: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
@@ -11494,7 +11488,7 @@ msgid ""
 "from the network."
 msgstr ""
 "Carregar recursos remotos pode gerar alguns problemas de privacidade.\n"
-"Quando a carga de conteúdo remoto está desabilitada, nada é solicitado\n"
+"Quando a carga de conteúdo remoto está desativada, nada é solicitado\n"
 "à rede."
 
 #: src/plugins/litehtml_viewer/lh_prefs.c:134
@@ -11522,7 +11516,7 @@ msgid ""
 "Viewer plugin for HTML emails, using the litehtml library (http://www."
 "litehtml.com/)."
 msgstr ""
-"Plugin de visualização de emails em HTML, usando a biblioteca litehtml "
+"Plugin de visualização de e-mails em HTML, usando a biblioteca litehtml "
 "(http://www.litehtml.com/)."
 
 #: src/plugins/mailmbox/plugin.c:57
@@ -11644,7 +11638,7 @@ msgstr "_Reverter"
 
 #: src/plugins/managesieve/sieve_editor.c:354
 msgid "Script saved successfully."
-msgstr "O script foi salvo com sucesso."
+msgstr "O script foi guardado com sucesso."
 
 #: src/plugins/managesieve/sieve_editor.c:371
 msgid "Saving..."
@@ -11700,7 +11694,7 @@ msgstr "Uma conta só pode ter um script ativo de cada vez."
 
 #: src/plugins/managesieve/sieve_manager.c:581
 msgid "Unable to connect"
-msgstr "Não foi possível conectar"
+msgstr "Não foi possível ligar"
 
 #: src/plugins/managesieve/sieve_manager.c:628
 msgid "Listing scripts..."
@@ -11712,7 +11706,7 @@ msgstr "Conectando..."
 
 #: src/plugins/managesieve/sieve_manager.c:663
 msgid "Manage Sieve Filters"
-msgstr "Gerenciar filtros Sieve"
+msgstr "Gerir filtros Sieve"
 
 #: src/plugins/managesieve/sieve_manager.c:772
 msgid "_Rename"
@@ -11750,8 +11744,7 @@ msgstr "Nome do servidor"
 
 #: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
-msgstr ""
-"Conectar neste endereço ao invés do utilizado no recebimento de mensagens"
+msgstr "Conectar neste endereço ao invés do utilizado no recepção de mensagens"
 
 #: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
@@ -11784,7 +11777,7 @@ msgstr "Sem autenticação"
 
 #: src/plugins/managesieve/sieve_prefs.c:204
 msgid "Use same authentication as for receiving mail"
-msgstr "Usar a mesma autenticação do recebimento de mensagens"
+msgstr "Usar a mesma autenticação da recepção de mensagens"
 
 #: src/plugins/managesieve/sieve_prefs.c:206
 msgid "Specify authentication"
@@ -11852,7 +11845,7 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
-"Este plugin escreve um sumário do cabeçalho de cada email recebido, após "
+"Este plugin escreve um sumário do cabeçalho de cada e-mail recebido, após "
 "ordená-los, num ficheiro de relatório\n"
 "\n"
 "O padrão é ~/Mail/NewLog\n"
@@ -11960,7 +11953,7 @@ msgstr "Várias ferramentas"
 
 #: src/plugins/notification/notification_popup.c:311
 msgid "New Mail message"
-msgstr "Nova mensagem de email"
+msgstr "Nova mensagem de e-mail"
 
 #: src/plugins/notification/notification_popup.c:332
 msgid "New News post"
@@ -12003,7 +11996,7 @@ msgstr "Abrir a janela principal"
 
 #: src/plugins/notification/notification_popup.c:488
 msgid "Mail message"
-msgstr "Mensagem de email"
+msgstr "Mensagem de e-mail"
 
 #: src/plugins/notification/notification_popup.c:489
 #: src/plugins/notification/notification_popup.c:495
@@ -12082,7 +12075,7 @@ msgstr "Incluir os tipos de pasta"
 
 #: src/plugins/notification/notification_prefs.c:620
 msgid "Mail folders"
-msgstr "Pastas de email"
+msgstr "Pastas de e-mail"
 
 #: src/plugins/notification/notification_prefs.c:628
 msgid "News folders"
@@ -12099,7 +12092,7 @@ msgstr "Pastas do vCalendar"
 #: src/plugins/notification/notification_prefs.c:652
 msgid "These settings override folder-specific selections."
 msgstr ""
-"Essas configurações têm prioridade sobre as seleções especificas das pastas."
+"Estas definições têm prioridade sobre as seleções especificas das pastas."
 
 #: src/plugins/notification/notification_prefs.c:663
 msgid "Global notification settings"
@@ -12349,7 +12342,7 @@ msgstr "E-mail da _conta"
 
 #: src/plugins/notification/notification_trayicon.c:126
 msgid "Open A_ddressbook"
-msgstr "Abrir o _Livro de Endereços"
+msgstr "Abrir o _livro de endereços"
 
 #: src/plugins/notification/notification_trayicon.c:127
 msgid "E_xit Claws Mail"
@@ -12370,7 +12363,7 @@ msgstr "%d nova(s), %d não lida(s), %d no total"
 
 #: src/plugins/notification/notification_trayicon.c:856
 msgid "New mail message"
-msgstr "Nova mensagem de email"
+msgstr "Nova mensagem de e-mail"
 
 #: src/plugins/notification/notification_trayicon.c:858
 msgid "New news post"
@@ -12560,9 +12553,9 @@ msgid ""
 "%s"
 msgstr ""
 "Atenção; não foi possível encontrar o binário do ghostscript (gs) necessário "
-"para o plugin %s procestar anexos PostScript. Assim, somente anexos PDf "
-"serão exibidos. Para habilitar o suporte ao PostScript, por favor instale o "
-"programa gs.\n"
+"para o plugin %s processar anexos PostScript. Assim, apenas anexos PDf serão "
+"exibidos. Para ativar o suporte ao PostScript, por favor instale o programa "
+"gs.\n"
 "\n"
 "%s"
 
@@ -12578,7 +12571,7 @@ msgstr ""
 
 #: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:147
 msgid "Passphrase"
-msgstr "Frase-palavra-passe"
+msgstr "Frase-passe"
 
 #: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
@@ -12586,7 +12579,7 @@ msgstr "[sem id do utilizador]"
 
 #: src/plugins/pgpcore/passphrase.c:260
 msgid "Passphrases did not match.\n"
-msgstr "As palavra-passes não conferem.\n"
+msgstr "As palavras-passe não coincidem.\n"
 
 #: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
@@ -12644,7 +12637,7 @@ msgid ""
 "when working online,\n"
 "   or "
 msgstr ""
-"quando estiver trabalhando conectado,\n"
+"quando estiver a trabalhar offline,\n"
 "   ou "
 
 #: src/plugins/pgpcore/pgp_viewer.c:194
@@ -12679,7 +12672,7 @@ msgstr "   Servidores de chaves algumas vezes são lentos.\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:284
 msgid "   You can try to import it manually with the command:"
-msgstr "   Você pode tentar importá-la manualmente usando o comando:"
+msgstr "   Pode tentar importá-la manualmente usando o comando:"
 
 #: src/plugins/pgpcore/pgp_viewer.c:288
 msgid "or"
@@ -12730,7 +12723,7 @@ msgstr "Usar o chaveiro para complementação automática de endereço"
 
 #: src/plugins/pgpcore/prefs_gpg.c:150
 msgid "Use gpg-agent to manage passwords"
-msgstr "Usar o gpg-agent para gerenciar palavra-passes"
+msgstr "Usar o gpg-agent para gerir palavras-passe"
 
 #: src/plugins/pgpcore/prefs_gpg.c:155
 msgid "Store passphrase in memory"
@@ -12758,7 +12751,7 @@ msgstr "Capturar a entrada ao informar palavra-passe"
 
 #: src/plugins/pgpcore/prefs_gpg.c:199
 msgid "Display warning on start-up if GnuPG doesn't work"
-msgstr "Exibir advertência, ao iniciar, se o GnuPG não estiver funcionando"
+msgstr "Exibir advertência, ao iniciar, se o GnuPG não estiver a funcionar"
 
 #: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
@@ -12786,7 +12779,7 @@ msgstr "Utilizar chave padrão do GnuPG"
 
 #: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
-msgstr "Selecionar chave pelo seu endereço de email"
+msgstr "Selecionar chave pelo seu endereço de e-mail"
 
 #: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
@@ -12870,7 +12863,7 @@ msgstr "Informe outro utilizador ou ID da chave:"
 #: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
-msgstr "Criptografar como %s <%s>"
+msgstr "Encriptar como %s <%s>"
 
 #: src/plugins/pgpcore/select-keys.c:703
 #, c-format
@@ -12885,11 +12878,11 @@ msgid ""
 msgstr ""
 "A chave de encriptação não é inteiramente confiável.\n"
 "Se escolher encriptar a mensagem com esta chave, não é\n"
-"possível garantir que ela irá para pessoa que  está deseja.\n"
+"possível garantir que ela irá para pessoa que deseja.\n"
 "\n"
 "Detalhes da chave: ID %s, identidade primária %s <%s>\n"
 "\n"
-"Você confia nesta chave o suficiente para utilizá-la mesmo assim?"
+"Confia nesta chave o suficiente para utilizá-la mesmo assim?"
 
 #: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:281 src/privacy.c:286
 msgid "No signature found"
@@ -12964,7 +12957,7 @@ msgstr "A assinatura não foi verificada"
 
 #: src/plugins/pgpcore/sgpgme.c:516
 msgid "Error checking signature: no status\n"
-msgstr "Ocorreu um erro na verificação da assinatura: sem status\n"
+msgstr "Ocorreu um erro na verificação da assinatura: sem estado\n"
 
 #: src/plugins/pgpcore/sgpgme.c:535
 #, c-format
@@ -13105,7 +13098,7 @@ msgid ""
 "Do you want to create a new key pair now?"
 msgstr ""
 "O Claws Mail não encontrou nenhuma chave PGP secreta, o que significa que "
-"você não poderá assinar suas mensagens ou receber emails criptografados.\n"
+"não poderá assinar suas mensagens ou receber e-mails encriptados.\n"
 "Deseja criar um novo par de chaves agora?"
 
 #: src/plugins/pgpcore/sgpgme.c:1173 src/plugins/pgpcore/sgpgme.c:1195
@@ -13118,8 +13111,8 @@ msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
-"Gerando seu novo par de chaves... Por favor, movimente o mouse "
-"aleatoriamente para ajudar a gerar entropia..."
+"Gerando seu novo par de chaves... Por favor, movimente o rato aleatoriamente "
+"para ajudar a gerar entropia..."
 
 #: src/plugins/pgpcore/sgpgme.c:1201
 msgid "Couldn't generate a new key pair: unknown error"
@@ -13161,7 +13154,7 @@ msgstr "Não foi possível obter os dados do texto."
 #: src/plugins/pgpinline/pgpinline.c:423 src/plugins/pgpmime/pgpmime.c:262
 #, c-format
 msgid "Couldn't open decrypted file %s"
-msgstr "Não foi possível abrir o ficheiro descriptografado %s"
+msgstr "Não foi possível abrir o ficheiro desencriptado %s"
 
 #: src/plugins/pgpinline/pgpinline.c:442 src/plugins/pgpinline/pgpinline.c:451
 #: src/plugins/pgpinline/pgpinline.c:460 src/plugins/pgpinline/pgpinline.c:468
@@ -13169,7 +13162,7 @@ msgstr "Não foi possível abrir o ficheiro descriptografado %s"
 #: src/plugins/pgpmime/pgpmime.c:274 src/plugins/pgpmime/pgpmime.c:289
 #, c-format
 msgid "Couldn't write to decrypted file %s"
-msgstr "Não foi possível escrever no ficheiro descriptografado %s"
+msgstr "Não foi possível escrever no ficheiro desencriptado %s"
 
 #: src/plugins/pgpinline/pgpinline.c:456 src/plugins/pgpinline/pgpinline.c:457
 #: src/plugins/pgpinline/pgpinline.c:458
@@ -13178,25 +13171,25 @@ msgid ""
 "--- Start of PGP/Inline encrypted data ---\n"
 msgstr ""
 "\n"
-"--- Início dos dados criptografados via PGP/Inline ---\n"
+"--- Início dos dados encriptados via PGP/Inline ---\n"
 
 #: src/plugins/pgpinline/pgpinline.c:474 src/plugins/pgpinline/pgpinline.c:475
 #: src/plugins/pgpinline/pgpinline.c:476
 msgid "--- End of PGP/Inline encrypted data ---\n"
-msgstr "--- Fim dos dados criptografados via PGP/Inline ---\n"
+msgstr "--- Fim dos dados encriptados via PGP/Inline ---\n"
 
 #: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpmime/pgpmime.c:302
 #, c-format
 msgid "Couldn't close decrypted file %s"
-msgstr "Não foi possível fechar o ficheiro descriptografado %s"
+msgstr "Não foi possível fechar o ficheiro desencriptado %s"
 
 #: src/plugins/pgpinline/pgpinline.c:509
 msgid "Couldn't scan decrypted file."
-msgstr "Não foi possível examinar o ficheiro descriptografado."
+msgstr "Não foi possível examinar o ficheiro desencriptado."
 
 #: src/plugins/pgpinline/pgpinline.c:518
 msgid "Couldn't scan decrypted file parts."
-msgstr "Não foi possível examinar as partes do ficheiro descriptografado."
+msgstr "Não foi possível examinar as partes do ficheiro desencriptado."
 
 #: src/plugins/pgpinline/pgpinline.c:575 src/plugins/pgpinline/pgpinline.c:770
 msgid "Malformed message"
@@ -13239,8 +13232,8 @@ msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
 msgstr ""
-"Por favor, perceba que os anexos e os cabeçalhos do email (como o Assunto) "
-"não são criptografados pelo sistema PGP/Inline."
+"Por favor, perceba que os anexos e os cabeçalhos do e-mail (como o Assunto) "
+"não são encriptados pelo sistema PGP/Inline."
 
 #: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:580
 #, c-format
@@ -13275,8 +13268,8 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
 "Este plugin manipula o ultrapassado método inline de assinatura e/ou "
-"encriptação de mensagens. Você pode desencriptar mensagens, verificar "
-"assinaturas ou assinar e encriptar suas próprias mensagens.\n"
+"encriptação de mensagens. Pode desencriptar mensagens, verificar assinaturas "
+"ou assinar e encriptar suas próprias mensagens.\n"
 "\n"
 "Ele pode ser selecionado como Sistema de Privacidade Padrão em /Configuração/"
 "[Preferências da conta]/Privacidade e ao escrever uma mensagem em /Opções/"
@@ -13288,11 +13281,11 @@ msgstr ""
 
 #: src/plugins/pgpmime/pgpmime.c:314 src/plugins/smime/smime.c:653
 msgid "Couldn't parse decrypted file."
-msgstr "Não foi possível traduzir o ficheiro descriptografado."
+msgstr "Não foi possível traduzir o ficheiro desencriptado."
 
 #: src/plugins/pgpmime/pgpmime.c:322 src/plugins/smime/smime.c:661
 msgid "Couldn't parse decrypted file parts."
-msgstr "Não foi possível traduzir as partes do ficheiro descriptografado."
+msgstr "Não foi possível traduzir as partes do ficheiro desencriptado."
 
 #: src/plugins/pgpmime/pgpmime.c:369 src/plugins/pgpmime/pgpmime.c:408
 #, c-format
@@ -13308,8 +13301,8 @@ msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
-"Por favor, perceba que os cabeçalhos do email (como o Assunto) não são "
-"criptografados pelo sistema PGP/Mime."
+"Por favor, perceba que os cabeçalhos do e-mail (como o Assunto) não são "
+"encriptados pelo sistema PGP/Mime."
 
 #: src/plugins/pgpmime/pgpmime.c:723
 msgid "PGP/Mime"
@@ -13332,9 +13325,9 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Este plugin manipula mensagens assinadas e/ou criptografadas com PGP/MIME. "
-"Você pode desencriptar mensagens, verificar assinaturas ou assinar e "
-"encriptar suas próprias mensagens.\n"
+"Este plugin manipula mensagens assinadas e/ou encriptadas com PGP/MIME. Pode "
+"desencriptar mensagens, verificar assinaturas ou assinar e encriptar suas "
+"próprias mensagens.\n"
 "\n"
 "Ele pode ser selecionado como o Sistema de Privacidade Padrão em /"
 "Configuração/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
@@ -13424,16 +13417,15 @@ msgstr ""
 "embutido, acessível em Ferramentas -> Exibir console Python, ou armazenado "
 "em scripts.\n"
 "\n"
-"Estes scripts tornam-se, então, disponíveis no menu. Você pode associar "
-"atalhos de teclado a eles, da mesma forma como faz com outros itens do menu. "
-"Você também pode adicionar botões para chamar os scripts nas barras de "
-"ferramentas, usando o editor de barras de ferramentas do próprio Claws "
-"Mail.\n"
+"Estes scripts tornam-se, então, disponíveis no menu. Pode associar atalhos "
+"de teclado a eles, da mesma forma como faz com outros itens do menu. Também "
+"pode adicionar botões para chamar os scripts nas barras de ferramentas, "
+"usando o editor de barras de ferramentas do próprio Claws Mail.\n"
 "\n"
-"Você pode acrescentar scripts que atuem na janela principal adicionando os "
+"Pode acrescentar scripts que atuem na janela principal adicionando os "
 "ficheiros em ~/.claws-mail/python-scripts/main.\n"
 "\n"
-"Você pode acrescentar scripts que atuem na janela de composição aberta "
+"Pode acrescentar scripts que atuem na janela de composição aberta "
 "adicionando os ficheiros em ~/.claws-mail/python-scripts/compose.\n"
 "\n"
 "A pasta ~/.claws-mail/python-scripts/auto/ pode conter scripts que são "
@@ -13459,9 +13451,9 @@ msgstr ""
 "no console interativo do Python.\n"
 "\n"
 "O código-fonte deste plugin vem com vários exemplos de script no diretório "
-"\"examples\". Caso você escreva um plugin e tenha intereste em compartilhá-"
-"lo, fique à vontade para enviá-lo para que eu possa avaliar a possibilidade "
-"de inclui-lo nos exemplos.\n"
+"\"examples\". Caso escreva um plugin e tenha interesse em partilhá-lo, fique "
+"à vontade para enviá-lo para que eu possa avaliar a possibilidade de inclui-"
+"lo nos exemplos.\n"
 "\n"
 "Qualquer retorno para <berndth at gmx.de> é bem-vindo."
 
@@ -13523,11 +13515,11 @@ msgid ""
 "Each newsfeed will create a folder with appropriate entries, fetched from "
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
-"Este plugin permite criar uma árvore na caixa postal onde você pode "
-"adicionar fontes de notícias nos formatos RSS 1.0, RSS 2.0 ou Atom.\n"
+"Este plugin permite criar uma árvore na caixa postal onde pode adicionar "
+"fontes de notícias nos formatos RSS 1.0, RSS 2.0 ou Atom.\n"
 "\n"
 "Cada fonte de notícia irá criar uma pasta com as entradas apropriadas, "
-"buscadas na Web. Você pode lê-las e eliminar ou manter as entradas antigas."
+"buscadas na Web. Pode lê-las e eliminar ou manter as entradas antigas."
 
 #: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
@@ -13548,7 +13540,7 @@ msgstr "Assinar a fonte"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
-msgstr "Introduza a URL da fonte de notícias à qual você deseja assinar:"
+msgstr "Introduza a URL da fonte de notícias à qual deseja assinar:"
 
 #: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
@@ -13648,7 +13640,7 @@ msgstr "Sempre marcar como nova"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
-msgstr "Marcar como nova somente se o texto tiver sido alterado"
+msgstr "Marcar como nova apenas se o texto tiver sido alterado"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
@@ -13779,9 +13771,8 @@ msgid "Default refresh interval"
 msgstr "Intervalo padrão de atualização"
 
 #: src/plugins/rssyl/rssyl_prefs.c:157
-#, fuzzy
 msgid "Refresh all feeds on start-up"
-msgstr "Atualizar todas as fontes ao iniciar o programa"
+msgstr "Atualizar todas as fontes ao arrancar"
 
 #: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
@@ -13822,7 +13813,7 @@ msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr ""
-"Ao invés de usar o título oficial, você pode digitar um nome de pasta "
+"Ao invés de usar o título oficial, pode introduzir um nome de pasta "
 "diferente para a nova fonte."
 
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
@@ -13936,9 +13927,9 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Este plugin manipula mensagens assinadas e/ou criptografadas com S/MIME. "
-"Você pode desencriptar mensagens, verificar assinaturas ou assinar e "
-"encriptar suas próprias mensagens.\n"
+"Este plugin manipula mensagens assinadas e/ou encriptadas com S/MIME. Pode "
+"desencriptar mensagens, verificar assinaturas ou assinar e encriptar suas "
+"próprias mensagens.\n"
 "\n"
 "Ele pode ser selecionado como o Sistema de Privacidade Padrão em /"
 "Configuração/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
@@ -13976,8 +13967,8 @@ msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr ""
-"Por favor, perceba que os cabeçalhos do email, como o Assunto, não são "
-"criptografados pelo sistema S/MIME."
+"Por favor, perceba que os cabeçalhos do e-mail, como o Assunto, não são "
+"encriptados pelo sistema S/MIME."
 
 #: src/plugins/spam_report/spam_report.c:312
 msgid "Reporting spam..."
@@ -14033,7 +14024,7 @@ msgstr "SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
-msgstr "O plugin SpamAssassin não conseguiu conectar-se ao spamd.\n"
+msgstr "O plugin SpamAssassin não conseguiu ligar-se ao spamd.\n"
 
 #: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
@@ -14094,7 +14085,7 @@ msgstr ""
 "\n"
 "Ele também pode ser usado para marcar as mensagens como spam ou não.\n"
 "\n"
-"Quando uma mensagem é identificada como spam, ela pode ser excluída ou "
+"Quando uma mensagem é identificada como spam, ela pode ser eliminada ou "
 "guardada numa pasta especial.\n"
 "\n"
 "As opções podem ser encontradas em /Configuração/Preferências/Plugins/"
@@ -14346,16 +14337,15 @@ msgstr ""
 "no Evolution ou no Outlook.\n"
 "\n"
 "Quando carregado, ele criará uma caixa de correio para o vCalendar na sua "
-"lista de pastas, que será preenchida pelas reuniões que você aceitou ou "
-"criou.\n"
-"As requisições de reunião que você receber serão apresentadas num formato "
-"apropriado e você poderá aceitá-las ou recusá-las.\n"
-"Para criar uma reunião clique com o botão direito do mouse nas pastas "
+"lista de pastas, que será preenchida pelas reuniões que aceitou ou criou.\n"
+"As requisições de reunião que receber serão apresentadas num formato "
+"apropriado e poderá aceitá-las ou recusá-las.\n"
+"Para criar uma reunião clique com o botão direito do rato nas pastas "
 "vCalendar ou Reuniões e escolha \"Nova reunião...\".\n"
 "\n"
-"Você também estará apto a assinar fontes Webcal remotas, exportar suas "
-"reuniões e agendas, publicar sua informação de livre/ocupado e recuperar "
-"esta informação dos outros."
+"Também estará apto a assinar fontes Webcal remotas, exportar suas reuniões e "
+"agendas, publicar sua informação de livre/ocupado e recuperar esta "
+"informação dos outros."
 
 #: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
@@ -14411,11 +14401,11 @@ msgstr "Foi convidado para uma reunião."
 
 #: src/plugins/vcalendar/vcalendar.c:493
 msgid "A meeting to which you had been invited has been cancelled."
-msgstr "Uma reunião para a qual você foi convidado foi cancelada."
+msgstr "Uma reunião para a qual foi convidado foi cancelada."
 
 #: src/plugins/vcalendar/vcalendar.c:502
 msgid "You have been forwarded an appointment."
-msgstr "Foi remetido um compromisso para você."
+msgstr "Foi remetido um compromisso para si."
 
 #: src/plugins/vcalendar/vcalendar.c:556
 msgid "(this event recurs)"
@@ -14427,7 +14417,7 @@ msgstr "(este evento é parte de um evento repetitivo)"
 
 #: src/plugins/vcalendar/vcalendar.c:711
 msgid "You have received an answer to an unknown meeting proposal."
-msgstr "Você recebeu uma resposta para uma proposta de reunião desconhecida."
+msgstr "Recebeu uma resposta para uma proposta de reunião desconhecida."
 
 #: src/plugins/vcalendar/vcalendar.c:715
 #, c-format
@@ -14435,7 +14425,7 @@ msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
 msgstr ""
-"Você recebeu uma resposta para uma proposta de reunião.\n"
+"Recebeu uma resposta para uma proposta de reunião.\n"
 "%s %s o convite, que tem os seguintes detalhes:"
 
 #: src/plugins/vcalendar/vcalendar.c:796
@@ -14460,7 +14450,7 @@ msgstr "Cancelar reunião"
 
 #: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
-msgstr "Deseja realmente cancelar esta reunião?"
+msgstr "Deseja cancelar esta reunião?"
 
 #: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
@@ -14471,7 +14461,7 @@ msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
 msgstr ""
-"Você não tem nenhuma conta correspondente a nenhum dos participantes.\n"
+"Não tem nenhuma conta correspondente a nenhum dos participantes.\n"
 "Deseja responder mesmo assim?"
 
 #: src/plugins/vcalendar/vcalendar.c:1059
@@ -14496,7 +14486,7 @@ msgstr "Abrir site da Web"
 
 #: src/plugins/vcalendar/vcalendar.c:1199
 msgid "You are already busy at this time."
-msgstr "Você já está ocupado neste horário."
+msgstr "Já está ocupado neste horário."
 
 #: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
@@ -14607,7 +14597,7 @@ msgstr ""
 #: src/plugins/vcalendar/vcal_folder.c:1617
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
-msgstr "Tempo esgotado (%d segundos) ao tentar conectar com %s\n"
+msgstr "Tempo esgotado (%d segundos) ao tentar ligar com %s\n"
 
 #: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
@@ -14770,8 +14760,7 @@ msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
-"As pessoas seguintes estão ocupadas no horário em que você planejou a "
-"reunião:\n"
+"As pessoas seguintes estão ocupadas no horário em que planeou a reunião:\n"
 "- "
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:741
@@ -14782,12 +14771,12 @@ msgstr "Você"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:742
 msgid "You are busy at the time of your planned meeting"
-msgstr "Você está ocupado no horário em que planejou a reunião"
+msgstr "Está ocupado no horário em que planeou a reunião"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:744
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
-msgstr "%s está ocupado no horário que você planejou a reunião"
+msgstr "%s está ocupado no horário que planeou a reunião"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:746
 #, c-format
@@ -14917,7 +14906,7 @@ msgstr "Nem todos estão disponíveis. Veja nas dicas para mais informações...
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 #, c-format
 msgid "Fetching planning for %s..."
-msgstr "Buscando o planejamento de %s ..."
+msgstr "A obter planeamento (%s)..."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1114
 msgid "Available"
@@ -14947,7 +14936,7 @@ msgstr ""
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1393
 msgid "Save & Send"
-msgstr "Guardar & enviar"
+msgstr "Guardar e enviar"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1394
 msgid "Check availability"
@@ -15009,7 +14998,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Você terá uma reunião ou evento em breve.\n"
+"Terá uma reunião ou evento em breve.\n"
 "Iniciará às %s e terminará %s mais tarde.\n"
 "Localização: %s\n"
 "Mais informações:\n"
@@ -15076,7 +15065,7 @@ msgstr "Exportar a agenda automaticamente para"
 #: src/plugins/vcalendar/vcal_prefs.c:382
 #: src/plugins/vcalendar/vcal_prefs.c:501
 msgid "You can export to a local file or URL"
-msgstr "Você pode exportar para um ficheiro local ou uma URL"
+msgstr "Pode exportar para um ficheiro local ou uma URL"
 
 #: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Specify a local file or URL (http://server/path/file.ics)"
@@ -15142,7 +15131,7 @@ msgid ""
 "left part of the email address, %d for the domain"
 msgstr ""
 "Especifique um ficheiro local ou uma URL (http://servidor/caminho/ficheiro."
-"ifb). Use %u para a parte esquerda do endereço de email, %d para o domínio"
+"ifb). Use %u para a parte esquerda do endereço de e-mail, %d para o domínio"
 
 #: src/plugins/vcalendar/vcal_prefs.c:582
 msgid "TLS options"
@@ -15172,16 +15161,16 @@ msgstr "resposta UIDL inválida: %s\n"
 #: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
-msgstr "POP: Excluindo a mensagem expirada %d [%s]\n"
+msgstr "POP: A eliminar a mensagem expirada %d [%s]\n"
 
 #: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
-msgstr "POP: Ignorando mensagem %d [%s] (%d bytes)\n"
+msgstr "POP: A ignorar mensagem %d [%s] (%d bytes)\n"
 
 #: src/pop.c:975
 msgid "mailbox is locked\n"
-msgstr "a caixa postal está travada\n"
+msgstr "a caixa postal está bloqueada\n"
 
 #: src/pop.c:978
 msgid "Session timeout\n"
@@ -15218,7 +15207,7 @@ msgstr "Ficheiro mbox local"
 
 #: src/prefs_account.c:419
 msgid "None (SMTP only)"
-msgstr "Nenhum (somente SMTP)"
+msgstr "Nenhum (apenas SMTP)"
 
 #: src/prefs_account.c:1234
 msgid "Name of account"
@@ -15238,7 +15227,7 @@ msgstr "Nome completo"
 
 #: src/prefs_account.c:1265
 msgid "Mail address"
-msgstr "Endereço de email"
+msgstr "Endereço de e-mail"
 
 #: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
@@ -15262,15 +15251,15 @@ msgstr "Este servidor requer autenticação"
 
 #: src/prefs_account.c:1380
 msgid "Authenticate on connect"
-msgstr "Autenticar ao conectar"
+msgstr "Autenticar ao ligar"
 
 #: src/prefs_account.c:1430
 msgid "News server"
-msgstr "Servidor de news"
+msgstr "Servidor de notícias"
 
 #: src/prefs_account.c:1435
 msgid "Server for receiving"
-msgstr "Servidor para recebimento"
+msgstr "Servidor de receção"
 
 #: src/prefs_account.c:1440
 msgid "Local mailbox"
@@ -15328,7 +15317,7 @@ msgstr "0 dia e 0 hora: eliminar imediatamente"
 
 #: src/prefs_account.c:1709
 msgid "Receive size limit"
-msgstr "Tamanho limite do recebimento"
+msgstr "Tamanho limite da recepção"
 
 #: src/prefs_account.c:1712
 msgid ""
@@ -15336,7 +15325,7 @@ msgid ""
 "you will be able to download them fully or delete them."
 msgstr ""
 "Mensagens acima deste limite serão recebidas parcialmente. Ao selecioná-las, "
-"você poderá obtê-las por inteiro ou exclui-las."
+"poderá obtê-las por inteiro ou eliminá-las."
 
 #: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
@@ -15377,9 +15366,8 @@ msgstr ""
 "Este modo usa menos banda, mas pode ser mais lento com alguns servidores."
 
 #: src/prefs_account.c:1847
-#, fuzzy
 msgid "Batch size"
-msgstr "Horário da transferência"
+msgstr "Tamanho do lote"
 
 #: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
@@ -15387,7 +15375,7 @@ msgstr "Verificação automática"
 
 #: src/prefs_account.c:1864
 msgid "Use global settings"
-msgstr "Usar as configurações globais"
+msgstr "Usar as definições globais"
 
 #: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
@@ -15399,7 +15387,7 @@ msgstr "Filtrar mensagens ao receber"
 
 #: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
-msgstr "Permite filtrar usando plugins, durante o recebimento"
+msgstr "Permite filtrar usando plugins, durante a recepção"
 
 #: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
@@ -15416,7 +15404,7 @@ msgstr "Gerar Mestage-ID"
 
 #: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
-msgstr "Enviar o endereço de email da conta na Mestage-ID"
+msgstr "Enviar o endereço de e-mail da conta na Mestage-ID"
 
 #: src/prefs_account.c:2028
 msgid "Add user agent header"
@@ -15452,7 +15440,7 @@ msgstr "Autorização"
 
 #: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
-msgstr "Selecione o provedor de serviço de email OAuth2"
+msgstr "Selecione o provedor de serviço de e-mail OAuth2"
 
 #: src/prefs_account.c:2316
 msgid "Client ID"
@@ -15484,7 +15472,7 @@ msgstr "Colar a URL completa do navegador ou o token de autorização fornecido"
 
 #: src/prefs_account.c:2392
 msgid "Complete authorization"
-msgstr "Autorização completa"
+msgstr "Autorização concluída"
 
 #: src/prefs_account.c:2396
 msgid "Authorize"
@@ -15512,7 +15500,7 @@ msgstr "Definir os seguintes endereços automaticamente"
 
 #: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
-msgstr "Dicionários de checagem ortográfica"
+msgstr "Dicionários de correção ortográfica"
 
 #: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
@@ -15529,7 +15517,7 @@ msgstr "Dicionário alternativo padrão"
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
-msgstr "Escrever"
+msgstr "Compor"
 
 #: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
@@ -15539,7 +15527,7 @@ msgstr "Responder"
 #: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
-msgstr "Encaminhar"
+msgstr "Reencaminhar"
 
 #: src/prefs_account.c:2782
 msgid "Default privacy system"
@@ -15559,17 +15547,17 @@ msgstr "Sempre assinar as mensagens em resposta a mensagens assinadas"
 
 #: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
-msgstr "Sempre encriptar as mensagens em resposta a mensagens criptografadas"
+msgstr "Sempre encriptar as mensagens em resposta a mensagens encriptadas"
 
 #: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
-"Criptografar as mensagens enviadas com sua própria chave além da dos "
+"Encriptar as mensagens enviadas com sua própria chave além da dos "
 "destinatários"
 
 #: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
-msgstr "Guardar mensagens criptografadas enviadas como texto simples"
+msgstr "Guardar mensagens encriptadas enviadas como texto simples"
 
 #: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
@@ -15582,7 +15570,7 @@ msgstr "Usar TLS"
 
 #: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
-msgstr "Usar o comando STARTTLS para iniciar sessão criptografada"
+msgstr "Usar o comando STARTTLS para iniciar sessão encriptada"
 
 #: src/prefs_account.c:3023
 msgid "Send (SMTP)"
@@ -15598,7 +15586,7 @@ msgstr "Certificados do cliente"
 
 #: src/prefs_account.c:3046
 msgid "Certificate for receiving"
-msgstr "Certificado para recebimento"
+msgstr "Certificado para receção"
 
 #: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
 #: src/prefs_account.c:3081
@@ -15619,7 +15607,7 @@ msgstr "Utilizar TLS não bloqueador"
 
 #: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
-msgstr "Desligue esta opção caso você tenha problemas de ligação via TLS"
+msgstr "Desligue esta opção caso tenha problemas de ligação via TLS"
 
 #: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
@@ -15630,11 +15618,11 @@ msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
-msgstr "Utilizar as configurações padrão"
+msgstr "Utilizar as definições padrão"
 
 #: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
-msgstr "Usar as configurações de servidor proxy do sistema"
+msgstr "Usar as definições de servidor proxy do sistema"
 
 #: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
@@ -15653,8 +15641,8 @@ msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
 msgstr ""
-"Se desabilitado, as mensagens serão enviadas através de uma ligação direta "
-"com o servidor de envios configurado, ignorando qualquer servidor proxy "
+"Se desativado, as mensagens serão enviadas através de uma ligação direta com "
+"o servidor de envios configurado, ignorando qualquer servidor proxy "
 "configurado."
 
 #: src/prefs_account.c:3416
@@ -15715,7 +15703,7 @@ msgstr "O nome da conta não foi informado."
 
 #: src/prefs_account.c:3585
 msgid "Mail address is not entered."
-msgstr "O endereço de email não foi informado."
+msgstr "O endereço de e-mail não foi informado."
 
 #: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
@@ -15747,25 +15735,24 @@ msgstr "o nome do ficheiro da caixa postal local não informado."
 
 #: src/prefs_account.c:3646
 msgid "mail command is not entered."
-msgstr "o comando de email não foi informado."
+msgstr "o comando de e-mail não foi informado."
 
 #: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
-msgstr "O ID do utilizador não pode conter o caractere de quebra de linha."
+msgstr "O ID do utilizador não pode conter o caracter de quebra de linha."
 
 #: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
-msgstr "A palavra-passe não pode conter um caractere de quebra de linha."
+msgstr "A palavra-passe não pode conter um caracter de quebra de linha."
 
 #: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
-msgstr ""
-"O ID do utilizador SMTP não pode conter o caractere de quebra de linha."
+msgstr "O ID do utilizador SMTP não pode conter o caracter de quebra de linha."
 
 #: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr ""
-"A palavra-passe do SMTP não pode conter um caractere de quebra de linha."
+"A palavra-passe do SMTP não pode conter um caracter de quebra de linha."
 
 #: src/prefs_account.c:3800
 msgid "domain is not specified."
@@ -15777,7 +15764,7 @@ msgstr "a pasta Enviados não está selecionada."
 
 #: src/prefs_account.c:3810
 msgid "queue folder is not selected."
-msgstr "a pasta Fila de Saída não está selecionada."
+msgstr "a pasta Fila de espera não está selecionada."
 
 #: src/prefs_account.c:3815
 msgid "draft folder is not selected."
@@ -15852,7 +15839,7 @@ msgstr "Autorização concluída"
 
 #: src/prefs_account.c:6168
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
-msgstr "Seu código de autorização OAuth2 foi recebido pelo Claws Mail"
+msgstr "O seu código de autorização OAuth2 foi recebido pelo Claws Mail"
 
 #: src/prefs_account.c:6171
 msgid "Authorisation NOT completed"
@@ -15872,7 +15859,7 @@ msgstr "Nome do menu"
 
 #: src/prefs_actions.c:282
 msgid "Shell command"
-msgstr "Comando do shell"
+msgstr "Comando da shell"
 
 #: src/prefs_actions.c:292
 msgid "Filter action"
@@ -15974,7 +15961,7 @@ msgstr "Eliminar ação"
 
 #: src/prefs_actions.c:723
 msgid "Do you really want to delete this action?"
-msgstr "Deseja realmente deseja eliminar esta ação?"
+msgstr "Deseja deseja eliminar esta ação?"
 
 #: src/prefs_actions.c:744
 msgid "Delete all actions"
@@ -16040,8 +16027,8 @@ msgstr ""
 #: src/prefs_actions.c:996
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
-"para enviar o texto escondido fornecido pelo utilizador para a entrada "
-"padrão do comando"
+"para enviar o texto ocultado fornecido pelo utilizador para a entrada padrão "
+"do comando"
 
 #: src/prefs_actions.c:997
 msgid "<span weight=\"bold\">End with:</span>"
@@ -16084,7 +16071,7 @@ msgstr "para um argumento fornecido pelo utilizador"
 #: src/prefs_actions.c:1006
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
-"para um argumento escondido fornecido pelo utilizador (ex. palavra-passe)"
+"para um argumento ocultado fornecido pelo utilizador (ex. palavra-passe)"
 
 #: src/prefs_actions.c:1007
 msgid "for the text selection"
@@ -16108,7 +16095,7 @@ msgid ""
 "process a complete message file or just one of its parts."
 msgstr ""
 "O recurso Ações é uma forma do utilizador executar comandos externos para "
-"procestar um ficheiro completo de mensagens ou somente uma de suas partes."
+"processar um ficheiro completo de mensagens ou apenas uma de suas partes."
 
 #: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
 #: src/prefs_template.c:1107
@@ -16191,7 +16178,7 @@ msgstr "caracteres"
 
 #: src/prefs_compose_writing.c:170
 msgid "Even if message is to be encrypted"
-msgstr "Mesmo se a mensagem estiver pra ser criptografada"
+msgstr "Mesmo se a mensagem estiver pra ser encriptada"
 
 #: src/prefs_compose_writing.c:177
 msgid "Undo level"
@@ -16522,7 +16509,7 @@ msgstr "O cabeçalho não foi definido."
 
 #: src/prefs_filtering_action.c:950
 msgid "Target addressbook/folder is not set."
-msgstr "O Livro de Endereços/pasta de destino não foi definido."
+msgstr "O livro de endereços/pasta de destino não foi definido."
 
 #: src/prefs_filtering_action.c:960
 msgid "Tag name is empty."
@@ -16564,8 +16551,8 @@ msgid ""
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
-"'Executar' permite que você envie uma mensagem ou um elemento da mensagem "
-"para um programa ou script externo.\n"
+"'Executar' permite-lhe enviar uma mensagem ou um elemento da mensagem para "
+"um programa ou script externo.\n"
 "Os seguinte símbolos podem ser utilizados:"
 
 #: src/prefs_filtering_action.c:1381
@@ -16590,7 +16577,7 @@ msgstr "Lista das ações atuais"
 
 #: src/prefs_filtering.c:196 src/prefs_filtering.c:359
 msgid "Filtering/Processing configuration"
-msgstr "Configuração da filtragem/procestamento"
+msgstr "Configuração da filtragem/processamento"
 
 #: src/prefs_filtering.c:265 src/prefs_filtering.c:853
 #: src/prefs_filtering.c:969
@@ -16785,11 +16772,11 @@ msgstr "Selecione a cor para a pasta"
 
 #: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
-msgstr "Executar as regras de procestamento ao iniciar"
+msgstr "Executar as regras de processamento ao iniciar"
 
 #: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
-msgstr "Executar as regras de procestamento ao abrir"
+msgstr "Executar as regras de processamento ao abrir"
 
 #: src/prefs_folder_item.c:505
 msgid "Scan for new mail"
@@ -16992,11 +16979,11 @@ msgstr "linhas"
 
 #: src/prefs_logging.c:165
 msgid "Filtering/processing log"
-msgstr "Relatório de filtragem/procestamento"
+msgstr "Relatório de filtragem/processamento"
 
 #: src/prefs_logging.c:168
 msgid "Enable logging of filtering/processing rules"
-msgstr "Ativar relatório das regras de filtragem/procestamento"
+msgstr "Ativar relatório das regras de filtragem/processamento"
 
 #: src/prefs_logging.c:174
 msgid ""
@@ -17005,15 +16992,15 @@ msgid ""
 "Caution: enabling this option will slow down the filtering/processing, this "
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""
-"Se marcada, ativa o relatório das regras de filtragem e procestamento.\n"
+"Se marcada, ativa o relatório das regras de filtragem e processamento.\n"
 "O relatório pode ser acestado em 'Ferramentas/Relatório de filtragem'.\n"
-"Atenção: habilitar esta opção tornará a filtragem/procestamento mais lentos, "
+"Atenção: habilitar esta opção tornará a filtragem/processamento mais lentos, "
 "isso pode se tornar crítico ao se aplicar muitas regras sobre milhares de "
 "mensagens."
 
 #: src/prefs_logging.c:181
 msgid "Log filtering/processing when..."
-msgstr "Detalhar filtragem/procestamento durante..."
+msgstr "Detalhar filtragem/processamento durante..."
 
 #: src/prefs_logging.c:185
 msgid "filtering at incorporation"
@@ -17021,7 +17008,7 @@ msgstr "a filtragem na incorporação"
 
 #: src/prefs_logging.c:187
 msgid "pre-processing folders"
-msgstr "o pré-procestamento das pastas"
+msgstr "o pré-processamento das pastas"
 
 #: src/prefs_logging.c:192
 msgid "manually filtering"
@@ -17029,11 +17016,11 @@ msgstr "a filtragem manual"
 
 #: src/prefs_logging.c:194
 msgid "post-processing folders"
-msgstr "o pós-procestamento das pastas"
+msgstr "o pós-processamento das pastas"
 
 #: src/prefs_logging.c:201
 msgid "processing folders"
-msgstr "o procestamento das pastas"
+msgstr "o processamento das pastas"
 
 #: src/prefs_logging.c:217
 msgid "Log level"
@@ -17093,7 +17080,7 @@ msgstr "Mensagens de erro"
 
 #: src/prefs_logging.c:290
 msgid "Status messages for filtering/processing log"
-msgstr "Mensagens de status para o relatório de filtragem/procestamento"
+msgstr "Mensagens de estado para o relatório de filtragem/processamento"
 
 #: src/prefs_logging.c:410 src/prefs_msg_colors.c:143 src/prefs_other.c:785
 msgid "Other"
@@ -17373,8 +17360,8 @@ msgid ""
 msgstr ""
 "O caminho do livro/pasta não está definido.\n"
 "\n"
-"Se você deseja procurar a correspondência de %s por todo o livro de "
-"endereços, deve selecionar '%s' da caixa de seleção do livro/pasta."
+"Se deseja procurar a correspondência de %s por todo o livro de endereços, "
+"deve selecionar '%s' da caixa de seleção do livro/pasta."
 
 #: src/prefs_matcher.c:1884
 msgid "Headers part"
@@ -17522,7 +17509,7 @@ msgstr "Renderizar as mensagens em HTML como texto"
 
 #: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
-msgstr "Renderizar mensagens somente em HTML com o plugin, se possível"
+msgstr "Renderizar mensagens apenas em HTML com o plugin, se possível"
 
 #: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
@@ -17896,9 +17883,9 @@ msgid ""
 "If checked, your saved account passwords will be protected by a primary "
 "passphrase. If no primary passphrase is set, you will be prompted to set one."
 msgstr ""
-"Se selecionado, as palavra-passes guardadas das suas contas serão protegidas "
+"Se selecionado, as palavras-passe guardadas das suas contas serão protegidas "
 "por uma palavra-passe primária. Caso não exista uma palavra-passe primária, "
-"será solicitada uma a você."
+"será solicitada uma a si."
 
 #: src/prefs_other.c:615
 msgid "Change primary passphrase"
@@ -17934,7 +17921,7 @@ msgstr "Janela de mensagens"
 
 #: src/prefs_receive.c:220
 msgid "Show receive dialog"
-msgstr "Exibir janela de mensagens do recebimento"
+msgstr "Exibir janela de mensagens da recepção"
 
 #: src/prefs_receive.c:230
 msgid "Only on manual receiving"
@@ -17950,7 +17937,7 @@ msgstr "Não exibir a janela aviso de erros ao recebê-los"
 
 #: src/prefs_receive.c:247
 msgid "After receiving new mail"
-msgstr "Após o recebimento de novas mensagens"
+msgstr "Após a recepção de novas mensagens"
 
 #: src/prefs_receive.c:249
 msgid "Go to Inbox"
@@ -17991,7 +17978,7 @@ msgstr "Nunca enviar confirmação de recebimento"
 
 #: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
-msgstr "Confirmar antes de enviar mensagens da Fila de Saída"
+msgstr "Confirmar antes de enviar mensagens da fila de espera"
 
 #: src/prefs_send.c:200
 msgid "Show send dialog"
@@ -18310,16 +18297,15 @@ msgid "Open last opened folder at start-up"
 msgstr "Abrir a última pasta aberta, ao iniciar"
 
 #: src/prefs_summaries.c:465
-#, fuzzy
 msgid "Open selected folder at start-up"
-msgstr "Abrir a última pasta aberta, ao iniciar"
+msgstr "Abrir a pasta selecionada ao arrancar"
 
 #: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
 msgstr ""
-"Executar regras de procestamento antes de marcar todas as mensagens numa "
+"Executar regras de processamento antes de marcar todas as mensagens numa "
 "pasta como lidas ou não lidas"
 
 #: src/prefs_summaries.c:493
@@ -18405,7 +18391,7 @@ msgstr "Assumir 'Não'"
 
 #: src/prefs_summaries.c:653
 msgid "Display sender using address book"
-msgstr "Nomear o remetente utilizando o Livro de Endereços"
+msgstr "Nomear o remetente utilizando o livro de endereços"
 
 #: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
@@ -18484,7 +18470,7 @@ 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."
 msgstr ""
-"Selecione as colunas a serem exibidas na lista de mensagens. Você pode\n"
+"Selecione as colunas a serem exibidas na lista de mensagens. Pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 
 #: src/prefs_summary_open.c:109
@@ -18597,25 +18583,25 @@ msgstr "O nome do modelo não foi definido."
 
 #: src/prefs_template.c:796
 msgid "The \"From\" field of the template contains an invalid email address."
-msgstr "O campo \"De\" do modelo possui um endereço de email inválido."
+msgstr "O campo \"De\" do modelo possui um endereço de e-mail inválido."
 
 #: src/prefs_template.c:802
 msgid "The \"To\" field of the template contains an invalid email address."
-msgstr "O campo \"Para\" do modelo possui um endereço de email inválido."
+msgstr "O campo \"Para\" do modelo possui um endereço de e-mail inválido."
 
 #: src/prefs_template.c:808
 msgid "The \"Cc\" field of the template contains an invalid email address."
-msgstr "O campo \"Cc\" do modelo possui um endereço de email inválido."
+msgstr "O campo \"Cc\" do modelo possui um endereço de e-mail inválido."
 
 #: src/prefs_template.c:814
 msgid "The \"Bcc\" field of the template contains an invalid email address."
-msgstr "O campo \"Cco\" do modelo possui um endereço de email inválido."
+msgstr "O campo \"Cco\" do modelo possui um endereço de e-mail inválido."
 
 #: src/prefs_template.c:820
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
-"O campo \"Responder para\" do modelo possui um endereço de email inválido."
+"O campo \"Responder para\" do modelo possui um endereço de e-mail inválido."
 
 #: src/prefs_template.c:826
 msgid "The \"Subject\" field of the template is invalid."
@@ -18768,7 +18754,7 @@ msgstr "Não existe um ficheiro de informações para este tema"
 
 #: src/prefs_themes.c:966
 msgid "Error: couldn't get theme status"
-msgstr "Erro: não foi possível obter o status do tema"
+msgstr "Erro: não foi possível obter o estado do tema"
 
 #: src/prefs_themes.c:996
 #, c-format
@@ -18983,7 +18969,7 @@ msgstr "Não foi possível abrir o ficheiro %s."
 
 #: src/procmsg.c:1659
 msgid "Queued message header is broken."
-msgstr "O cabeçalho da mensagem na Fila de Saída está com problema."
+msgstr "O cabeçalho da mensagem na fila de espera está com problema."
 
 #: src/procmsg.c:1679
 msgid "An error happened during SMTP session."
@@ -19032,7 +19018,7 @@ msgstr "formato de data personalizado (veja 'man strftime')"
 
 #: src/quote_fmt.c:50
 msgid "email address of sender"
-msgstr "endereço de email do remetente"
+msgstr "endereço de e-mail do remetente"
 
 #: src/quote_fmt.c:51
 msgid "full name of sender"
@@ -19084,7 +19070,7 @@ msgstr "propriedade da conta: seu nome"
 
 #: src/quote_fmt.c:69
 msgid "account property: your email address"
-msgstr "propriedade da conta: seu endereço de email"
+msgstr "propriedade da conta: seu endereço de e-mail"
 
 #: src/quote_fmt.c:70
 msgid "account property: account name"
@@ -19108,15 +19094,15 @@ msgstr "propriedade da conta: dicionário padrão"
 
 #: src/quote_fmt.c:75
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
-msgstr "<span style=\"oblique\">complemento</span> do Livro de Endereços: Cc"
+msgstr "<span style=\"oblique\">complemento</span> do livro de endereços: Cc"
 
 #: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: From"
-msgstr "<span style=\"oblique\">complemento</span> do Livro de Endereços: De"
+msgstr "<span style=\"oblique\">complemento</span> do livro de endereços: De"
 
 #: src/quote_fmt.c:77
 msgid "address book <span style=\"oblique\">completion</span>: To"
-msgstr "<span style=\"oblique\">complemento</span> do Livro de Endereços: Para"
+msgstr "<span style=\"oblique\">complemento</span> do livro de endereços: Para"
 
 #: src/quote_fmt.c:79
 msgid "literal backslash"
@@ -19254,7 +19240,7 @@ msgid ""
 "of the contact if that address matches exactly\n"
 "one contact in the address book"
 msgstr ""
-"complemento a partir do Livro de Endereços funciona\n"
+"complemento a partir do livro de endereços funciona\n"
 "apenas com o primeiro endereço do cabeçalho, ele\n"
 "gera o nome completo do contato se aquele endereço\n"
 "corresponder exatamente a um contato do livro"
@@ -19306,7 +19292,7 @@ msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr ""
-"O campo \"De\" do modelo \"Nova mensagem\" possui um endereço de email "
+"O campo \"De\" do modelo \"Nova mensagem\" possui um endereço de e-mail "
 "inválido."
 
 #: src/quote_fmt.c:562
@@ -19435,7 +19421,7 @@ msgstr "Expiração"
 
 #: src/ssl_manager.c:195
 msgid "Saved TLS certificates"
-msgstr "Certificados TLS salvos"
+msgstr "Certificados TLS guardados"
 
 #: src/ssl_manager.c:451
 msgid "Delete certificate"
@@ -19517,7 +19503,7 @@ msgstr "Foram deixadas algumas marcas. Processá-las?"
 #: src/summaryview.c:1381
 #, c-format
 msgid "Scanning folder (%s)..."
-msgstr "Revisando pasta (%s)..."
+msgstr "A analisar pasta (%s)..."
 
 #: src/summaryview.c:1935 src/summaryview.c:1984
 msgid "No more unread messages"
@@ -19597,7 +19583,7 @@ msgstr "Agrupando mensagens pelo assunto..."
 #: src/summaryview.c:2718
 #, c-format
 msgid "%d deleted"
-msgstr "%d excluída"
+msgstr "%d eliminada"
 
 #: src/summaryview.c:2722
 #, c-format
@@ -19697,7 +19683,7 @@ msgstr "Para: %s, em %s"
 
 #: src/summaryview.c:4466
 msgid "You're not the author of the article."
-msgstr "Você não é o autor do artigo."
+msgstr "Não é o autor do artigo."
 
 #: src/summaryview.c:4556
 #, c-format
@@ -19724,7 +19710,7 @@ msgstr[1] "Selecione a pasta para onde as mensagens selecionadas serão movidas"
 
 #: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
-msgstr "Você está tentando copiar para a mesma pasta."
+msgstr "Está a tentar copiar para a mesma pasta."
 
 #: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
@@ -19735,11 +19721,11 @@ msgstr[1] ""
 
 #: src/summaryview.c:5027
 msgid "Append or Overwrite"
-msgstr "Acrescentar ou sobrescrever"
+msgstr "Acrescentar ou substituir"
 
 #: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
-msgstr "Acrescentar ao ficheiro ou sobrescrevê-lo?"
+msgstr "Acrescentar ao ficheiro ou substitui-lo?"
 
 #: src/summaryview.c:5029
 msgid "_Append"
@@ -19758,9 +19744,7 @@ msgstr "Não foi possível guardar o ficheiro '%s'."
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
-msgstr ""
-"Você esta prestes a imprimir %d mensagens, uma a uma. Deseja realmente "
-"continuar?"
+msgstr "Está prestes a imprimir %d mensagens, uma a uma. Deseja continuar?"
 
 #: src/summaryview.c:5539
 msgid "Building threads..."
@@ -19796,7 +19780,7 @@ msgstr "Filtrando..."
 
 #: src/summaryview.c:5938
 msgid "Processing configuration"
-msgstr "Configuração do procestamento"
+msgstr "Configuração do processamento"
 
 #: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
@@ -19869,7 +19853,7 @@ msgstr ""
 
 #: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
-msgstr "Voltar à lista de pastas (se você tiver mensagens não lidas)"
+msgstr "Voltar à lista de pastas (se tiver mensagens não lidas)"
 
 #: src/summaryview.c:8411
 msgid "Go back to the folder list"
@@ -20048,11 +20032,11 @@ msgstr "Receber mensagens da conta atual"
 
 #: src/toolbar.c:229 src/toolbar.c:2345
 msgid "Send Queued Messages"
-msgstr "Enviar mensagens da Fila de Saída"
+msgstr "Enviar mensagens da fila de espera"
 
 #: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Compose Email"
-msgstr "Escrever email"
+msgstr "Escrever e-mail"
 
 #: src/toolbar.c:231
 msgid "Compose News"
@@ -20076,7 +20060,7 @@ msgstr "Responder à lista de discussão"
 
 #: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
-msgstr "Abrir email"
+msgstr "Abrir e-mail"
 
 #: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
 msgid "Forward Message"
@@ -20136,7 +20120,7 @@ msgstr "Marcar a mensagem como não lida"
 
 #: src/toolbar.c:255
 msgid "Run folder processing rules"
-msgstr "Executar regras de procestamento da pasta"
+msgstr "Executar regras de processamento da pasta"
 
 #: src/toolbar.c:257 src/toolbar.c:525
 msgid "Print"
@@ -20156,7 +20140,7 @@ msgstr "Enviar a mensagem"
 
 #: src/toolbar.c:263 src/toolbar.c:2528
 msgid "Put into queue folder and send later"
-msgstr "Armazenar na Fila de Saída e enviar mais tarde"
+msgstr "Armazenar na fila de espera e enviar mais tarde"
 
 #: src/toolbar.c:264 src/toolbar.c:2532
 msgid "Save to draft folder"
@@ -20200,7 +20184,7 @@ msgstr "Assinar"
 
 #: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
 msgid "Encrypt"
-msgstr "Criptografar"
+msgstr "Encriptar"
 
 #: src/toolbar.c:278
 msgid "Claws Mail Actions Feature"
@@ -20279,7 +20263,7 @@ msgstr "Lida"
 
 #: src/toolbar.c:523
 msgid "Run proc. rules"
-msgstr "Executar regras de procestamento"
+msgstr "Executar regras de processamento"
 
 #: src/toolbar.c:527
 msgid "Folders"
@@ -20343,11 +20327,11 @@ msgstr "A mensagem não será assinada"
 
 #: src/toolbar.c:1977
 msgid "Message will be encrypted"
-msgstr "A mensagem será criptografada"
+msgstr "A mensagem será encriptada"
 
 #: src/toolbar.c:1979
 msgid "Message will not be encrypted"
-msgstr "A mensagem não será criptografada"
+msgstr "A mensagem não será encriptada"
 
 #: src/toolbar.c:2331
 msgid "Go to folder list"
@@ -20503,7 +20487,7 @@ msgstr ""
 "Bem-vindo(a) ao Claws Mail\n"
 "--------------------------\n"
 "\n"
-"Agora que você configurou sua conta é possível obter suas\n"
+"Agora que configurou a sua conta é possível obter suas\n"
 "mensagens clicando no botão 'Receber mensagens', à esquerda\n"
 "na barra de ferramentas.\n"
 "\n"
@@ -20511,14 +20495,14 @@ msgstr ""
 "plugins, como filtros e aprendizagem contra spam (através dos\n"
 "plugins do Bogofilter ou SpamAssassin), proteção à privacidade\n"
 "(através do PGP/Mime), um agregador RSS, uma agenda de\n"
-"compromissos e muito mais. Você pode carregá-los a partir do\n"
+"compromissos e muito mais. Pode carregá-los a partir do\n"
 "menu '/Configuração/Plugins'.\n"
 "\n"
-"Você pode mudar as configurações da sua conta selecionando\n"
+"Pode mudar as preferências da sua conta selecionando\n"
 "o menu '/Configuração/Preferências da conta atual'. E pode\n"
 "mudar as preferências gerais em '/Configuração/Preferências'.\n"
 "\n"
-"Você pode encontrar mais informações no manual do Claws Mail,\n"
+"Pode encontrar mais informações no manual do Claws Mail,\n"
 "acessível através do menu '/Ajuda/Manual' ou online, na URL\n"
 "indicada abaixo.\n"
 "\n"
@@ -20539,7 +20523,7 @@ msgstr ""
 "\n"
 "DOAÇÕES\n"
 "---------\n"
-"Se você deseja fazer doações para o projeto do Claws Mail,\n"
+"Se deseja fazer doações para o projeto do Claws Mail,\n"
 "pode fazê-lo em <%s>.\n"
 "\n"
 
@@ -20549,7 +20533,7 @@ msgstr "Por favor, introduza o nome da caixa postal."
 
 #: src/wizard.c:648
 msgid "Please enter your name and email address."
-msgstr "Por favor, introduza o seu nome e endereço de email."
+msgstr "Por favor, introduza o seu nome e endereço de e-mail."
 
 #: src/wizard.c:659
 msgid "Please enter your receiving server and username."
@@ -20571,15 +20555,15 @@ msgstr "Por favor, introduza o nome de utilizador para o SMTP."
 
 #: src/wizard.c:968
 msgid "Your name:"
-msgstr "Seu nome:"
+msgstr "O seu nome:"
 
 #: src/wizard.c:981
 msgid "Your email address:"
-msgstr "Seu endereço de email:"
+msgstr "O seu endereço de e-mail:"
 
 #: src/wizard.c:994
 msgid "Your organization:"
-msgstr "Sua organização:"
+msgstr "A sua organização:"
 
 #: src/wizard.c:1029
 msgid "Mailbox name:"
@@ -20619,7 +20603,7 @@ msgstr "Palavra-passe do SMTP:"
 
 #: src/wizard.c:1169
 msgid "Use TLS to connect to SMTP server"
-msgstr "Usar TLS para conectar-se ao servidor SMTP"
+msgstr "Usar TLS para ligar-se ao servidor SMTP"
 
 #: src/wizard.c:1180 src/wizard.c:1623
 msgid "Use STARTTLS command to start encryption"
@@ -20659,7 +20643,7 @@ msgstr ""
 
 #: src/wizard.c:1612
 msgid "Use TLS to connect to receiving server"
-msgstr "Usar TLS para conectar-se ao servidor de recebimento"
+msgstr "Usar TLS para ligar-se ao servidor de receção"
 
 #: src/wizard.c:1690
 msgid "IMAP server directory:"
@@ -20730,44 +20714,3 @@ msgid ""
 msgstr ""
 "O Claws Mail está pronto.\n"
 "Clique em Guardar para iniciar."
-
-#, c-format
-#~ msgid ""
-#~ "%s\n"
-#~ "Use \"Send queued messages\" from the main window to retry."
-#~ msgstr ""
-#~ "%s\n"
-#~ "Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal "
-#~ "para tentar novamente."
-
-#, c-format
-#~ msgid "process id: %d"
-#~ msgstr "id do processo: %d"
-
-#, c-format
-#~ msgid ""
-#~ "Size of pasted text exceeds limit (%dKiB) for paste.\n"
-#~ "Attach as file instead."
-#~ msgstr ""
-#~ "O tamanho do texto a ser colado excede o limite (%dKiB) para colagens.\n"
-#~ "Anexe-o como um ficheiro."
-
-#~ msgid "Use GNOME's proxy settings"
-#~ msgstr "Usar as configurações de proxy do GNOME"
-
-#~ msgid "Use proxy"
-#~ msgstr "Usar proxy"
-
-#~ msgid "Mailbox setting"
-#~ msgstr "Configuração da caixa postal"
-
-#~ msgid ""
-#~ "First, you have to set the location of mailbox.\n"
-#~ "You can use existing mailbox in MH format\n"
-#~ "if you have the one.\n"
-#~ "If you're not sure, just select OK."
-#~ msgstr ""
-#~ "Inicialmente, você precisa definir a localização da\n"
-#~ "caixa postal (mailbox). Você pode utilizar uma\n"
-#~ "existente no formato MH, se possuir uma.\n"
-#~ "Se não tiver certeza, apenas clique em OK."
diff --git a/po/ru.po b/po/ru.po
index f143fb1bf..9cd117284 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,5 +1,5 @@
 # Russian translation of Claws Mail.
-# Copyright © 2003-2021 The Claws Mail team.
+# Copyright © 2003-2023 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
@@ -8,14 +8,14 @@
 # Ruslan N. Balkin <baron at voices.ru>, 2003.
 # Pavlo & Olena Bohmat <bohm at ukr.net>, 2004-2007.
 # Aleksei Miheev <aleksei at miheev.info>, 2008-2009.
-# Mikhail Kurinnoi <viewizard at viewizard.com>, 2015-2022.
+# Mikhail Kurinnoi <viewizard at viewizard.com>, 2015-2023.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 4.1.0\n"
+"Project-Id-Version: Claws Mail 4.1.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-11 10:26+0100\n"
-"PO-Revision-Date: 2022-10-13 00:02+0300\n"
+"POT-Creation-Date: 2023-11-13 16:14+0000\n"
+"PO-Revision-Date: 2023-11-13 21:32+0300\n"
 "Last-Translator: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language-Team: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language: ru\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n% "
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.4.1\n"
 "X-Poedit-Basepath: claws\n"
 "X-Poedit-SearchPath-0: .\n"
 
@@ -63,8 +63,8 @@ msgstr "_Новый"
 msgid "Create a new account"
 msgstr "Создать новую учётную запись"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -76,8 +76,8 @@ msgstr "Редактировать параметры выбранной учё
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -93,8 +93,8 @@ msgstr "У_далить"
 msgid "Delete the selected account from the list"
 msgstr "Удалить выбранную учетную запись из списка"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Копировать"
@@ -135,26 +135,26 @@ msgstr "Переместить выбранную учетную запись в
 msgid " _Set as default account "
 msgstr " _Использовать как учётную запись по умолчанию "
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Закрыть"
@@ -168,53 +168,52 @@ msgstr "Учётные записи с внешними папками не мо
 msgid "Copy of %s"
 msgstr "Копировать %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Вы действительно хотите удалить учётную запись '%s'?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Безымянный)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Удалить учётную запись"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -223,88 +222,88 @@ msgstr "Удалить учётную запись"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Получить Почту' проверяет письма в указанных учётных записях"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "Имя"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Протокол"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Сервер"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Не удалось получить файл сообщения %d"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "Не удалось получить часть сообщения."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Не удалось получить часть составного сообщения: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -313,11 +312,11 @@ msgstr ""
 "Указанное действие нельзя использовать в окне составления,\n"
 "потому что оно содержит %%f, %%F %%as или %%p."
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "Не установлено действие фильтрации"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -326,7 +325,7 @@ msgstr ""
 "Неверное действие фильтрации:\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -337,44 +336,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Завершено"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Выполняется: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Завершено: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Действия ввода/вывода"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "_Выполнить"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "_Остановить"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -385,11 +384,11 @@ msgstr ""
 "('%%h' будет заменено параметром)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Действия скрыты параметром пользователя"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -400,23 +399,23 @@ msgstr ""
 "('%%u' будет заменено параметром)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Указанный пользователем параметр"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Невозможно копировать папку в саму себя или одну из её подпапок."
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "Невозможно копировать адресную книгу в саму себя."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Невозможно переместить папку в саму себя или в одну из её подпапок."
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Группа"
@@ -489,40 +488,40 @@ msgstr ""
 "Вы действительно хотите заменить все имена\n"
 "свойств набором имён по умолчанию?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_Нет"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Да"
 
@@ -561,31 +560,30 @@ msgstr "_Добавить"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_OK"
@@ -616,7 +614,7 @@ msgid ""
 msgstr ""
 "Claws Mail проведёт поиск дублирующихся почтовых адресов в адресной книге."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Найти"
@@ -630,7 +628,7 @@ msgid "Duplicate email addresses"
 msgstr "Дублирующиеся почтовые адреса"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Адрес"
@@ -639,11 +637,11 @@ msgstr "Адрес"
 msgid "Address book path"
 msgstr "Путь к адресной книге"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
@@ -651,7 +649,7 @@ msgstr "Действительно удалить адрес(а)?"
 msgid "Delete address"
 msgstr "Удалить адрес"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Данные адреса только для чтения и не могут быть удалены."
 
@@ -663,7 +661,7 @@ msgstr "Добавить в адресную книгу"
 msgid "Contact"
 msgstr "Контакт"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Примечания"
@@ -672,7 +670,7 @@ msgstr "Примечания"
 msgid "Select Address Book Folder"
 msgstr "Выберите Папку Адресной Книги"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "Добавить адрес(а)"
 
@@ -680,50 +678,50 @@ msgstr "Добавить адрес(а)"
 msgid "Can't add the specified address"
 msgstr "Не удалось добавить указанный адрес"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "Почтовый Адрес"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "_Книга"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Сервис"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Новая _Книга"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "Новая _Папка"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "Новый _vCard"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "Новый _JPilot"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "Добавить _Сервер LDAP"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "_Правка книги"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "_Удалить книгу"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -731,189 +729,189 @@ msgstr "_Удалить книгу"
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "_Выделить всё"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "В_ырезать"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Вставить"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "Новый _Адрес"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "Новая _Группа"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "_Написать Письмо"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "_Объединить"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "Импорт _LDIF файла..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "Импорт M_utt файла..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "Импорт _Pine файла..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "Экспорт в _HTML..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "Экспорт в LDI_F..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Найти дублирующиеся почтовые адреса..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Редактировать пользовательские свойства..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "_Просмотр Записи"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Успешно"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Неверные параметры"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "Не указан файл"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Ошибка открытия файла"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Ошибка чтения файла"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Неожиданный конец файла"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Ошибка выделения памяти"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Неверный формат файла"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Ошибка чтения каталога"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "Не указан путь"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "Ошибка соединения с LDAP сервером"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "Ошибка инициализации LDAP"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "Ошибка соединения с LDAP сервером"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "Ошибка поиска по базе данных LDAP"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "Превышено время ожидания ответа LDAP сервера"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "Ошибка в поисковом запросе LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "Не найдено записей LDAP, удовлетворяющих поисковому запросу"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "LDAP поиск прерван по требованию"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "Ошибка создания STARTTLS соединения"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Характерное Имя (dn) отсутствует"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Отсутствует необходимая информация"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "Существует другой контакт с тем же ключом"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "Требуется более защищённый протокол аутентификации"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Источники"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Поиск"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Удалить группу"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -921,26 +919,26 @@ msgstr ""
 "Действительно удалить группу(ы)?\n"
 "Содержащиеся в ней адреса будут утеряны."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Вставка невозможна. Целевая адресная книга только для чтения."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Невозможно вставить в адресную группу."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Действительно удалить результаты запроса и адреса в '%s'?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -949,20 +947,20 @@ msgstr ""
 "Действительно удалить '%s'? Если удаляется только папка, содержащиеся в ней "
 "адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Удалить _только папку"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Удалить папку и _адреса"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -971,7 +969,7 @@ msgstr ""
 "Действительно удалить '%s'?\n"
 "Содержащиеся в ней адреса будут сохранены."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -980,28 +978,28 @@ msgstr ""
 "Действительно удалить '%s'?\n"
 "Содержащиеся в ней адреса будут утеряны."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Поиск '%s'"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Новые Контакты"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Новый пользователь, не удалось сохранить индексный файл."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь, не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -1009,7 +1007,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1017,7 +1015,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "но созданы пустые файлы новой адресной книги."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1025,7 +1023,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу\n"
 "и создать новый индексный файл."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1033,52 +1031,52 @@ msgstr ""
 "Не удалось преобразовать адресную книгу\n"
 "и создать файлы новой адресной книги."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Ошибка в Адресной Книге"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресной книги"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Идёт поиск..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Адресные Книги"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "LDAP серверы"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "LDAP Запрос"
 
@@ -1162,42 +1160,42 @@ msgstr "Сбор почтовых адресов из выбранных соо
 msgid "Collect email addresses from folder"
 msgstr "Сбор почтовых адресов из папки"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Общие адреса"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Личные адреса"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Общий адрес"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Личный адрес"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Обновить адрес(а)"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "Ошибка обновления. Изменения не записаны в Каталог."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Ошибка"
@@ -1313,7 +1311,7 @@ msgstr "Ваша версия Claws Mail является очень старо
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Ваша версия Claws Mail является очень старой для модуля."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "Ошибка TLS соединения\n"
 
@@ -1333,7 +1331,7 @@ msgstr "неверный ответ SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "ошибка во время SMTP сессии\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "возникла ошибка при аутентификации\n"
 
@@ -1342,7 +1340,7 @@ msgstr "возникла ошибка при аутентификации\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Сообщение слишком большое (Макс. размер %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "не удалось начать STARTTLS сессию\n"
 
@@ -1479,212 +1477,212 @@ msgstr "%d.%02dМБ"
 msgid "%.2fGiB"
 msgstr "%.2fГБ"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Понедельник"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Четверг"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Пятница"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Суббота"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Январь"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Февраль"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Март"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Апрель"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Май"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Июнь"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Июль"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Август"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Сентябрь"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Октябрь"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Ноябрь"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Декабрь"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Вс"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Пн"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Вт"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Ср"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Чт"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Пт"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Сб"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Янв"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Фев"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Мар"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Апр"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Май"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Июн"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Июл"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Авг"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Сен"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Окт"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Ноя"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Дек"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "ДП"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ПП"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "дп"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "пп"
@@ -1701,425 +1699,425 @@ msgstr ""
 "\n"
 "Подпись и шифрования будут отключены для этого сообщения."
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "_Добавить..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Свойства..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Сообщение"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "_Орфография"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "_Параметры"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "От_править"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Отправить _позже"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "_Вложить файл"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "_Вставить файл"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "Вставить по_дпись"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "_Заменить подпись"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "_Печать"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Повторить"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "В_ырезать"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "_Специальная вставка"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Как _цитату"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "_С переносами"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "_Без переносов"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Выделить _всё"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "Д_ополнительно"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "На символ назад"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "На символ вперёд"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "На слово назад"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "На слово вперёд"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "В начало строки"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "В конец строки"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "На предыдущую строку"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "На следующую строку"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Удалить символ слева"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Удалить символ справа"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Удалить слово слева"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Удалить слово справа"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Удалить строку"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Удалить до конца строки"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "_Добавить переносы строк текущего обзаца"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Переносить все длинные _строки"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "Правка в_нешним редактором"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "_Проверить всё или выделенное"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "_Подсветка всех неверных слов"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "Проверить _предыдущие слова"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "_К следующему неверному слову"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "Ответить"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "Система _Конфиденциальности"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "_Приоритет"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Кодировка _символов"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Западно-европейская"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Балтийская"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Арабская"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Кириллица"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Японская"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Китайская"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Корейская"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Тайская"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Адресная книга"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "_Шаблон"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Дейст_вия"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_О Claws Mail"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "Авт_оперенос"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Авто_отступ"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "Под_писать"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "_Зашифровать"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "_Запросить Подтверждение Доставки"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "Удал_ить связи"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Показать _линейку"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "_Обычный режим"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Всем"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Отправителю"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "_Список рассылки"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "_Высочайший"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "Выс_окий"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "Низ_кий"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "_Самый низкий"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Автоматически"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7бит ASCII (US-ASCII)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Юникод (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Центрально-европейская (ISO-8859-2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Неверный формат поля \"От:\" нового сообщения."
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Ошибка формата темы нового сообщения."
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "Ошибка в теле шаблона \"Новое сообщение\", строка %d."
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Не удалось ответить. Вероятно, исходное сообщение не существует."
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "Некорректный почтовый адрес в поле \"От\" шаблона \"Ответить\"."
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Ошибка в теле шаблона \"Ответить\", строка %d."
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "Некорректный почтовый адрес в поле \"От\" шаблона \"Перенаправить\"."
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Ошибка в теле шаблона \"Переслать\", строка %d."
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Fw: несколько писем"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "Ошибка в строке %d тела шаблона \"Перенаправить\"."
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Скрытая копия:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Ответить:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Группы новостей:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Дополнение к:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "В ответе кому:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Кому:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Не удалось вложить файл (ошибка преобразования кодировки)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2137,73 +2135,73 @@ msgstr[2] ""
 "Вложенные файлы:\n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Некорректный \"Символ цитаты\" в шаблоне."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Невозможно определить размер файла '%s'."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, 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 "Вы собираетесь вставить файл размером %s в тело сообщения. Продолжать?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "_Вставить"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пуст."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Пустой файл"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "_Все равно вложить"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "Не удалось прочитать %s."
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Изменено]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Составить сообщение %s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[нет темы] - Составить сообщение%s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Составить сообщение"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2211,62 +2209,62 @@ msgstr ""
 "Учётная запись для отправки почты не указана.\n"
 "Пожалуйста, выберите учётную запись перед отправкой."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "По умолчанию задан только адрес '%s'. Всё равно отправить?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Отправить"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "Получатель не указан."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Тема не указана. %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Всё равно отправить?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Всё равно поставить в очередь на отправку?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "_В очередь"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Отправка %d получателям. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "Не удалось поставить сообщение в очередь на отправку."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2277,7 +2275,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2288,7 +2286,7 @@ msgstr ""
 "\n"
 "Ошибка подписи: %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2299,7 +2297,7 @@ msgstr ""
 "\n"
 "Ошибка шифрования: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2309,7 +2307,7 @@ msgstr ""
 "\n"
 "Ошибка преобразование кодировки."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2319,7 +2317,7 @@ msgstr ""
 "\n"
 "Не удалось получить ключ шифрования."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2328,17 +2326,17 @@ msgstr ""
 "Используйте кнопку \"Отправить сообщения из очереди\" из меню главного окна "
 "для повторной попытки."
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Используйте кнопку \"Отправить сообщения из очереди\" из меню главного окна "
-"для повторной попытки."
+"Вы можете попробовать «Отправить» еще раз или поставить сообщение в очередь "
+"с «Отправить позже»."
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2349,7 +2347,7 @@ msgstr ""
 "в определённую %s кодировку.\n"
 "Отправить как %s?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2362,101 +2360,105 @@ msgstr ""
 "\n"
 "Всё равно отправить?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Предупреждение о кодировке"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "П_родолжить"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "Отсутствует учётная запись для отправки почты!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Выбранная учётная запись не NNTP: Отправка невозможна."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 "Файл %s, который вы вложили в сообщение, больше не существует. Игнорировать?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Отменить черновик"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Отменить отправку"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Игнорировать вложение"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Часть первоисточника %s"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Добавить в адресную _книгу"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Удалить содержимое записи"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Использовать <Tab> для автозавершения из адресной книги"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Mime тип"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "Сохранить Сообщение в "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "_Выбрать"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "Выберите папку для сохранения сообщения"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Загол_овок"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Вложения"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "Проч_ее"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Т_ема:"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2465,19 +2467,19 @@ msgstr ""
 "Не удалось запустить проверку орфографии.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "_От:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Учётная запись используемая для этого сообщения"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Использовать адрес отправителя"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2486,50 +2488,50 @@ msgstr ""
 "Не удалось загрузить систему конфиденциальности '%s'. Вы не сможете "
 "подписать или зашифровать сообщение."
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "_Никакой"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Ошибка в теле шаблона, строка %d."
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Ошибка формата шаблона '%s'."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "MIME тип"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Кодировать"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2538,12 +2540,12 @@ msgstr ""
 "Не удалось записать тело сообщения в файл:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr "Связь через сокет с внешним редактором недоступна в Windows."
 
-#: src/compose.c:9710
+#: src/compose.c:9702
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2554,21 +2556,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Внешний редактор остановлен с ошибкой: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "идентификатор процесса: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "идентификатор процесса: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2579,19 +2576,19 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail требуется доступ к сети для отправки письма."
 
-#: src/compose.c:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "Не удалось сохранить черновик."
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "Не удалось сохранить черновик"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2599,24 +2596,24 @@ msgstr ""
 "Не удалось сохранить черновик.\n"
 "Отказаться от написанного сообщения?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "_Отменить выход"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "_Отказаться от письма"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Файл '%s' не может быть прочитан."
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2625,59 +2622,50 @@ msgstr ""
 "Файл '%s' содержал неверные символы\n"
 "для текущей кодировки, вставка может быть неправильной."
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "Отказаться от сообщения"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "Это сообщение было изменено. Отказаться от него?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Отказаться"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "_Сохранить в Черновики"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Это сообщение было изменено. Сохранить изменения?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "_Не сохранять"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Вы хотите применить шаблон '%s' ?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"Размер вставляемого текста превышает ограничение (%dКБ) для вставки.\n"
-"Вместо этого прикрепите как файл."
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2695,20 +2683,20 @@ msgstr[2] ""
 "Вы хотите вставить содержимое %d файлов в тело сообщения или вложить "
 "(прикрепить) в письмо?"
 
-#: src/compose.c:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "Вставить или вложить?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "_Вложить"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Неверный формат цитирования в строке %d."
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2927,7 +2915,7 @@ msgid " Check File "
 msgstr " Проверить Файл "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Файл"
 
@@ -2972,12 +2960,12 @@ msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Новая папка"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -3005,13 +2993,13 @@ msgstr "Добавить Новый Элемент JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Правка LDAP - Выбрать Базу Поиска"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Имя узла"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Порт"
@@ -3072,7 +3060,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3200,11 +3188,11 @@ msgstr "Имена 'содержащие' поисковый термин"
 
 #: src/editldap.c:636
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using \"begins-"
+"with\" or \"contains\" search term. Check this option to perform a "
+"\"contains\" search; this type of search usually takes longer to complete. "
+"Note that for performance reasons, address completion uses \"begins-with\" "
+"for all searches against other address interfaces."
 msgstr ""
 "Поиски имён и адресов могут быть выполнены используя \"начинается с\" или "
 "\"содержит\" с искомым термином. Включение опции для выполнения поиска "
@@ -3236,8 +3224,8 @@ msgstr "Пароль"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Пароль используется при соединении \"Привязка DN\" пользователя."
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Показать пароль"
@@ -3260,11 +3248,11 @@ msgid ""
 msgstr ""
 "Максимальное число записей, которые должны возвращаться в результат поиска."
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Основные"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Расширенный"
 
@@ -3282,8 +3270,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "Изменить теги"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Тег"
 
@@ -3411,15 +3399,15 @@ msgstr "Результирующий HTML Файл"
 msgid "B_rowse"
 msgstr "П_росмотр"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Таблица стилей"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Никакой"
 
@@ -3627,10 +3615,10 @@ msgid ""
 "available RDN options that will be used to create the DN."
 msgstr ""
 "LDIF файл содержит несколько записей данных, которые обычно загружены на "
-"LDAP сервере. Каждая запись в LDIF файле имеет уникальную идентификацию"
-"\"Характерное Имя\" (или DN). Суффикс прикрепляется к  \"Относительному "
-"Характерному Имени\" (или RDN) для создания DN. Выберите одну из доступных "
-"опций RDN, которые используются для создания DN."
+"LDAP сервере. Каждая запись в LDIF файле имеет уникальную "
+"идентификацию\"Характерное Имя\" (или DN). Суффикс прикрепляется к  "
+"\"Относительному Характерному Имени\" (или RDN) для создания DN. Выберите "
+"одну из доступных опций RDN, которые используются для создания DN."
 
 #: src/expldifdlg.c:531
 msgid "Use DN attribute if present in data"
@@ -3668,7 +3656,7 @@ msgstr "Экспорт Адресной Книги в LDIF Файл"
 msgid "Distinguished Name"
 msgstr "Характерное Имя"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "Экспорт в mbox файл"
 
@@ -3853,8 +3841,8 @@ msgstr ""
 #: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account "
+"[id=%d, name='%s']\n"
 msgstr ""
 "правило относится к учётной записи [id=%d, name='%s'], не соответствует "
 "текущей учётной записи [id=%d, name='%s']\n"
@@ -3947,61 +3935,61 @@ msgstr ""
 "фильтрация сообщения (%s%s%s)\n"
 "%sфайл сообщения: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Обработка (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Копирование %s в %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Перенос %s в %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Обновление кэша для %s..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "Обработка сообщений..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Синхронизировать %s для автономного использования...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Имя папки не может начинаться или заканчиваться точкой."
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "Имя папки не может заканчиваться пробелом."
 
@@ -4010,7 +3998,7 @@ msgid "Select folder"
 msgstr "Выбрать папку"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "Новая папка"
 
@@ -4021,99 +4009,103 @@ msgstr "Наследовать свойства и правила обработ
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' не может быть включено в имя папки."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Папка '%s' уже существует."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Невозможно создать папку '%s'."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "Пометить все как п_рочтённые"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Пометить все как не_прочтённые"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Рекурсивно пометить все как п_рочтённые"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Рекурсивно пометить все как непрочтённые"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "Зап_устить обработку"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Поиск в папке..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Открыть при запуске"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "Обрабо_тка..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "Очистить _корзину..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Отправить _очередь..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Установить Отображаемые столбцы"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Новые"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Непрочтённые"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Всего"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Настройка информации папки..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Пометить все как прочтённые"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4121,15 +4113,15 @@ msgstr ""
 "Вы действительно хотите пометить все письма в этой папке и ее подпапках как "
 "прочитанные?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Действительно пометить все сообщения данной папки как прочтённые?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Пометить все как непрочтённые"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
@@ -4137,93 +4129,93 @@ msgstr ""
 "Вы действительно хотите пометить все письма в этой папке и ее подпапках как "
 "непрочитанные?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Действительно пометить все сообщения в данной папке как непрочтённые?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Сканирование папки %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Сканирование папки %s..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Перестройка дерева папок удалит локальные кэши. Продолжить?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Перестраивается дерево папок..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Сканирование дерева папок..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Не удалось просмотреть папку %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяется наличие новых сообщений во всех папках..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Закрытие папки %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Открывается папка %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "Папка не может быть открыта."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Очистить корзину"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Удалить все сообщения в корзине?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "_Очистить корзину"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Автономная работа"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Вы работаете автономно. Подключиться?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Отправить сообщение(я) из очереди"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Отправить все сообщения из очереди?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Возникли ошибки при отправке сообщений из очереди."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4232,64 +4224,64 @@ msgstr ""
 "Возникли ошибки при отправке сообщений из очереди:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Действительно копировать папку '%s' в '%s' ?"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Вы действительно хотите сделать папку '%s' подпапкой '%s'?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Копировать папку"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Переместить папку"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Копирование %s в %s..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Перенос %s в %s..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "Источник совпадает с приёмником."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "Невозможно копировать папку в одну из её подпапок."
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "Невозможно переместить папку в одну из её подпапок."
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Невозможно перемещение папок из одного почтового ящика в другой."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "Произошла ошибка копирования!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "Перенос не удался!"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Параметры обработки для папки %s"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Папка назначения может содержать только другие папки."
 
@@ -4334,8 +4326,8 @@ msgid "read-only"
 msgstr "только для чтения"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -4376,13 +4368,13 @@ msgstr ""
 "GPL. Если Вы хотите оказать безвозмездную помощь проекту Claws Mail, Вы "
 "можете сделать это на:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Авторские права (C) 1999-2022\n"
+"Авторские права (C) 1999-2023\n"
 "Команда разработчиков Claws Mail\n"
 "и Хироюки Ямамото"
 
@@ -4417,7 +4409,7 @@ msgstr ""
 "Локаль: %s (набор символов: %s)\n"
 "Операционная Система: неизвестна"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Команда Claws Mail"
 
@@ -4541,73 +4533,78 @@ msgstr ""
 "Вместе с данной программой вы должны были получить экземпляр GNU General "
 "Public License. Если нет, смотрите "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Статистика по сессиям\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Начало: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Входящий трафик\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Полученные сообщения: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "Спам-сообщения: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Исходящий трафик\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Новые/переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Сообщений-ответов: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Всего исходящих сообщений: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "О программе Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "_Информация"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Авторы"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "_Возможности"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Лицензия"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "_О релизе"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "_Статистика"
 
@@ -4814,7 +4811,7 @@ msgid "Configuring..."
 msgstr "Настройка..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Дата"
@@ -4823,9 +4820,9 @@ msgstr "Дата"
 msgid "Date:"
 msgstr "Дата:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "От"
@@ -4846,9 +4843,9 @@ msgstr "Отправитель:"
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Кому"
@@ -4884,9 +4881,9 @@ msgstr "Связи"
 msgid "References:"
 msgstr "Связи:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Тема"
@@ -4896,7 +4893,7 @@ msgstr "Тема"
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Комментарии"
 
@@ -5010,8 +5007,8 @@ msgid "Seen:"
 msgstr "Seen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Статус"
@@ -5084,7 +5081,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Организация"
 
@@ -5404,9 +5401,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5420,7 +5416,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5435,7 +5431,7 @@ msgstr "_Загрузить..."
 msgid "_Unload"
 msgstr "_Выгрузить"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Описание"
 
@@ -5459,8 +5455,8 @@ msgid "Loaded plugins"
 msgstr "Загруженные модули"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "_Применить"
 
@@ -5473,10 +5469,10 @@ msgid "_Hide"
 msgstr "_Скрыть"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Учётная запись"
@@ -5547,17 +5543,17 @@ msgid "forwarded messages"
 msgstr "перенаправленные сообщения"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "сообщения содержащие вложения"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "сообщения, содержащие S в любом заголовке или значении"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "сообщения, содержащие S в любом заголовке"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "сообщения содержащие вложения"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "сообщения, содержащие S в заголовке идентификатора сообщения"
@@ -5647,18 +5643,18 @@ msgid "unread messages"
 msgstr "непрочтённые сообщения"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "сообщения, содержащие V в заголовке H"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "сообщения, содержащие S в заголовке Связи"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "сообщения возвращающие 0 при передаче команды - %F файл сообщения"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "сообщения, содержащие S в заголовке X-Label"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "оператор логического И"
@@ -5708,55 +5704,55 @@ msgstr ""
 "Что-то пошло не так во время поиска. Пожалуйста, проверьте ваши журналы "
 "событий."
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "От/Кому/Сс/Тема/Тег"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Рекурсивно"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Прилипающий"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Опережающий ввод"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Перейти на выбранное"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "Очистить"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Очистить текущий поиск"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Правка критерия поиска"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Информация"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Информация о дополнительных символах"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "Р_едактировать"
 
@@ -5935,16 +5931,16 @@ msgstr "(Нет поля 'Тема')"
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Размер файла:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Загрузить Изображение"
 
@@ -6136,7 +6132,7 @@ msgstr "Ошибка TLS"
 msgid "Unknown error [%d]"
 msgstr "Неизвестная ошибка [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6148,7 +6144,7 @@ msgstr ""
 "CRAM-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен CRAM-MD5 SASL модуль."
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6160,7 +6156,7 @@ msgstr ""
 "DIGEST-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен DIGEST-MD5 SASL модуль."
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6172,7 +6168,55 @@ msgstr ""
 "SCRAM-SHA-1 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен SCRAM SASL модуль."
 
-#: src/imap.c:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-224 логин работает только, если libetpan собран с поддержкой SASL "
+"и установлен SCRAM SASL плагин."
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-226 логин работает только, если libetpan собран с поддержкой SASL "
+"и установлен SCRAM SASL плагин."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-384 логин работает только, если libetpan собран с поддержкой SASL "
+"и установлен SCRAM SASL плагин."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-512 логин работает только, если libetpan собран с поддержкой SASL "
+"и установлен SCRAM SASL плагин."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6184,7 +6228,7 @@ msgstr ""
 "PLAIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен PLAIN SASL модуль."
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6196,7 +6240,7 @@ msgstr ""
 "LOGIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен LOGIN SASL модуль."
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6206,36 +6250,36 @@ msgstr ""
 "\n"
 "Ошибка OAuth2. Проверьте и исправьте настройки учетной записи OAuth2."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Соединение с %s прошло неудачно"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP соединение с %s было разорвано. Повторное подключение...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail необходимо сетевое подключение для доступа к серверу IMAP."
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Незащищенное подключение"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6248,108 +6292,108 @@ msgstr ""
 "\n"
 "Продолжить подключение к серверу? Соединение не будет безопасным."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Прод_олжить подключение"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Учётная запись '%s': Подключение к IMAP серверу: %s:%d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Не удалось подключиться к IMAP серверу: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Не удалось подключиться к IMAP серверу: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "Не удалось начать STARTTLS сессию.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Не удалось подключиться к серверу IMAP %s.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Не удалось подключиться к серверу IMAP %s."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "Добавление сообщения..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Копирование сообщения..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "Поиск прерван из-за ошибки сервера."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "невозможно установить флаг удаления\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "невозможно стереть\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Поиск подписанных папок в %s..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ищутся подпапки %s..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удалось создать почтовый ящик: LIST завершился с ошибкой\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "не удалось создать почтовый ящик\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удалось переименовать почтовый ящик: %s в %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "не удалось удалить почтовый ящик\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "LIST завершился с ошибкой\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "Помечаются сообщения..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Сервер требует STARTTLS для входа.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "Не удалось обновить.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6358,20 +6402,24 @@ msgstr ""
 "Не удалось соединиться с %s: сервер требует STARTTLS, но Claws Mail собран "
 "без поддержки STARTTLS.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "Сбой входа на сервер.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "Получение сообщения..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Стирание удалённые сообщений..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "невозможно установить флаг удаления: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6401,7 +6449,7 @@ msgid "Cop_y folder..."
 msgstr "Копиро_вать папку..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "_Удалить папку..."
 
@@ -6421,7 +6469,7 @@ msgstr "П_одписки"
 msgid "_Subscribe..."
 msgstr "_Подписаться..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "_Отписаться..."
 
@@ -6453,21 +6501,21 @@ msgstr ""
 "а не писем, то добавьте '/' в конце имени)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Введите новое имя для '%s':"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6486,7 +6534,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "Выберите, куда следует скопировать папку '%s'"
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6500,8 +6548,8 @@ msgstr ""
 "Действительно хотите удалить папку?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не удалось удалить папку '%s'."
@@ -6809,8 +6857,8 @@ msgstr "Сбой подключения"
 msgid "Auth failed"
 msgstr "Ошибка аутентификации"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Заблокирован"
 
@@ -6983,8 +7031,8 @@ msgstr "Слияние отменено\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "секунд"
 
@@ -7049,7 +7097,7 @@ msgstr "Ошибка LDAP (поиск): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Псевдоним"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7058,7 +7106,7 @@ msgstr ""
 "Файл '%s' уже существует.\n"
 "Невозможно создать папку."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7067,7 +7115,7 @@ msgstr ""
 "Настройки для %s найдены.\n"
 "Вам необходим перенос этих настроек?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7080,11 +7128,11 @@ msgstr ""
 "Ваши правила фильтрации от Sylpheed могут быть импортированы\n"
 "с помощью скрипта, доступного по адресу %s."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Оставить старую конфигурацию"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7094,27 +7142,27 @@ msgstr ""
 "может потребовать некоторого времени в случае если у вас много кэшированных "
 "данных IMAP или NNTP, а так же потребует дополнительное место на диске."
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Перенос настроек"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Копирование настроек... Это может занять некоторое время..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Перенос не удался!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Перенос настроек..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(или старше)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7134,7 +7182,7 @@ msgstr[2] ""
 "Сбой при загрузке ниже перечисленных модулей. Проверьте настройку модулей.\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7145,7 +7193,7 @@ msgstr ""
 "выбрать в \"Перестроить дерево папок\" из контекстного меню верхней папки "
 "учётной записи."
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7155,76 +7203,76 @@ msgstr ""
 "Возможно это вызвано сбоем устаревшего модуля. Переустановите модуль и "
 "попробуйте снова."
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Не указано имя файла\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "Не удалось открыть файл для чтения\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Некорректный заголовок\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Лишний заголовок 'To:'\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "Отсутствует необходимая заголовок 'To:'\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Попробуйте -h или --help для вывода справки.\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Отсутствует файл аргумент для опции %s"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Отсутствует или пустой URI аргумент для опции %s"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Отсутствует URI аргумент для опции %s"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "Отсутствует хотя бы один непустой аргумент файла для опции %s"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "Отсутствует папка, тип и аргументы запроса для опции %s"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Отсутствуют аргументы типа и запроса для опции %s"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Отсутствует необходимый аргумент или опция %s"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Использование: %s [ОПЦИЯ]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрес]      открыть окно составления сообщения"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7243,11 +7291,11 @@ msgstr ""
 "затем\n"
 "                         пустая строка и дальше тело письма."
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe uri       подписаться на указанный URI, если возможно"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7257,7 +7305,7 @@ msgstr ""
 "                         открыть составление сообщения с вложением\n"
 "                         указанных файлов"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7267,24 +7315,24 @@ msgstr ""
 "                         открыть составление сообщения с вложением\n"
 "                         указанных файлов"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive              получить новые сообщения"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          получить новые сообщения во всех учётных записях"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving      отменить получение сообщения"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending        отменить отправку сообщений"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7304,15 +7352,15 @@ msgstr ""
 "                         рекурсивно: 0, n, N, f или F запрещает поиск во "
 "вложенных папках"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 отправить все сообщения из очереди"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]       показать общее количество сообщений"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7320,15 +7368,15 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         показать статус каждой папки"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           отображать статистику сессии"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     сбросить статистику сессии"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7338,46 +7386,46 @@ msgstr ""
 "                         папка - это запись вида 'папка/подпапка', file:// "
 "URI или абсолютный путь"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online               переключиться в подключённый режим"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              переключиться в автономный режим"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       выйти из Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             режим отладки"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug           режим отладки"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              показать эту справку"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           показать информацию о версии"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      показать информацию о версии и поддерживаемых "
 "возможностях"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           показать каталог с настройками"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7385,7 +7433,7 @@ msgstr ""
 "  --alternate-config-dir директория\n"
 "                         использовать указанный каталог с настройками"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7393,48 +7441,48 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         установить геометрию основного окна"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Отсутствует аргумент каталога для опции %s"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Отсутствует аргумент геометрии для опции %s"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Отсутствует аргумент папки для опции %s"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Неизвестная опция %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Обработка (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "папка верхнего уровня"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Сообщения в очереди"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди имеются неоправленные сообщения. Выйти?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: сеть доступна.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: сеть недоступна.\n"
 
@@ -7618,11 +7666,11 @@ msgstr "Следующей непрочтённой _папке"
 msgid "F_older..."
 msgstr "П_апка..."
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Следующая часть"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Предыдущая часть"
 
@@ -7864,7 +7912,7 @@ msgstr "Те_ги"
 msgid "Re-_edit"
 msgstr "Заново _отредактировать"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "Проверить подпись"
 
@@ -8069,7 +8117,7 @@ msgstr "Заголовки столбцов"
 msgid "Th_read view"
 msgstr "Пр_осмотр в виде цепочек"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Скрыть прочтённые цепочки"
 
@@ -8077,7 +8125,7 @@ msgstr "Скрыть прочтённые цепочки"
 msgid "_Hide read messages"
 msgstr "_Скрыть прочтённые"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Скрыть удалённые сообщения"
 
@@ -8189,11 +8237,11 @@ msgstr "По блокировке"
 msgid "D_on't sort"
 msgstr "Н_е сортировать"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "По возрастанию"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "По убыванию"
 
@@ -8201,7 +8249,7 @@ msgstr "По убыванию"
 msgid "_Auto detect"
 msgstr "_Автоопределение"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Изменить теги..."
 
@@ -8241,7 +8289,7 @@ msgstr "журнал фильтрации выключен\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Безымянный"
 
@@ -8249,19 +8297,19 @@ msgstr "Безымянный"
 msgid "none"
 msgstr "никакой"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения в корзине?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "Отменить выход"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8275,18 +8323,18 @@ msgstr ""
 "Если указан существующий почтовый ящик, он\n"
 "будет проверен автоматически."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8296,51 +8344,51 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или у вас нет прав на запись в "
 "указанный каталог."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Отправлять не разрешено"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Ошибка импорта mbox файла."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Неудачный экспорт в mbox файл."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Выйти из Claws Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "_Выход"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Синхронизация папок"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Вы хотите синхронизировать ваши папки сейчас?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "_Синхронизировать"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Удаление копий сообщений..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "В выбранной папке дубликатов сообщений не найдено.\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8348,7 +8396,7 @@ msgstr[0] "Удален %d дубликат сообщений в выбранн
 msgstr[1] "Удалено %d дубликата сообщений в выбранной папке.\\\n"
 msgstr[2] "Удалено %d дубликатов сообщений в выбранной папке.\\\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, 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"
@@ -8356,11 +8404,11 @@ msgstr[0] "Помечен %d дубликат сообщений для удал
 msgstr[1] "Помечено %d дубликата сообщений для удаления в выбранной папке.\n"
 msgstr[2] "Помечено %d дубликатов сообщений для удаления в выбранной папке.\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Удаление дубликатов сообщений во всех папках..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8368,50 +8416,50 @@ msgstr[0] "Удалено %d копий сообщения в %d папках.\n
 msgstr[1] "Удалено %d копии сообщений в %d папках.\n"
 msgstr[2] "Удалено %d копий сообщений в %d папках.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Не найдено дубликатов сообщений в %d папках.\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Выберите папку для перехода"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Обработка правил для применения перед правилами папки"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "Обработка правил для применения после правил папки"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Настройка фильтрации"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: не удалось "
 "определить путь к программе."
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail установлен в качестве почтового клиента по умолчанию."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: невозможно "
 "произвести запись в реестр."
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Сканирование папки %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8419,52 +8467,52 @@ msgstr[0] "Забыт %d пароль %d учётной записи\n"
 msgstr[1] "Забыто %d пароля %d учётных записей\n"
 msgstr[2] "Забыто %d паролей %d учётных записей\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "%s заголовок"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "заголовок"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "строка заголовка"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "строка тела сообщения"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "тег"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Учитывая регистр"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "Не учитывая регистр"
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "проверка совпадения сообщения с [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "совпадение найдено\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "совпадение не найдено\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(нет)"
 
@@ -8502,7 +8550,7 @@ msgstr "Перезаписать mbox файл"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Этот файл уже существует. Переписать его?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Перезаписать"
 
@@ -8735,8 +8783,8 @@ msgstr ""
 "\n"
 "  Сообщение было удалено или перемещено в другую папку"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "При обучении произошла ошибка.\n"
 
@@ -8776,63 +8824,67 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Открыть"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "Открыть с _помощью..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "Отправить..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "_Показать как текст"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "_Сохранить как..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "Сохранить _все..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Сохраните все вложения..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "Тип MIME"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Показать всю информацию"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Проверить снова"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Щёлкните по значку для проверки."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Щёлкните по значку или нажмите '%s' для проверки."
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Время ожидания проверки подписи истекло. Щёлкните по значку для повторения."
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8840,39 +8892,39 @@ msgstr ""
 "Время ожидания проверки подписи истекло. Щёлкните по значку или нажмите '%s' "
 "для повторения."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr ""
 "Время ожидания проверки подписи истекло. Щёлкните по значку для повторения."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Время ожидания проверки подписи истекло. Щёлкните по значку или нажмите '%s' "
 "для повторения."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "Проверка подписи..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "Вернуться к письму"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Не удалось сохранить часть составного сообщения: %s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Перезаписать существующий файл '%s'?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
 #, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
@@ -8881,19 +8933,19 @@ msgstr ""
 "Произошла ошибка при сохранении части сообщения %d. Вы хотите отменить "
 "сохранение или проигнорировать ошибку и продолжить?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "Ошибка сохранения части сообщения"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "Игнорировать все"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8901,7 +8953,7 @@ msgstr[0] "%d файл сохранен успешно."
 msgstr[1] "%d файла сохранено успешно."
 msgstr[2] "%d файлов сохранено успешно."
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8909,7 +8961,7 @@ msgstr[0] "%d файл сохранен успешно"
 msgstr[1] "%d файла сохранено успешно"
 msgstr[2] "%d файлов сохранено успешно"
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8917,26 +8969,26 @@ msgstr[0] "%s, %d файл сохранён неудачно."
 msgstr[1] "%s, %d файла сохранено неудачно."
 msgstr[2] "%s, %d файлов сохранено неудачно."
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Выберите папку назначения"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' не является каталогом."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Сохранить как"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Открыть с помощью"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8945,7 +8997,7 @@ msgstr ""
 "Введите команду для открытия файла:\n"
 "('%s' будет заменено на имя файла)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8956,11 +9008,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Запустить программу?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8972,20 +9024,20 @@ msgstr ""
 "\n"
 "Вы уверены, что хотите запустить этот файл?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "Запустить программу"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9096,77 +9148,77 @@ msgstr "Отписаться от группы новостей"
 msgid "Rename newsgroup folder"
 msgstr "Переименовать папку группы новостей"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 отсутствует код аутентификации\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 ошибка соединения\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "OAuth2 TLS ошибка соединения\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2 токен доступа получен\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2 токен доступа не получен\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2 обновлённый токен получен\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2 обновлённый токен не получен\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "OAuth2 обновлённый токен получен\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "OAuth2 обновлённый токен не получен\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 ошибка записи сокета\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 ошибка превышения времени ожидания сокета\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 токен доступа еще действительный\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 получение токена доступа с использованием токена обновления\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 пытается получить новый токен доступа с кодом авторизации\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 токен доступа и обновления обновлен\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 оригинал: %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 зашифрованный: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9175,11 +9227,11 @@ msgstr ""
 "OAuth2 расшифрованный: %s\n"
 "\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Введите основную парольную фразу"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Неверный основную парольную фразу."
 
@@ -9598,7 +9650,7 @@ msgstr "Да"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Нет"
 
@@ -9615,7 +9667,7 @@ msgid "Delete selected files"
 msgstr "Удалить выбранные файлы"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Выбирать письма старше"
 
@@ -9628,97 +9680,97 @@ msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Выберите имя файла архива [расширение должно отражать архив, например .zip]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld из %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Создать Архив"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Параметры Архиватора"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Папка для архивации"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Корень архива"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Выбрать папку, которая будет \"корнем\" архива"
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Имя архива"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Расположение и имя архива"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Выбрать"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr "Выбрать имя и расположение архива"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Формат сжатия"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Выберите эту опцию, чтобы использовать сжатие %s для архива"
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Формат архива"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Выберите это, чтобы использовать %s в качестве формата для архива"
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Дополнительные настройки"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Рекурсивно"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Включать в архив вложенные папки"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9728,11 +9780,11 @@ msgstr ""
 "Это позволит проверить целостность архива в дальнейшем,\n"
 "но может значительно замедлить его создание"
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "П_ереименовать"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9743,7 +9795,7 @@ msgstr ""
 "Имена файлов будут иметь формат дата_отправитель@адресат@тема.\n"
 "Имена будут обрезаны до 96 символов"
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9751,11 +9803,11 @@ msgstr ""
 "Удалить сообщения после архивации\n"
 "Поддерживаются ящики IMAP4, mbox и POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Настройки выбора сообщений"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9847,7 +9899,7 @@ msgstr "Удалить вложения"
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Вложенный файл"
@@ -10011,19 +10063,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Исключая"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -10033,15 +10085,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Любой"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: получение тел сообщений..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: фильтрация сообщений..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -10053,7 +10105,7 @@ msgstr ""
 "Пометить как спам\" и \"/Пометить/Пометить как не спам\" для обучения "
 "Bogofilter на нескольких сотнях полезных и содержащих спам сообщений."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -10062,21 +10114,21 @@ msgstr ""
 "Модуль Bogofilter не смог отфильтровать сообщение. Не удалось выполнить "
 "команду `%s %s %s`."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: идёт обучение..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Обучение не удалось; `%s` возвращён код состояния %d."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: идёт обучение..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10085,7 +10137,7 @@ msgstr ""
 "Обучение не удалось; `%s %s %s` вернуло ошибку:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10111,13 +10163,13 @@ msgstr ""
 "\n"
 "Настройки находятся в /Настройки/Параметры/Модули/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Обнаружение спама"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Обучить, что это спам"
 
@@ -10141,7 +10193,7 @@ msgstr "Сообщения превышающий указанный разме
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "КБ"
 
@@ -10249,19 +10301,19 @@ msgstr "Путь к исполняемому файлу bogofilter"
 msgid "Mark spam as read"
 msgstr "Пометить спам как прочтённый"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter (антиспам)"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: получение тела сообщения..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: обработка сообщения..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10273,20 +10325,20 @@ msgstr ""
 "Для обучения используйте \"Пометить как спам\" и \"Пометить как не спам\" на "
 "паре сотен сообщениях."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
-"Сообщение не было проверено модулем Bsfilter. Не удалось запустить команду `"
-"%s`."
+"Сообщение не было проверено модулем Bsfilter. Не удалось запустить команду "
+"`%s`."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: обучение..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10628,65 +10680,52 @@ msgstr ""
 "\n"
 "Бесполезен для практического применения."
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Отображать изображения"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Отображать внедрённый изображения"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Выполнять JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Выполнять внедрённый javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Выполнять Java апплеты"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Выполнять внедрённые Java апплеты"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Прорисовка объектов используя модули"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Прорисовка внедрённых объектов  используя модули"
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Открыть в Просмотрщике (внешнее содержимое включено)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "Ничего не делать (внешнее содержимое отключено)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Прокси"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "Использовать настройки прокси из GNOME"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "Использовать прокси"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Внешние ресурсы"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10700,115 +10739,120 @@ msgstr ""
 "Java-апплеты могут быть включены для содержимого, которое прикреплено\n"
 "к почтовому сообщению."
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Включить загрузку внешнего содержимого"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "При нажатии на ссылку, по умолчанию"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Открывать во Внешнем Браузере"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "CSS в этом файле будет применяться для всех частей HTML"
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Просмотр"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Выберите таблицу стилей"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "Загрузка внешнего содержимого отключена."
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Загружать изображения"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Отображать внешнее содержимое"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Разрешить JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Разрешить Модули"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Разрешить Java"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Открывать ссылки во внешнем браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Произошла ошибка: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "Поток %s имеет некорректный или неподдерживаемый формат"
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Открыть в Просмотрщике"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Открыть в Браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Открыть Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Копировать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Скачать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Сохранить Изображение Как"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Копировать Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Импортировать поток"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Fancy"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "Не удалось найти сопутствующее расширение WebKit %s"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Просмотрщик"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10911,188 +10955,6 @@ msgstr ""
 "Добавить заголовок X-FETCH-TIME с датой и временем получения сообщения в "
 "формате RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "GData модуль: Требуется авторизация"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"Вы должны авторизовать Claws Mail для доступа к списку контактов Google, "
-"чтобы использовать модуль GData.\n"
-"\n"
-"Посетите страницу авторизации Google, нажав на кнопку ниже. После того как "
-"вы подтвердили разрешение, вы получите код авторизации. Введите этот код в "
-"поле ниже, чтобы предоставить доступ Claws Mail к списку контактов Google."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "Шаг 1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr "Нажмите здесь, чтобы открыть страницу авторизации Google в браузере"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "Шаг 2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Введите код:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "GData модуль: Ошибка запроса контактов: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "Добавить %d из"
-msgstr[1] "Добавить %d из"
-msgstr[2] "Добавить %d из"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "%d контакта в кэш"
-msgstr[1] "%d контактов в кэш"
-msgstr[2] "%d контактов в кэш"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "GData модуль: Запуск синхронизации запроса контактов\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "GData модуль: Ошибка запроса групп: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "GData модуль: Группы получены\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "GData модуль: Запуск синхронизации групповых запросов\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData модуль: Ошибка авторизации: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "GData модуль: Авторизация успешна\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData модуль: Начинается интерактивная авторизация\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData модуль: Получен код авторизации, запрашивается авторизация\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"GData модуль: Не получен код авторизации, запрос на авторизацию отменен\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"GData модуль: Интерактивная авторизация все еще запущена, используется "
-"текущая сессия\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData модуль: Ошибка обновления авторизации: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData модуль: Обновление авторизации успешно\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr "GData модуль: Время последнего обновления: %d минут, обновляю сейчас\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData модуль: Попытка обновить авторизацию\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Аутентификация"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Имя пользователя:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Интервал опроса (секунды):"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Максимальное количество результатов:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Не удалось зарегистрировать hook для 'address completion' в модуле GData"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "Не удалось зарегистрировать hook на 'offline switch' для GData модуля"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Этот модуль обеспечивает доступ к протоколу GData для Claws Mail.\n"
-"\n"
-"Протокол GData представляет собой интерфейс к сервисам Google.\n"
-"В настоящее время реализован функционал, позволяющий только включить "
-"контакты из Google в автозаполнение адресов.\n"
-"\n"
-"Пожелания и предложения отправлять по адресу <berndth at gmx.de>."
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "Интеграция GData"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11259,8 +11121,8 @@ msgid "Cache refresh interval"
 msgstr "Период обновления кэша"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "часов"
 
@@ -11408,11 +11270,11 @@ msgstr "Размер кэша изображений в мегабайтах"
 msgid "Default font"
 msgstr "Шрифт по умолчанию"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Открыть Ссылку"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Копировать Ссылку"
 
@@ -11508,7 +11370,7 @@ msgstr "Метод аутентификации не доступен"
 msgid "sending error on Sieve session: %s\n"
 msgstr "сообщение ошибки сессии Sieve: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Фильтровать"
 
@@ -11641,7 +11503,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Включить Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Информация о сервере"
 
@@ -11677,8 +11539,12 @@ msgstr "Использовать STARTTLS, когда доступно"
 msgid "Require STARTTLS"
 msgstr "Требовать STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Аутентификация"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Без аутентификации"
 
@@ -11692,28 +11558,28 @@ msgstr "Укажите аутентификацию"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "Пользователь"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Пароль"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Метод аутентификация"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -12025,7 +11891,7 @@ msgid "Never"
 msgstr "Никогда"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Всегда"
 
@@ -12636,9 +12502,9 @@ msgstr "Срок действия истекает через"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Значение '0' будет сохранять парольную фразу в течение всей сессии"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "минут"
 
@@ -12849,109 +12715,109 @@ msgstr "Неверная подпись от \"%s\""
 msgid "The signature has not been checked"
 msgstr "Подпись не была проверена"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "Ошибка при проверке подписи: отсутствует статус\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Ошибка при проверке подписи: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Подписано на %s использует %s идентификатор ключа %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Действительная подпись от uid \"%s\" (Период действия: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Просрочен ключ uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Просроченная подпись от uid \"%s\" (Период действия: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Отозванный uid ключа \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "НЕВЕРНАЯ подпись от \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Период действия: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "Отозванный"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Доверие Владельца: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Нет ключа!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Отпечаток главного ключа:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "ВНИМАНИЕ: Адрес подписавшего \"%s\" не соответствует формату DNS\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Проверенный адрес подписавшего \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Не удалось получить данные для сообщения, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Не удалось инициализировать данные, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "Неоднозначные характеристики секретного ключа"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Секретный ключ не найден (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Неверные настройки секретного ключа: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Невозможно использовать протокол Gpgme '%s': движок '%s' не был установлен "
 "должным образом."
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12960,12 +12826,12 @@ msgstr ""
 "Невозможно использовать протокол Gpgme '%s': установлен движок '%s' версии "
 "'%s' в то время, как требуется версия '%s'.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Невозможно использовать протокол Gpgme '%s' (неизвестная проблема)"
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12973,7 +12839,7 @@ msgstr ""
 "GnuPG не установлен или должен быть обновлён.\n"
 "Поддержка OpenPGP отключена."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12981,11 +12847,11 @@ msgstr ""
 "Вы должны сохранить информацию учётной записи с помощью кнопки \"ОК\" прежде "
 "чем Вы сможете сгенерировать пару ключей.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "Не найден PGP ключ"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -12995,12 +12861,12 @@ msgstr ""
 "подписывать свои сообщения и получать зашифрованные сообщения от других.\n"
 "Хотите ли вы сейчас создать новую пару ключей?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Не удалось сгенерировать новую пару ключей: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -13008,11 +12874,11 @@ msgstr ""
 "Генерируется новая пара ключей... Пожалуйста, подвигайте мышкой для создания "
 "дополнительной энтропии..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Не удалось сгенерировать новую пару ключей: неизвестная ошибка"
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13025,15 +12891,15 @@ msgstr ""
 "\n"
 "Хотите ли вы экспортировать его на сервер ключей?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Ключ генерируется"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Ключ экспортируются."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "Не удалось экспортировать ключ."
 
@@ -13241,12 +13107,12 @@ msgid "Show Python console..."
 msgstr "Показать Python консоль..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Просмотр"
@@ -13365,27 +13231,27 @@ msgstr ""
 "Не удалось прочитать содержимое старого файла feeds.xml:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 "RSSyl: Ошибка в процессе записи '%s' в список экспортирования потока.\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Не удалось удалить старый OPML файл '%s': %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr "RSSyl: Не удалось открыть файл '%s' для экспорт списка потоков: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Ошибка при экспортировании потока в файл.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13398,7 +13264,7 @@ msgstr ""
 "\n"
 "Имя папки '%s' не допустимо."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13413,140 +13279,140 @@ msgstr ""
 "содержимым, полученным из сети. Вы можете читать и удалять или сохранять "
 "старые записи."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "RSS поток"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(пусто)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Обновить все подписки"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Подписаться на поток"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Введите адрес потока, на который вы хотите подписаться:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' не может использоваться в имени папки."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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 нужен доступ к сети, чтобы обновить поток."
 msgstr[1] "Claws Mail нужен доступ к сети, чтобы обновить потоки."
 msgstr[2] "Claws Mail нужен доступ к сети, чтобы обновить потоки."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Вы действительно хотите удалить дерево потока `%s' ?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Удалить дерево потока"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "Выберите OPML файл"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: Подписка на новый поток: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: Подписан новый поток: '%s' (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Обновляется поток: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Обновлён поток %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: Ошибка получения потока на '%s': %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: Не найден действующий поток на '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: Не удалось обработать поток '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 "RSSyl: Приложение завершает работу, невозможно закончить обновление канал на "
 "'%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "Простая HTTP аутентификация"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Использовать период обновления по умолчанию"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Сохранять старые новости"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "_Подравнять"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Обновить поток и удалить новости, которые больше не в потоке источника"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Получать комментарии, если возможно"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Всегда помечать как новое"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "Помечать как новое только если текст изменился"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "Никогда не помечать как новое"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "Добавить заглавие записи в верхнюю часть сообщения"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Игнорировать переименование названия"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13554,94 +13420,94 @@ msgstr ""
 "Включить сохранение имени текущей папки, даже если автор меняет название "
 "потока."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "Проверить действие TLS сертификата"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "Адрес источника"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "Получать комментарии для постов не старше"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "дней"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "Установите в -1, чтобы получить все комментарии"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Если изменился текст"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Новости"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Период обновления"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Установите в 0, чтобы не обновлять этот поток автоматически"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Параметры потока"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "_Обновить поток"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "_Свойства потока"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "Пере_именовать..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "О_бновить рекурсивно"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "Добавить _новый поток..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "Создать новую _папку..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Импорт списка потоков..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Удалить дерево"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "Добавить дерево папок RSS"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Введите имя для нового дерева папок RSS."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13650,58 +13516,58 @@ msgstr ""
 "Не удалось создать дерево папок.\n"
 "Возможно, какие-то файлы уже существуют, или у вас нет прав там записывать?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Мои Новостные Потоки"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Выбрать cookies файл"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Период обновления по умолчанию"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "Обновлять все потоки при запуске программы"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
+msgstr "Обновить все каналы при запуске"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Проверять период действия TLS сертификатов для новых потоков"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Пусть к файлу cookies"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 "Путь к файлу cookies.txt, в котором будут храниться ваши cookie в формате "
 "Netscape"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Обновить"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Безопасность и конфиденциальность"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "Не удалось создать папку для нового потока '%s'."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Подписаться на новый поток?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Папка потока:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
@@ -13709,35 +13575,35 @@ msgstr ""
 "Вместо использования официального название, вы можете ввести другое имя "
 "папки для потока."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "_Редактировать настройки потока после подписки"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Обновление комментариев для '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Требуется авторизация)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Запрещено)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Документ не найден)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Ошибка %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13751,7 +13617,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13760,21 +13626,21 @@ msgstr ""
 "Не найден действующий поток\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Безымянный поток"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Вероятно, повреждённый поток без заголовка на %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Обновляется поток '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13787,11 +13653,11 @@ msgstr ""
 "\n"
 "Пожалуйста, свяжитесь с разработчиками, это не должно было случиться."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail нужен доступ к сети, чтобы обновить потоки."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13895,41 +13761,45 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "Отчёт о спаме"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Включён"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Перенаправлять на:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Модуль SpamAssassin не может подключиться к spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Ошибка фильтра модуля SpamAssassin.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Модуль SpamAssassin отключён в настройках.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: фильтрация сообщения..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -13939,7 +13809,7 @@ msgstr ""
 "- недоступный демон spamd. Пожалуйста, убедитесь, что spamd запущен и "
 "доступен."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13947,15 +13817,15 @@ msgstr ""
 "Claws Mail нуждается в сетевом подключении для передачи сообщения(ий) "
 "удалённого обучения."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Не удалось получить имя пользователя"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "Модуль SpamAssassin загружен, но отключён в настройках.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14420,63 +14290,68 @@ msgstr "Участники:"
 msgid "Action:"
 msgstr "Действие:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Новая встреча..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Экспортировать календарь..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "_Подписаться на webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "_Переименовать..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "Об_новить подписки"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "Обзор _списка"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "Обзор _недели"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "Обзор _месяца"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Встречи"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[нет краткой информации]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "прошедшие"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "сегодня"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "завтра"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "на этой неделе"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "в будущем"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14485,21 +14360,21 @@ msgstr ""
 "\n"
 "Запланированы следующие события %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Истекло время ожидания (%d секунд) при подключении к %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (Не авторизован)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Ошибка %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14512,7 +14387,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14523,110 +14398,110 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Невозможно создать директорию %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail требуется доступ к сети, чтобы обновить поток Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Извлечение календаря для %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "новая подписка"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail требуется доступ к сети, чтобы обновить подписку."
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Подписать на WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "Введите ссылку на Webcal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "Не удалось разобрать ссылку."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Вы действительно хотите отписаться?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Удалить подписку"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "принял"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "ориентировочно принял"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "отклонил"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "не ответил на"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "индивидуально"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "группа"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "ресурс"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "комната"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "Прошедшие"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Сегодня"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Завтра"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "На этой неделе"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "В будущем"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Принято: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Отклонено: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Ориентировочно Принято: "
 
@@ -15036,95 +14911,95 @@ msgstr "Ошибка синтаксиса временной метки в пр
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Ошибка синтаксиса временной метки в приветствии (не ASCII)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "Ошибка протокола POP\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "неверный UIDL ответ: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Удаление устаревшего сообщения %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Пропуск сообщения %d [%s] (%d байт)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "почтовый ящик заблокирован\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "Истекло время ожидания\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "команда не поддерживается\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "ошибка во время POP сессии\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "Команда ТОР не поддерживается\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Новости (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Локальный mbox файл"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Никакой (только SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Имя учётной записи"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Использовать по умолчанию"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Полное имя"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "Почтовый адрес"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Авто-настройка"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15132,81 +15007,81 @@ msgstr ""
 "Предупреждение: эта версия Claws Mail\n"
 "была собрана без поддержки IMAP и NNTP."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Этот сервер требует аутентификацию"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "Удостоверять при подключении"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Сервер для получения"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Локальный ящик"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "SMTP сервер (отправка)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "Использовать почтовую команду, а не SMTP сервер"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "команда для отправки почты"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Локальный узел"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "'Входящие' по умолчанию"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Неотфильтрованные сообщения помещаются в эту папку"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "Аутентифицировать перед POP подключением"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после получения"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Удалить по истечении"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 дней 0 часов : удалять немедленно"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Ограничение размера получаемых сообщений"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15214,95 +15089,99 @@ msgstr ""
 "Сообщения, превышающие данный лимит загружаются частично. При их выборе, "
 "возможно получить полное сообщение, либо удалить его."
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Максимальное количество статей для загрузки"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "неограниченно, если указан 0"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(обычно пусто)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Показывать только подписанные папки"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Режим экономии трафика (не получать теги с сервера)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Этот режим использует меньше трафика, но может быть медленнее с некоторыми "
 "серверами."
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Размер партии"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Автоматическая проверка"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Использовать глобальные настройки"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Проверять ящик каждые"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при получении"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "Использовать модули фильтрации при получении"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Получить почту' проверяет наличие новых сообщений данной учётной записи"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "Генерировать идентификатор сообщения"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "Включать почтовый адрес в идентификатор сообщения"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Добавить заголовок агента пользователя"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Добавить заданный заголовок"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Аутентификация (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15310,217 +15189,217 @@ msgstr ""
 "Пустое поле означает использовать имя пользователя и пароль те же, что и при "
 "получении."
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "Авторизация с POP перед отправкой"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "Время ожидания аутентификации POP"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Авторизация"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Выберите Поставщика Услуг OAuth2 Почты"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "ID клиента"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "Секрет клиента"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Получить код авторизации"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "Открыть браузер по умолчанию с запросом"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Копировать ссылку"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Код авторизации"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
 "Вставьте полный URL из браузера или предоставленный токен аутентификации"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Завершить авторизацию"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Авторизовать"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "Автоматически вставлять подпись"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "Отделять подпись"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Автоматически установить следующие адреса"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "Словари проверки орфографии"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Словарь по умолчанию"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Альтернативный словарь по умолчанию"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Составление"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Система конфиденциальности по умолчанию"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Всегда подписывать сообщения"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Всегда шифровать сообщения"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "Всегда подписывать сообщение при ответе на подписанное сообщение"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Всегда шифровать сообщение при ответе на зашифрованное сообщение"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Шифровать отправленные сообщения своим ключом в дополнение к ключу получателя"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Сохранять отправленные зашифрованные сообщения как простой текст"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "Не использовать TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Использовать команду STARTTLS для запуска зашифрованной сессии"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Не использовать TLS (но при необходимости, использовать STARTTLS)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "Клиентские сертификаты"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Сертификат для получения"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Клиентский сертификат в виде файла PKCS12 или PEM"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Сертификат для отправки"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Автоматически принимать действительный TLS сертификат"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Использовать неблокируемый TLS"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Отключите при обнаружении проблем с TLS соединением"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Использовать прокси сервер"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Использовать значения по умолчанию"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Использовать глобальные настройки прокси сервера"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Использовать прокси сервер для отправки"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15528,27 +15407,27 @@ msgstr ""
 "Если выключено, сообщения будут отправлены через прямое подключение, "
 "игнорируя все настройки прокси сервера."
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "Порт POP"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "Порт IMAP"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15556,174 +15435,178 @@ msgstr ""
 "Доменное имя будет использоваться в сгенерированном Message-ID, и при "
 "подключении к серверам SMTP."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Использовать команду для связи с сервером"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Пометить перекрёстные сообщения как прочтённые и цветом:"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Поместить отправленные сообщения в"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Поместить исходящие сообщения в"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Поместить черновые сообщения в"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Поместить удалённые сообщения в"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "Имя учётной записи не введено."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "Почтовый адрес не введён."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "SMTP сервер не введён."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "Имя пользователя не введено."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "POP сервер не введён."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "Папка по умолчанию 'Входящие' не существует."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "IMAP сервер не введён."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "NNTP сервер не введён."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "имя файла локального ящика не введено."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "команда приёма почты не введена."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "Имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "Пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "домен не указан."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "папка отправки не выбрана."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "папка очереди не выбрана."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "папка черновиков не выбрана."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "папка мусорной корзины не выбрана."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "Получить"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "Отправить"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Прокси"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Дополнительные"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Параметры для новой учётной записи"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "Параметры учётной записи - %s"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Ошибка (неправильный адрес)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "Выбрать файл подписи"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Выбрать файл сертификата"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (модуль не загружен)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "Авторизация завершена"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "Ваш код авторизации OAuth2 получен Claws Mail"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "Авторизация НЕ завершена"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "Ваш код авторизации OAuth2 не был получен Claws Mail"
 
@@ -15858,7 +15741,7 @@ msgstr "Запись не сохранена"
 #: src/prefs_actions.c:914 src/prefs_actions.c:945 src/prefs_filtering.c:1492
 #: src/prefs_filtering.c:1515 src/prefs_template.c:566 src/prefs_template.c:591
 msgid "The entry was not saved. Close anyway?"
-msgstr "запись не сохранена. Все равно закрыть?"
+msgstr "Запись не была сохранена. Всё равно закрыть?"
 
 #: src/prefs_actions.c:915 src/prefs_actions.c:920 src/prefs_actions.c:946
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
@@ -15956,7 +15839,7 @@ msgstr "применить действие фильтрации между {} 
 msgid "for a literal %"
 msgstr "литерал %"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Действия"
 
@@ -16004,12 +15887,12 @@ msgstr "В %d\\n%f пишет:\\n\\n%q\\n%X"
 
 #: src/prefs_common.c:322 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"
+"\\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"
 msgstr ""
 "\\n\\nНачало пересылаемого сообщения:\\n\\n?d{Дата: %d\\n}?f{От: %f\\n}?"
-"t{Кому: %t\\n}?c{Копия: %c\\n}?n{Группы новостей: %n\\n}?s{Тема: %s\\n}\\n\\n"
-"%M"
+"t{Кому: %t\\n}?c{Копия: %c\\n}?n{Группы новостей: %n\\n}?s{Тема: "
+"%s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
@@ -16265,7 +16148,7 @@ msgstr "Скрыть"
 msgid "Message flags"
 msgstr "Флаги сообщения"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Пометить"
@@ -16291,7 +16174,7 @@ msgstr "Пометить как не спам"
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Цветные метки"
 
@@ -16306,7 +16189,7 @@ msgstr "Перенаправить"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Счёт"
@@ -16577,8 +16460,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Скрытые столбцы"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Отображаемые столбцы"
 
@@ -16783,7 +16666,7 @@ msgstr "Использовать другой шрифт для печати"
 msgid "Message Printing"
 msgstr "Печать Сообщения"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Отображение"
@@ -17036,11 +16919,11 @@ msgstr "тело сообщения"
 msgid "whole message"
 msgstr "сообщение целиком"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "Помечено"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Удалено"
 
@@ -17048,11 +16931,11 @@ msgstr "Удалено"
 msgid "Replied"
 msgstr "На сообщение есть ответ"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Сообщение было перенаправлено"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Спам"
@@ -17061,7 +16944,7 @@ msgstr "Спам"
 msgid "Has attachment"
 msgstr "Сообщение с вложениями"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "Сообщение подписано"
 
@@ -17271,7 +17154,7 @@ msgstr "Флаг"
 
 #: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
-msgstr " "
+msgstr "это"
 
 #: src/prefs_matcher.c:2041
 msgid "Name:"
@@ -17574,7 +17457,7 @@ msgstr "Выберите цвет разграничивающих линий"
 msgid "Hunk lines"
 msgstr "Отличающиеся строки"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Список папок"
 
@@ -18063,112 +17946,116 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "Проверка Орфографии"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "сокращённое название дня недели"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "полное имя дня недели"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "сокращённое имя месяца"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "полное имя месяца"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "формат даты и времени исходя из текущей локали"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "столетие (год/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "день месяца как десятичное число"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "часы как десятичное число, используя 24-часовой формат"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "часы как десятичное число, используя 12-часовой формат"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "день года как десятичное число"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "месяц как десятичное число"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "минуты как десятичное число"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "AM или PM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "секунды как десятичное число"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "день недели как десятичное число"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "настройка даты исходя из текущей локали"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "две последние цифры года"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "год как десятичное число"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "временная зона или имя или аббревиатура"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Формат даты"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "Указатель"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Показывать количество сообщений в имени папки"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Непрочтённых сообщений"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Непрочтённых и Всех сообщений"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
 msgstr "При запуске открывать последнюю открытую папку"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "При запуске открывать выбранную папку"
+
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18176,99 +18063,99 @@ msgstr ""
 "Запустить правила обработки перед пометкой всех сообщений в папке как "
 "прочтённые или непрочтённые"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Сокращать названия групп новостей, длиннее чем"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "знаков"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "Список сообщений"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Заблокировать заголовки столбцов"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Отображается в столбце \"От\""
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Имя и Адрес"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Справка по формату даты"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Установить выбор сообщения при открытии папки"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Всегда открывать выбранные сообщения"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "При открытии папки"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "При отображении результатов поиска"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr "При выборе следующего или предыдущего сообщения с помощью ярлыков"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "При удалении или перемещении сообщений"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "При использовании клавиш направления"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Помечать сообщение как прочтённое"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "при выборе, через"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "только при открытии в новом окне или при ответе на него"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Показывать диалог \"нет непрочтённых (или новых) сообщений\""
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "Присвоить 'Да'"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "Присвоить 'Нет'"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Показывать отправителя, используя адресную книгу"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "Строить цепочки переписки, используя тему в дополнение к заголовкам"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Выполнять немедленно при переносе или удалении сообщений"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18276,57 +18163,57 @@ msgstr ""
 "Откладывает перемещение копирование и удаление сообщений до тех пор, пока не "
 "будет выбрано меню 'Сервис/Выполнить'"
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr ""
 "Подтверждать перед пометкой всех сообщений в папке как прочтённые или "
 "непрочтённые"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Подтверждение перед изменением цветной метки сообщений"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Показывать всплывающие подсказки"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "По умолчанию"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Новые папки"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Сортировка по"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Номер"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "По дате цепочки"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "Не сортировать"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Просмотр темы"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Свернуть все темы"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Скрыть прочтённые сообщения"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Сводки"
 
@@ -18498,7 +18385,7 @@ msgstr "Доступные шаблоны"
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Внутренняя тема по умолчанию"
 
@@ -18506,21 +18393,16 @@ msgstr "Внутренняя тема по умолчанию"
 msgid "Themes"
 msgstr "Темы"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Удалить системную тему '%s'"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Удалить тему '%s'"
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Вы действительно хотите удалить эту тему?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18529,24 +18411,24 @@ msgstr ""
 "Ошибка %s файла\n"
 "при удалении темы."
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Ошибка при удалении каталога темы."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Тема удалена успешно"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Выбрать папку темы"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Установить тему '%s'"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18554,15 +18436,11 @@ msgstr ""
 "Эта папка, возможно, не является папкой темы.\n"
 "Всё равно установить?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "Действительно установить тему для всех пользователей?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "Тема уже установлена"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18574,25 +18452,25 @@ msgstr ""
 "\n"
 "Вы хотите ещё заменить?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Невозможно удалить старую тему в %s."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Невозможно создать каталог назначения %s."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "Тема установлена успешно."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "Ошибка при установке темы"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18601,78 +18479,78 @@ msgstr ""
 "Ошибка %s файла\n"
 "при установке темы."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Просмотреть все значки темы"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Доступно тем: %d (%d пользовательских, %d системных, 1 внутренняя)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Внутренняя тема имеет %d иконок"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "Информационный файл данной темы недоступен"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Ошибка: невозможно получить статус темы"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d файлов (%d иконок), размер: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Выбор"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Установить новую..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Получить больше..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Информация"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Автор"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Просмотреть все"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "SVG изображение"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "Включить альфа канал"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Принудительное масштабирование"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "Пикселей на дюйм (PPI)"
 
@@ -18821,7 +18699,7 @@ msgstr "Действия не определены."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Ошибка декодирования BASE64]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "Часть декодировать не удалось"
 
@@ -19271,22 +19149,6 @@ msgstr ""
 "При отправке сообщения возникла ошибка:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Настройка почтового ящика"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Вначале, укажите расположение ящика.\n"
-"Вы можете использовать существующий ящик\n"
-"в МН формате, если он у вас есть.\n"
-"Если не уверены, то нажмите OK."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Исходный текст сообщения"
@@ -19564,11 +19426,11 @@ msgstr "От: %s, %s"
 msgid "To: %s, on %s"
 msgstr "По: %s, %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "Вы не автор статьи."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -19576,86 +19438,86 @@ msgstr[0] "Вы действительно хотите удалить %d выд
 msgstr[1] "Вы действительно хотите удалить %d выделенных сообщения?"
 msgstr[2] "Вы действительно хотите удалить %d выделенных сообщений?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Удалить сообщение"
 msgstr[1] "Удалить сообщения"
 msgstr[2] "Удалить сообщений"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "Назначение совпадает с текущей папкой."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Выберите папку, чтобы переместить выбранное сообщение"
 msgstr[1] "Выберите папку, чтобы переместить выбранные сообщения"
 msgstr[2] "Выберите папку, чтобы переместить выбранные сообщения"
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "Назначение копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Выберите папку для копирования выбранного сообщения"
 msgstr[1] "Выберите папку для копирования выбранных сообщений"
 msgstr[2] "Выберите папку для копирования выбранных сообщений"
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "Дописать или Перезаписать"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Дописать или перезаписать существующий файл?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "_Дописать"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "_Перезаписать"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Не удалось сохранить файл '%s'."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Вы собираетесь напечатать %d сообщений одно за другим. Хотите продолжить?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Построение цепочек..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Пропускать эти правила"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 "Применить эти правила, независимо от учётной записи, к которой они "
 "принадлежат"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "Применить эти правила, если они применяются к текущей учётной записи"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Фильтрация"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19663,76 +19525,76 @@ msgstr ""
 "Некоторые правила фильтрации привязаны к учётным записям.\n"
 "Пожалуйста, выберите, что делать с этими правилами:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Настройка обработки"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Вы действительно хотите сбросить цветовую метку всем выделенным сообщениям?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Вы действительно хотите применить эту цветовую метку всем выделенным "
 "сообщениям?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Сбросить цветную метку"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Установить цветную метку"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Игнорируемая цепочка"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Отслеживаемая цепочка"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 "Ответ на данное сообщение отправлен, так же, сообщение перенаправлено - "
 "щёлкните, чтобы увидеть ответ"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Ответ на данное сообщение отправлен - щёлкните, чтобы увидеть ответ"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "Помечено на перемещение"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "Помечено на копирование"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "Подписано, содержит вложение(я)"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "Зашифровано, содержит вложение(я)"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Зашифровано"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "Сообщение с вложениями"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19741,11 +19603,11 @@ msgstr ""
 "Ошибка в регулярном выражении (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Вернуться к списку папок (у Вас есть непрочтённые сообщения)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Вернуться к списку папок"
 
diff --git a/po/sk.po b/po/sk.po
index 1bdebc887..85a5db174 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,14 +2,14 @@
 # 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 at slavino.sk>, 2009-2022.
+# Slavko <linux at slavino.sk>, 2009-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.17.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-11 10:26+0100\n"
-"PO-Revision-Date: 2022-10-15 12:30+0200\n"
+"POT-Creation-Date: 2023-11-13 16:14+0000\n"
+"PO-Revision-Date: 2023-11-18 13:11+0100\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: slovenčina <linux at slavino.sk>\n"
 "Language: sk\n"
@@ -54,8 +54,8 @@ msgstr "_Nový"
 msgid "Create a new account"
 msgstr "Vytvoriť nový účet"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -67,8 +67,8 @@ msgstr "Upraviť nastavenia zvoleného účtu"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -84,8 +84,8 @@ msgstr "O_dstrániť"
 msgid "Delete the selected account from the list"
 msgstr "Odstrániť zvolený účet zo zoznamu"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovať"
@@ -126,26 +126,26 @@ msgstr "Posunúť zvolený účet vyššie"
 msgid " _Set as default account "
 msgstr " _Nastaviť ako predvolený účet "
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Zavrieť"
@@ -159,53 +159,52 @@ msgstr "Účty so vzdialenými zložkami nemožno kopírovať."
 msgid "Copy of %s"
 msgstr "Kópia %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Naozaj chcete odstrániť účet „%s”?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Bez názvu)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Zmazať účet"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -214,88 +213,88 @@ msgstr "Zmazať účet"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "O_dstrániť"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1621
+#: src/account.c:1622
 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:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Nemožno získať súbor správy %d"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "Nemožno získať časť správy."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Nemožno získať časť viacdielnej správy: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -304,11 +303,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:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "Nie je nastavená žiadna akcia filtra"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -317,7 +316,7 @@ msgstr ""
 "Neplatné akcie filtra:\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -328,44 +327,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Dokončené"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Bežiace: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončené: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Akcie vstupu/výstupu"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "_Vykonať"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "_Zastaviť"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -376,11 +375,11 @@ msgstr ""
 "(„%%h” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľský parameter akcie"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -391,23 +390,23 @@ msgstr ""
 "(„%%u” bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Používateľský parameter"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 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:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "Nie je možné adresár do seba samého."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 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:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Skupina"
@@ -480,40 +479,40 @@ msgstr ""
 "Naozaj chcete nahradiť všetky mená atribútov\n"
 "predvoleným nastavením?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_Nie"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Áno"
 
@@ -552,31 +551,30 @@ msgstr "_Pridať"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_OK"
@@ -606,7 +604,7 @@ msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr "Claws Mail teraz vyhľadá duplicitné emailové adresy v adresári."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Hľadať"
@@ -620,7 +618,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplicitné adresy"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adresa"
@@ -629,11 +627,11 @@ msgstr "Adresa"
 msgid "Address book path"
 msgstr "Cesta k adresáru"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "Naozaj odstrániť adresu(y)?"
 
@@ -641,7 +639,7 @@ msgstr "Naozaj odstrániť adresu(y)?"
 msgid "Delete address"
 msgstr "Zmazať adresu"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Údaje tejto adresy sú len na čítanie a nemožno ich odstrániť."
 
@@ -653,7 +651,7 @@ msgstr "Pridať do adresára"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Poznámky"
@@ -662,7 +660,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte zložku adresára"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "Pridať adresu(y)"
 
@@ -670,50 +668,50 @@ msgstr "Pridať adresu(y)"
 msgid "Can't add the specified address"
 msgstr "Nemožno pridať zadanú adresu"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "Emailová adresa"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "_Adresár"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Nový _Adresár"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "Nová _zložka"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "Nový _vCard"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "Nový _JPilot"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "Nový LDAP _server"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "_Upraviť adresár"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "Z_mazať adresár"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -721,189 +719,189 @@ msgstr "Z_mazať adresár"
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "Vy_brať všetko"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "_Vystrihnúť"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "V_ložiť"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "Nová _adresa"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "Nová _skupina"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "Poslať _mail"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "_Zlúčiť"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "Importovať súbor _LDIF..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "Importovať súbor _Mutt..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "Importovať súbor _Pine..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "Exportovať _HTML..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "Exportovať L_DIF..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Nájsť duplikáty..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Upraviť vlastné atribúty..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "P_rechádzať  položky"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Úspech"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Neplatné parametre"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "Nie je zadaný súbor"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Chyba pri otváraní súboru"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Chyba pri čítaní súboru"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Bol nájdený koniec súboru"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Chyba pri alokácii pamäte"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Neplatný formát súboru"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Chyba pri zápise do súboru"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Chyba pri otváraní zložky"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "Nebola zadaná cesta"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "Chyba pripojenia k serveru LDAP"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "Chyba pri inicializácii LDAP"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "Chyba pri pripájaní LDAP serveru"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "Chyba pri čítaní LDAP databázy"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "Pri LDAP operácii vypršal časový limit"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "Chybné vyhľadávacie kritériá LDAP"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "Neboli nájdené žiadne položky LDAP vyhovujúce kritériám"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "LDAP vyhľadávanie bolo ukončené na požiadavku používateľa"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "Chyba vytvorenia spojenia STARTTLS"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Chýba Distguished Name (dn)"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Chýbajú požadované údaje"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "Kontakt s takýmto kľúčom už existuje"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "Je vyžadovaná silnejšia autentifikácia"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Zdroje"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Adresár"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Hľadať"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Odstrániť skupinu"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -911,26 +909,26 @@ msgstr ""
 "Naozaj chcete odstrániť skupinu(y)?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Nemožno vložiť. Cieľový adresár je len na čítanie."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Nemožno vkladať do skupiny adries."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, 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:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -939,20 +937,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:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Odstrániť _len zložku"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Odstrániť zložku i _adresy"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -961,7 +959,7 @@ msgstr ""
 "Chcete odstrániť „%s”?\n"
 "Adresy, ktoré obsahuje, nebudú stratené."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -970,28 +968,28 @@ msgstr ""
 "Chcete odstrániť „%s”?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Hľadať „%s”"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Nové kontakty"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Nový používateľ, nemožno uložiť indexový súbor."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Nový používateľ, nemožno uložiť súbory adresára."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -999,7 +997,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:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1007,7 +1005,7 @@ msgstr ""
 "Nemožno konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1015,7 +1013,7 @@ msgstr ""
 "Nemožno konvertovať starý adresár,\n"
 "nemožno an vytvoriť indexový súbor nového adresára."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1023,52 +1021,52 @@ msgstr ""
 "Nemožno konvertovať starý adresár\n"
 "a nemožno ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Nemožno načítať zoznam adries"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Prehľadávam..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Adresáre"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Zložka"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "LDAP servery"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "LDAP požiadavka"
 
@@ -1151,42 +1149,42 @@ msgstr "Zozbierať emailové adresy zvolených správ"
 msgid "Collect email addresses from folder"
 msgstr "Zozbierať emailové adresy zo zložky"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Spoločné adresy"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Súkromné adresy"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Spoločná adresa"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Aktualizácia adries"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizácia zlyhala. Zmeny neboli zapísané do adresára."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Chyba"
@@ -1307,7 +1305,7 @@ msgstr "Vaša verzia Claws Mail je pre zásuvný modul „%s” príliš stará.
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Vaša verzia Claws Mail je pre tento zásuvný modul príliš stará."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "Zlyhalo vytvorenie spojenia TLS\n"
 
@@ -1327,7 +1325,7 @@ msgstr "neplatná odozva SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "nastala chyba relácie SMTP\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "nastala chyba autentifikácie\n"
 
@@ -1336,7 +1334,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:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "nemožno vytvoriť reláciu STARTTLS\n"
 
@@ -1473,212 +1471,212 @@ msgstr "%d.%02d MiB"
 msgid "%.2fGiB"
 msgstr "%.2f GiB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pondelok"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Piatok"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Január"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Február"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Marec"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Apríl"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Jún"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Júl"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "August"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "September"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Október"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "November"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "December"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Ne"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Po"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Ut"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "St"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Št"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Pi"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "So"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Jan"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Feb"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Apr"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "Máj"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Jún"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Júl"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Aug"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Okt"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Nov"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Dec"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "DOP"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ODP"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "dop"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "odp"
@@ -1695,425 +1693,425 @@ msgstr ""
 "\n"
 "Podpisovanie a šifrovanie tejto správy bolo vpynuté."
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "_Pridať..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "Sp_ráva"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "P_ravopis"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "Odos_lať"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Odoslať _neskôr"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "Pripojiť sú_bor"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "Vlož_iť súbor"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "Vložiť _podpis"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "Nah_radiť podpis"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Späť"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "_Vystrihnúť"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "Prilepiť _špeciálne"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Ako _citácia"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "_Zalomené"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vy_brať všetko"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "_Rozšírené"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "Presunúť o znak dozadu"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "Presunúť o znak dopredu"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "Presunúť o slovo dozadu"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "Presunúť o slovo dopredu"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "Presunúť na začiatok riadku"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "Presunúť na koniec riadku"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "Presunúť na predchádzajúci riadok"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "Presunúť na ďalší riadok"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Zmazať znak naľavo od kurzora"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Zmazať znak napravo od kurzora"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Zmazať slovo naľavo od kurzora"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Zmazať slovo napravo od kurzora"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Zmazať riadok"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Zmazať do konca riadku"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "_Zalomiť aktuálny odsek"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Zalomiť všetky d_lhé riadky"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "Upraviť pomocou e_xterného editora"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "_Skontrolovať všetko alebo výber"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "_Zvýrazniť všetky nesprávne slová"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "S_pätne skontrolovať nesprávne slovo"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "_Dopredu na ďalšie nesprávne slovo"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "Reži_m odpovede"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "_Súkromie"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adresár"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "A_kcie"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_O programe"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "Aut_omatické zalamovanie"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Automatické odsaden_ie"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "Podpí_sať"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "_Šifrovať"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "Vyžiadať potv_rdenie o prijatí"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "_Odstrániť odkazy"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Zobraziť p_ravítko"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Všetkým"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "Odo_sielateľ"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "E_mailová konferencia"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "_Najvyššia"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "_Vysoká"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "_Nízka"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Chyba v tvare odosielateľa novej správy."
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Chyba v tvare predmetu novej správy."
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, 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:1434
+#: src/compose.c:1435
 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:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 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:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, 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:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 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:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, 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:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, 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:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Pokračovanie:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "V odpovedi komu:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Komu:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Nemožno priložiť súbor (zlyhala konverzia kódovania)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2131,73 +2129,73 @@ msgstr[2] ""
 "Nasledujúce súbory budú priložené:\n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "„Značka citácie” šablóny nie je platná."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Nemožno zistiť veľkosť súboru „%s”."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, 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:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Prázdny súbor"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "Pripojiť i _tak"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemožno čítať %s."
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Upravené]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 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:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Napísať správu"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2205,62 +2203,62 @@ msgstr ""
 "Nie je zadaný účet na odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštový účet."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, 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:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Odoslať"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "Nie je zadaný príjemca."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Prázdny predmet. %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Poslať i tak?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Zaradiť do fronty i tak?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
-msgstr "Odoslať ho neskôr"
+msgstr "Odoslať neskôr"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "Do _fronty"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Odosielanie na %d adries. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "Nemožno zaradiť správu do fronty na odoslanie."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2271,7 +2269,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2282,7 +2280,7 @@ msgstr ""
 "\n"
 "Podpísanie zlyhalo: %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2293,7 +2291,7 @@ msgstr ""
 "\n"
 "Šifrovanie zlyhalo: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2303,7 +2301,7 @@ msgstr ""
 "\n"
 "Zlyhala konverzia kódovania."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2313,7 +2311,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2321,16 +2319,17 @@ 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:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Použite „Odoslať správy vo fronte” z hlavného okna na opakovanie."
+"Môžete skúsiť \"Odoslať\" znova alebo zaradiť správu to fronty pomocou "
+"\"Odoslať neskôr\""
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2341,7 +2340,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2354,100 +2353,104 @@ msgstr ""
 "\n"
 "Odoslať aj tak?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Upozornenie šifrovania"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "_Pokračovať"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadny účet na odosielanie správ!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Zrušiť koncept"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Ignorovať prílohu"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Pôvodná časť %s"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Pridať do _adresára"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Zmazať obsah položiek"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Na automatické doplnenie z adresára použite <TAB>"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "Vyberte zložku na uloženie správy"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "H_lavička"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Prílohy"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Ostatné"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Pre_dmet:"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2456,19 +2459,19 @@ msgstr ""
 "Nemožno spustiť kontrolu preklepov.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "O_d:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Účet, použitý pre tento email"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2477,50 +2480,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:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "Žiad_na"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, 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:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Chyba formátu šablóny „%s”."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "Typ MIME"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2529,12 +2532,12 @@ msgstr ""
 "Nemožno zapísať telo do súboru:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr "Socketová komunikácia s externým editorom nie je vo Widnows dostupná."
 
-#: src/compose.c:9710
+#: src/compose.c:9702
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2545,21 +2548,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Externý editor skončil chybou: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "id procesu: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "id procesu: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2570,19 +2568,19 @@ msgstr ""
 "Vynútiť ukončenie procesu?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 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:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2590,24 +2588,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2616,59 +2614,50 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"Veľkosť vkladaného textu prekročila limit (%d kiB) vloženia.\n"
-"Namiesto toho pridajte prílohu."
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2686,20 +2675,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:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2917,7 +2906,7 @@ msgid " Check File "
 msgstr " Skontrolovať súbor "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Súbor"
 
@@ -2962,12 +2951,12 @@ msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov zložky:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Nová zložka"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov novej zložky:"
 
@@ -2995,13 +2984,13 @@ msgstr "Pridať nový záznam JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Úprava LDAP - Zvoľte základ vyhľadávania"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Meno počítača"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3062,7 +3051,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3223,8 +3212,8 @@ msgstr "Heslo bind"
 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:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Zobraziť heslo"
@@ -3246,11 +3235,11 @@ 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:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Základné"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Rozšírené"
 
@@ -3268,8 +3257,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "Zmeniť značky"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Značka"
 
@@ -3396,15 +3385,15 @@ msgstr "Výstupný súbor HTML"
 msgid "B_rowse"
 msgstr "P_rehliadať"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Štýlopis"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Žiadna"
 
@@ -3652,7 +3641,7 @@ msgstr "Exportovať adresár do súboru LDIF"
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
@@ -3926,61 +3915,61 @@ msgstr ""
 "filtrovanie správy (%s%s%s)\n"
 "%ssúbor správy: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Front"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Kôš"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopírujem %s do %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aktualizujem vyrovnávaciu pamäť zložky %s..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "Spracúvam správy..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchronizujem %s na použitie pri odpojení...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 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:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "Názov zložky nemôže končiť bodkou."
 
@@ -3989,7 +3978,7 @@ msgid "Select folder"
 msgstr "Zvoľte zložku"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "Nová zložka"
 
@@ -4000,99 +3989,103 @@ msgstr "Zdediť vlastnosti a pravidlá spracovania z rodičovskej zložky"
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov zložky nemôže obsahovať „%c”."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nemožno vytvoriť zložku „%s”."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "Označiť _všetky ako prečítané"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Označiť všetky ako _neprečítané"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Označiť všetky ako prečítané _rekurzívne"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Označiť všetky ako neprečítané _rekurzívne"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "Sp_ustiť pravidlá spracovania"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "Pre_hľadať zložku..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Otvoriť pri spustení"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "Spracovan_ie..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "V_yprázdniť kôš..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Odoslať _front..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Nastaviť zobrazované stĺpce"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Nový"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 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:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie zložky..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4100,15 +4093,15 @@ msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
 "prečítané?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 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:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Označiť všetky ako neprečítané"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
@@ -4116,95 +4109,95 @@ msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
 "neprečítané?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 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:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prehľadávanie zložky %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prehľadávanie zložky %s..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom zložiek"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 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:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom zložiek..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Skenujem strom zložiek..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Nemožno skenovať obsah zložky %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové správy vo všetkých zložkách..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Zatváram zložku %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Otváram zložku %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "_Vyprázdniť kôš"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Pracujete odpojený. Pripojiť?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4213,64 +4206,64 @@ msgstr ""
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, 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:2648
+#: src/folderview.c:2671
 #, 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:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Kopírovať zložku"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Presunúť zložku"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírujem %s do %s..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 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:2699
+#: src/folderview.c:2722
 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:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Zložky nemožno presúvať medzi rôznymi schránkami."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "Kopírovanie zlyhalo!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "Presun zlyhal!"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracovania zložky %s"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Zvolená cieľová zložka môže obsahovať len podzložky."
 
@@ -4315,8 +4308,8 @@ msgid "read-only"
 msgstr "len na čítanie"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "neznáme"
 
@@ -4356,13 +4349,13 @@ 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:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999 – 2022\n"
+"Copyright (C) 1999 – 2023\n"
 "Tím Claws Mail\n"
 "a Hiroyuki Yamamoto"
 
@@ -4397,7 +4390,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: neznámy"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Tím Claws Mail"
 
@@ -4519,73 +4512,78 @@ msgstr ""
 "Kópiu GNU General Public License by ste mali získať spoločne s týmto "
 "programom; ak to tak nie je, navštívte "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Štatistiky relácie\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Začatá: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Došlá komunikácia\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Prijaté správy: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "Spamové správy: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Odoslaná komunikácia\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/presmerované správy: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpovede na správy: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Presmerované správy: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Odoslané správy celkom: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "O programe Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "_Informácie"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Autori"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "_Poznámky k verzii"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "Štati_stiky"
 
@@ -4792,7 +4790,7 @@ msgid "Configuring..."
 msgstr "Nastavovanie..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Dátum"
@@ -4801,9 +4799,9 @@ msgstr "Dátum"
 msgid "Date:"
 msgstr "Dátum:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "Od"
@@ -4824,9 +4822,9 @@ msgstr "Odosielateľ:"
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Komu"
@@ -4862,9 +4860,9 @@ msgstr "Odkazy"
 msgid "References:"
 msgstr "Odkazy:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Predmet"
@@ -4874,7 +4872,7 @@ msgstr "Predmet"
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Komentáre"
 
@@ -4988,8 +4986,8 @@ msgid "Seen:"
 msgstr "Seen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Status"
@@ -5062,7 +5060,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Organizácia"
 
@@ -5381,9 +5379,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5397,7 +5394,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5412,7 +5409,7 @@ msgstr "_Načítať..."
 msgid "_Unload"
 msgstr "_Odobrať"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Popis"
 
@@ -5436,8 +5433,8 @@ msgid "Loaded plugins"
 msgstr "Načítané zásuvné moduly"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "_Použiť"
 
@@ -5450,10 +5447,10 @@ msgid "_Hide"
 msgstr "_Skryť"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Účet"
@@ -5523,17 +5520,17 @@ msgid "forwarded messages"
 msgstr "správy poslané ďalej"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "správy s prílohami"
-
-#: src/gtk/quicksearch.c:426
 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:427
+#: src/gtk/quicksearch.c:426
 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:427
+msgid "messages which have attachments"
+msgstr "správy s prílohami"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-ID"
@@ -5623,18 +5620,18 @@ msgid "unread messages"
 msgstr "neprečítané správy"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "správy, ktoré obsahujú V v hlavičke H"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, 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:452
-msgid "messages which contain S in X-Label header"
-msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "logický operátor AND"
@@ -5682,55 +5679,55 @@ 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:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Od/Komu/Kópia/Predmet/Značka"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Rekurzívne"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Trvalé"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Dynamické"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Spustiť pri zvolení"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "Vy_mazať"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Zrušiť súčasné vyhľadávanie"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Upraviť vyhľadávacie kritériá"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Informácia"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Informácie o rozšírených symboloch"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "_Upraviť"
 
@@ -5909,16 +5906,16 @@ msgstr "(bez Predmetu)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Názov súboru:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Veľkosť súboru:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Načítať obrázok"
 
@@ -6109,7 +6106,7 @@ msgstr "Chyba TLS"
 msgid "Unknown error [%d]"
 msgstr "Neznáma chyba [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6121,7 +6118,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:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6133,7 +6130,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:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6145,7 +6142,55 @@ 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:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Prihlásenie CRAM-SHA-224 funguje, len ak bola knižnica libetpan zostavená s "
+"podporou SASL, a je nainštalovaný zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Prihlásenie CRAM-SHA-256 funguje, len ak bola knižnica libetpan zostavená s "
+"podporou SASL, a je nainštalovaný zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Prihlásenie CRAM-SHA-384 funguje, len ak bola knižnica libetpan zostavená s "
+"podporou SASL, a je nainštalovaný zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"Prihlásenie CRAM-SHA-512 funguje, len ak bola knižnica libetpan zostavená s "
+"podporou SASL, a je nainštalovaný zásuvný modul SCRAM SASL."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6157,7 +6202,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:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6169,7 +6214,7 @@ 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:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6179,36 +6224,36 @@ msgstr ""
 "\n"
 "Chyba OAuth2. Skontrolujte a opravte nastavenia OAuth2 svojho účtu."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Spojenie IMAP k %s bolo prerušené. Obnovujem...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 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:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6222,108 +6267,108 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru IMAP: %s: %d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemožno sa pripojiť k serveru IMAP: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, 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:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nemožno vytvoriť reláciu STARTTLS.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "Pridávam správy..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopírujem správy..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "Hľadanie zlyhalo kvôli chybe servera."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "Označujem správy..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje STARTTLS.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6332,20 +6377,24 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje STARTTLS, ale Claws Mail bol "
 "zostavený bez podpory STARTTLS.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "Sťahujem správu..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Odstrániť vymazané správy..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6376,7 +6425,7 @@ msgid "Cop_y folder..."
 msgstr "_Kopírovať zložku..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "_Odstrániť zložku..."
 
@@ -6396,7 +6445,7 @@ msgstr "_Odoberané zložky"
 msgid "_Subscribe..."
 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:168
 msgid "_Unsubscribe..."
 msgstr "_Odhlásiť sa..."
 
@@ -6428,21 +6477,21 @@ msgstr ""
 "teda bez správ, pridajte na koniec mena „/”)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadajte nový názov pre „%s”:"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Premenovať zložku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6461,7 +6510,7 @@ 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/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6475,8 +6524,8 @@ msgstr ""
 "Naozaj chcete pokračovať?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemožno odstrániť zložku „%s”."
@@ -6782,8 +6831,8 @@ msgstr "Spojenie zlyhalo"
 msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Správa je zamknutá"
 
@@ -6956,8 +7005,8 @@ msgstr "Začleňovanie zrušené\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -7022,7 +7071,7 @@ msgstr "Chyba LDAP (hľadať): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Prezývka"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7031,7 +7080,7 @@ msgstr ""
 "Súbor „%s” už existuje.\n"
 "Zložku nemožno vytvoriť."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7040,7 +7089,7 @@ msgstr ""
 "Bolo nájdené nastavenie pre %s.\n"
 "Chcete konvertovať toto nastavenie?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7054,11 +7103,11 @@ msgstr ""
 "previesť do Claws Mail pomocou skriptu dostupného na\n"
 "%s."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Zachovať pôvodné nastavenie"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7068,27 +7117,27 @@ 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:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Migrácia konfigurácie"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopírujem konfiguráciu... Môže to nejakú dobu trvať..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Migrácia zlyhala!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Migrujem konfiguráciu..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(alebo staršia)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7111,7 +7160,7 @@ msgstr[2] ""
 "nastavení zásuvných modulov.\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7121,7 +7170,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:1588
+#: src/main.c:1583
 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 "
@@ -7131,76 +7180,76 @@ 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:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Chýba meno súboru\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "Súbor nemožno otvoriť na čítanie\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Nesprávny formát hlavičky\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplikovaná hlavička „To:”\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "Chýba vyžadovaná hlavička „To:”\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Skúste -h alebo --help na zobrazenie pomocníka.\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Chýba argument súbor voľby %s"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Chýba alebo prázdny argument uri voľby %s"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Chýba argument uri voľby %s"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "Chýba aspoň jeden neprázdny argument súbor voľby %s"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "Chýbajú argumenty zložka, typ a požiadavka voľby %s"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Chýbajú argumenty typ a požiadavka voľby %s"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Chýba argument požiadavka voľby %s"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvorí okno na písanie novej správy"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7219,11 +7268,11 @@ msgstr ""
 "po prázdny\n"
 "                         riadok, potom telo správy – až do konca súboru."
 
-#: src/main.c:2074
+#: src/main.c:2073
 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:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7233,7 +7282,7 @@ msgstr ""
 "                         otvorí okno na písanie novej správy s pripojenými\n"
 "                         zadanými súbormi"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7243,23 +7292,23 @@ msgstr ""
 "                         otvorí okno na písanie novej správy s pripojenými\n"
 "                         zadanými súbormi"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy zo všetkých účtov"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     zruší prijímanie nových správ"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       zruší odosielanie správ"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7278,15 +7327,15 @@ msgstr ""
 "                         rekurzívne: nepravda, ak arg. začína 0, n, N, f "
 "alebo F"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [zložka]...   zobrazí celkový počet správ"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7294,15 +7343,15 @@ msgstr ""
 "  --status-full [zložka]...\n"
 "                         zobrazí stav každej zložky"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           zobrazí štatistiky relácie"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     vymaže štatistiky relácie"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7313,45 +7362,45 @@ msgstr ""
 "                         zložka je identifikátor zložky, napr. „zložka/"
 "pod_zložka”, URI file:// alebo absolútna cesta"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do odpojeného režimu"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       ukončí Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             ladiaci mód"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         prepne ladiaci mód"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              zobrazí tohoto pomocníka"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           zobrazí informácie o verzii"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      zobrazí informácie o verzii a zabudovaných funkciách"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný konfiguračný adresár"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7359,7 +7408,7 @@ msgstr ""
 "  --alternate-config-dir [adresár]\n"
 "                         použiť zadaný konfiguračný adresár"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7367,48 +7416,48 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         nastaví geometriu hlavného okna"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Chýba argument adresár voľby %s"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Chýba argument geometria voľby %s"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Chýba argument zložka voľby %s"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Neznáma voľby %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Spracovanie (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "zložka najvyššej úrovne"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: sieť je pripojená.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
@@ -7592,11 +7641,11 @@ msgstr "Ďalšia nepr_ečítaná zložka"
 msgid "F_older..."
 msgstr "_Zložka..."
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Predošlá časť"
 
@@ -7654,7 +7703,7 @@ msgstr "Citácia"
 
 #: src/mainwindow.c:648
 msgid "_Update summary"
-msgstr "_Aktualizovať sumár"
+msgstr "_Aktualizovať súhrn"
 
 #: src/mainwindow.c:651
 msgid "Recei_ve"
@@ -7838,7 +7887,7 @@ msgstr "Z_načky"
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "Overiť podpis"
 
@@ -8043,7 +8092,7 @@ msgstr "Hlavičky stĺpcov"
 msgid "Th_read view"
 msgstr "Zobraziť _vlákna"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Skryť prečítané vlákna"
 
@@ -8051,7 +8100,7 @@ msgstr "Skryť prečítané vlákna"
 msgid "_Hide read messages"
 msgstr "S_kryť prečítané správy"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
@@ -8163,11 +8212,11 @@ msgstr "Podľa _zamknutia"
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "Zostupne"
 
@@ -8175,7 +8224,7 @@ msgstr "Zostupne"
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Zmeniť značky..."
 
@@ -8214,7 +8263,7 @@ msgstr "záznam filtrovania vypnutý\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Bez názvu"
 
@@ -8222,19 +8271,19 @@ msgstr "Bez názvu"
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8248,18 +8297,18 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, táto bude\n"
 "automaticky prehľadaná."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka „%s” už existuje."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8268,51 +8317,51 @@ msgstr ""
 "Nemožno vytvoriť schránku.\n"
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte právo zápisu."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Skončiť"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "_Synchronizovať"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplicitné správy..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 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:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8320,7 +8369,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:4713
+#: src/mainwindow.c:4717
 #, 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"
@@ -8328,11 +8377,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:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Mažem duplicitné správy vo všetkých zložkách..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8340,48 +8389,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:4762
+#: src/mainwindow.c:4766
 #, 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:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Zvoľte zložku na prechod"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 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:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 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:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prehľadávanie zložky %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8389,52 +8438,52 @@ 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:216 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: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:222
 #, c-format
 msgid "%s header"
 msgstr "Hlavička %s"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "hlavička"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "riadok hlavičky"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "riadok tela správy"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "značka"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "Nezáleží na veľkosti"
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "zisťujem či správa vyhovuje [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "správa vyhovuje\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "správa nevyhovuje\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(žiadna)"
 
@@ -8472,7 +8521,7 @@ msgstr "Prepísať súbor mbox"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Prepísať"
 
@@ -8701,8 +8750,8 @@ msgstr ""
 "\n"
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
@@ -8742,62 +8791,66 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "Otvoriť _pomocou..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "Odoslať do..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "_Zobraziť ako text"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "_Uložiť ako..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "Uložiť _všetky..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Uložiť všetky prílohy..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "MIME typ"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Zobraziť úplné informácie"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Znova overiť"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Na overenie kliknite na ikonu."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, 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:1101
+#: src/mimeview.c:1111
 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:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8805,37 +8858,37 @@ msgstr ""
 "Čas na overenie podpisu vypršal. Na zopakovanie kliknite na ikonu alebo "
 "stlačte „%s”."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr "Chyba overenia podpisu. Na zopakovanie kliknite na ikonu."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Chyba overenia podpisu. Na zopakovanie kliknite na ikonu alebo stlačte „%s”."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "Overovanie podpisu..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, 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:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor „%s”?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
 #, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
@@ -8844,19 +8897,19 @@ msgstr ""
 "Pri ukladaní časti správy %d nastala chyba. Chcete zrušiť operáciu alebo "
 "ignorovať chybu a pokračovať?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "Chyba pri ukladaní časti správy"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "Ignorovať"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "Ignorovať všetko"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8864,7 +8917,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:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8872,7 +8925,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:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8880,26 +8933,26 @@ msgstr[0] "%s, súbor zlyhal."
 msgstr[1] "%s, %d súbory zlyhali."
 msgstr[2] "%s, %d súborov zlyhalo."
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Zvoľte cieľovú zložku"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8908,7 +8961,7 @@ msgstr ""
 "Zadajte príkazový na otvorenie súboru:\n"
 "(„%s” bude nahradené názvom súboru)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8919,11 +8972,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Spustiť neznámy binárny súbor?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8935,20 +8988,20 @@ msgstr ""
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "Spustiť binárny súbor"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9059,77 +9112,77 @@ msgstr "Odhlásiť sa z diskusnej skupiny"
 msgid "Rename newsgroup folder"
 msgstr "Premenovať diskusnú zložku"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "Chýba autorizačný kód OAuth2\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "Chyba spojenia OAuth2\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "Chyba spojenia OAuth2 TLS\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "Prístupový token OAuth2 získaný\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "Prístupový token OAuth2 nezískaný\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "Obnovovací token OAuth2 získaný\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "Obnovovací token OAuth2 nezískaný\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "Náhradný obnovovací token OAuth2 poskytnutý\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "Náhradný obnovovací token OAuth2 neposkytnutý\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "Chyba zápisu soketu OAuth2\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "Uplynul časový limit socketu OAuth2\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "Prístupový token OAuth2 stále platný\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "Získanie prístupového tokenu OAuth2 pomocou obnovovacieho tokenu\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 skúšanie platného prístupového tokenu s autorizačným kódom\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "Prístupový a obnovovací token OAuth2 aktualizovaný\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "Originál OAuth2: %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "Kódovaný OAuth2: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9138,11 +9191,11 @@ msgstr ""
 "Dekódovaný OAuth2: %s\n"
 "\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Zadajte hlavnú tajnú vetu"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Nesprávna hlavná tajná veta."
 
@@ -9560,7 +9613,7 @@ msgstr "Áno"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Nie"
 
@@ -9577,7 +9630,7 @@ msgid "Delete selected files"
 msgstr "Zmazať zvolené súbory"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Najprv vyberať správy"
 
@@ -9590,97 +9643,97 @@ 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:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Vytvoriť archív"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Zadajte argumenty archivácie"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Zložka na archiváciu"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Zložka, ktorá je koreňom archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 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:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Meno archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Umiestnenie a meno archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Zvoliť"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 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:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Zvoľte komprimáciu"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, 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:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Zvoľte formát"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, 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:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Rôzne voľby"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Rekurzívne"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 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:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9691,11 +9744,11 @@ msgstr ""
 "Používajte s rozvahou, pretože dramaticky zvyšuje čas potrebný \n"
 "na vytvorenie archívu"
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "Pr_emenovať"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9706,7 +9759,7 @@ msgstr ""
 "Súbory budú pomenované v tvare: dátum_od at komu@predmet.\n"
 "Mená budú skrátené na maximálne 96 znakov"
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9714,11 +9767,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:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Voľby výberu"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9810,7 +9863,7 @@ msgstr "Odstrániť prílohy"
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Príloha"
@@ -9973,19 +10026,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Vylúčiť"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -9995,15 +10048,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Všetky"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: sťahujem správy..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrujem správy..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -10015,7 +10068,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:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -10024,21 +10077,21 @@ msgstr ""
 "Zásuvný modul Bogofilter nemohol filtrovať správu. Nemožno spustiť príkaz "
 "`%s %s %s`."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: analyzujem správu..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, 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:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: analyzujem správy..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10047,7 +10100,7 @@ msgstr ""
 "Analýza zlyhala; `%s %s %s` vrátilo chybu:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10076,13 +10129,13 @@ msgstr ""
 "\n"
 "Nastavenia nájdete v menu Nastavenie/Nastavenia/Zásuvné moduly/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Detekcia spamu"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Učenie spamu"
 
@@ -10106,7 +10159,7 @@ msgstr "Správy väčšie ako táto hodnota nebudú kontrolované"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "kiB"
 
@@ -10211,19 +10264,19 @@ msgstr "Cesta k programu bogofilter"
 msgid "Mark spam as read"
 msgstr "Označiť všetok spam ako prečítaný"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: vyberanie tela..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrovanie správy..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10235,7 +10288,7 @@ msgstr ""
 "Použite „/Označiť/Označiť ako spam” a „/Označiť/Označiť ako nie spam” na "
 "naplnenie Bsfilter niekoľko sto správami SPAM a nie SPAM."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -10243,11 +10296,11 @@ msgid ""
 msgstr ""
 "Zásuvný modul Bsfilter nemôže filtrovať správu. Nemožno spustiť príkaz `%s`."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: učenie zo správy..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10595,65 +10648,52 @@ msgstr ""
 "\n"
 "Nie je veľmi užitočný."
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Zobraziť obrázky"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Zobraziť zahrnuté obrázky"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Vykonať JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Vykonať zahrnutý JavaScript"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Vykonať aplety Java"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Vykonať zahrnuté aplety Java"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Spracovať objekty pomocou zásuvných modulov"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Spracovať zahrnuté objekty pomocou zásuvných modulov"
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Otvoriť v prehliadači (vzdialený obsah je zapnutý)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "Neurobiť nič (vzdialený obsah je vypnutý)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Proxy"
-
 #: 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:220
-msgid "Use proxy"
-msgstr "Použiť proxy"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Vzdialené zdroje"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10667,115 +10707,120 @@ 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:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Povoliť načítanie vzdialeného obsahu"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "Pri kliknutí na odkaz, predvolene"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Otvoriť v externom prehliadači"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 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:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "P_rehliadať"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Vyberte štýlopis"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "Načítavanie vzdialeného obsahu je vypnuté."
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Načítať obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Zapnúť vzdialený obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Povoliť JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Povoliť zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Povoliť Java"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Otvoriť odkazy v externom prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, 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:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Otvoriť obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Kopírovať odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Stiahnuť odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Uložiť obrázok ako"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Kopírovať obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Importovať kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
-msgstr "Vkusný"
+msgstr "Fancy"
+
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "Nebolo nájdené príslušné rozšírenie WebKit %s"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
-msgstr "Vkusný zobrazovač HTML"
+msgstr "Zobrazovač HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10876,194 +10921,6 @@ msgstr ""
 "Pridá hlavičku X-FETCH-TIME s dátumom a časom prijatia správy vo formáte "
 "RFC822"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "Zásuvný modul GData: Vyžadovaná autorizácia"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"Musíte povoliť pre Claws Mail prístup k k svojmu zoznamu kontaktov Google, "
-"aby ste mohli používať zásuvný modul GData.\n"
-"\n"
-"Navštívte stránku autorizácie Google kliknutím na tlačidlo nižšie. Po "
-"potvrdení autorizácie získate autorizačný kód. Tento kód zadajte do poľa "
-"nižšie, aby tse povolili prístup Claws Mail k svojmu zoznamu kontaktov "
-"Google."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "Krok 1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr "Kliknite tu na otvorenie autorizačnej stránky Google v prehliadači"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "Step 2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Zadajte kód:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "Zásuvný modul GData: Chyba dopytovania kontaktov: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "Pridaný %d z"
-msgstr[1] "Pridané %d z"
-msgstr[2] "Pridaných %d z"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "1 kontakt do vyrovnávacej pamäte"
-msgstr[1] "%d kontakty do vyrovnávacej pamäte"
-msgstr[2] "%d kontaktov do vyrovnávacej pamäte"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "Zásuvný modul GData: Štart asynchrónneho hľadania kontaktov\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "Zásuvný modul GData: Chyba hľadania skupín: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "Zásuvný modul GData: Skupiny prijaté\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "Zásuvný modul GData: Štart asynchrónneho hľadania skupín\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "Zásuvný modul GData: Chyba autorizácie: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "Zásuvný modul GData: Autorizácia úspešná\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-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:483
-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:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-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:496
-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:513
-#, 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:537
-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:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"Zásuvný modul GData: Od posledného obnovenia uplynulo: %d min, obnovujem "
-"teraz\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-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:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Autentifikácia"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Používateľské meno:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Interval výzvy [s]:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Maximálny počet výsledkov:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Zlyhala registrácia obsluhy udalosti „address completion” v zásuvnom module "
-"GData"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr ""
-"Zlyhala registrácia obsluhy udalosti „offline switch” v zásuvnom module GData"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Tento zásuvný modul poskytuje prístup k protokolu GData pre Claws Mail.\n"
-"\n"
-"Protokol GData je rozhranie k službám Google (Google services).\n"
-"Momentálne je implementovaná len funkcia na zahrnutie kontaktov Google do "
-"dopĺňania adries pomocou Tab.\n"
-"\n"
-"Spätná väzba na <berndth at gmx.de> je vítaná."
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "Integrácia GData"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11227,8 +11084,8 @@ msgid "Cache refresh interval"
 msgstr "Interval aktualizácie vyrovnávacej pamäte"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hodín"
 
@@ -11375,11 +11232,11 @@ msgstr "Veľkosť vyrovnávacej pamäte obrázkov v MB"
 msgid "Default font"
 msgstr "Predvolené písmo"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Otvoriť odkaz"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Kopírovať odkaz"
 
@@ -11475,7 +11332,7 @@ msgstr "Metóda auth nie je dostupná"
 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:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Filtrovať"
 
@@ -11607,7 +11464,7 @@ 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:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Informácie o servere"
 
@@ -11644,8 +11501,12 @@ msgstr "Použiť STARTTLS, keď je dostupné"
 msgid "Require STARTTLS"
 msgstr "Vyžadovať STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Autentifikácia"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Bez autentifikácie"
 
@@ -11659,28 +11520,28 @@ msgstr "Zadať autentifikáciu"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Automatické"
 
@@ -11719,8 +11580,8 @@ msgid ""
 "\n"
 "Current log is %s"
 msgstr ""
-"Tento zásuvný modul zapisuje zhrnutie hlavičky každej prijatej správy po "
-"triedení.\n"
+"Tento zásuvný modul zapisuje súhrn hlavičky každej prijatej správy po "
+"radení.\n"
 "\n"
 "Predvolene je ~/Mail/NewLog\n"
 "\n"
@@ -12004,7 +11865,7 @@ msgid "Never"
 msgstr "Nikdy"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Vždy"
 
@@ -12154,7 +12015,7 @@ msgstr "Zapnúť ikonu v systémovej lište"
 
 #: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
-msgstr "Skryť pri štarte"
+msgstr "Skryť pri spustení"
 
 #: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
@@ -12616,9 +12477,9 @@ msgstr "Vymazať z pamäte po"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavenie na „0” (nula) bude uchovávať heslo počas celej relácie"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minút"
 
@@ -12827,109 +12688,109 @@ msgstr "Chybný podpis od „%s”."
 msgid "The signature has not been checked"
 msgstr "Podpis nebol overený"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "Chyba kontroly podpisu: žiadny stav\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Chyba overenia podpisu: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, 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:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, 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:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Kľúču od %s skončila platnosť.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, 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:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Odvolaný kľúč od uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ZLÝ podpis od „%s”\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid „%s” (Validita: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "Odvolaný"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Dôvera vlastníka: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Bez kľúča!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Odtlačok primárneho kľúča:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, 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:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Overená adresa podpisu je „%s”\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, 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:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nemožno inicializovať údaje, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "Zadanie súkromného kľúča je nejednoznačné"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Súkromný kľúč nebol nájdený (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Chyba pri určení súkromného kľúča: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, 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:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12938,12 +12799,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:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, 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:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12951,18 +12812,18 @@ msgstr ""
 "GnuPG nie je správne nainštalované, alebo používate zastaralú\n"
 "verziu. Podpora OpenPGP bude vypnutá."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 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:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "Nebol nájdený žiadny PGP kľúč"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -12972,12 +12833,12 @@ 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:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, 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:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12985,11 +12846,11 @@ 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..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 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:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13002,15 +12863,15 @@ msgstr ""
 "\n"
 "Prajete si exportovať tento pár na kľúčový server?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Kľúč vygenerovaný"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Kľúč vyexportovaný."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "Nemožno exportovať kľúč."
 
@@ -13216,12 +13077,12 @@ msgid "Show Python console..."
 msgstr "Zobraziť konzolu Python..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Prechádzať"
@@ -13339,27 +13200,27 @@ msgstr ""
 "Nemožno čítať obsah starého súboru feeds.xml:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, 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:132
+#: src/plugins/rssyl/opml_export.c:129
 #, 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:142
+#: src/plugins/rssyl/opml_export.c:139
 #, 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:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Chyba počas zápisu súboru exportu kanála.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13372,7 +13233,7 @@ msgstr ""
 "\n"
 "Názov zložky „%s” nie je povolený."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13387,232 +13248,232 @@ msgstr ""
 "prijatými z webu. Môžete ich čítať a mazať, alebo aj ponechávať staré "
 "položky."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "RSS kanál"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(prázdne)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Obnoviť všetky kanály"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Odoberať kanál"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 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:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, 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:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, 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:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Odstráni strom kanálov"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "Vybrať súbor OPML"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: Prihlasovanie nového kanála: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: Nový kanál prihlásený: „%s” (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Aktualizácia kanála %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Aktualizácia kanála dokončená: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: Chyba získavania kanála z „%s” (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: Nenájdený platný kanál na „%s”\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: Nemožno spracovať kanál na „%s”\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 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:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "Základná autentifikácia HTTP"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Použiť predvolený interval aktualizácie"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Zachovať staré položky"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "_Orezať"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Aktualizuje kanál, odstráni položky, ktoré už v zdroji kanála nie sú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Sťahovať komentáre, ak je to možné"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Vždy označiť ako novú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 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:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "Nikdy neoznačovať ako novú"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 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:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Ignorovať zmenu nadpisu"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 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:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "Overiť platnosť certifikátu TLS"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Meno používateľa"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "Zdrojová URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 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:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dní"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 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:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Ak sa položka zmení"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Položiek"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Interval obnovenia"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 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:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Nastaviť vlastnosti kanála"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "_Obnoviť kanál"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "V_lastnosti kanála"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "Pre_menovať..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "Obnoviť r_ekurzívne"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "Prihlásiť _nový kanál..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "V_ytvoriť novú zložku..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Importovať zoznam kanálov..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Odstrániť strom"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "Pridať strom RSS zložiek"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Zadajte meno nového stromu RSS zložiek."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13621,90 +13482,90 @@ msgstr ""
 "Vytvorenie stromu zložiek zlyhalo.\n"
 "Niektoré súbory už možno existujú, alebo nemáte práva na zápis do nich?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Moje kanály"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Vyberte súbor cookies"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Predvolený interval obnovenia"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "Obnoviť všetky kanály pri spustení aplikácie"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
+msgstr "Obnoviť všetky kanály pri spustení"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Overiť platnosť certifikátu TLS nových kanálov"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Cesta k súboru cookies"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Cesta k súboru cookies.txt obsahujúcemu Vaše cookies v štýle Netscape"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Obnovovanie"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Bezpečnosť a súkromie"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "Nemožno vytvoriť zložku nového kanála „%s”."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Prihlásiť _nový kanál?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Zložka kanála:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 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."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "_Upraviť vlastnosti kanála po prihlásení"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Aktualizácia komentárov pre „%s”..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadovaná autorizácia)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Neprístupné)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Nenájdené)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Chyba %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13718,7 +13579,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13727,21 +13588,21 @@ msgstr ""
 "Nenájdený platný kanál na\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Kanál bez názvu"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, 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:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Aktualizácia kanála „%s”..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13754,11 +13615,11 @@ msgstr ""
 "\n"
 "Prosím, kontaktujte vývojára, toto by nemalo nastať."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 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:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13860,41 +13721,45 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "Hlásenie SPAM"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Zapnuté"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Poslať ďalej na:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Používateľské meno:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 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:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrovanie zásuvného modulu SpamAssassin zlyhalo.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 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:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrujem správu..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -13904,7 +13769,7 @@ msgstr ""
 "príčina je nedostupnosť servera spamd. Uistite sa, že server spamd beží a je "
 "dostupný."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13912,17 +13777,17 @@ msgstr ""
 "Claws Mail potrebuje sieťové pripojenie, aby mohol dodať správu vzdialenému "
 "učiacemu sa."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Zlyhalo získanie mena používateľa"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 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:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14364,7 +14229,7 @@ msgstr "Miesto:"
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Summary:"
-msgstr "Zhrnutie:"
+msgstr "Súhrn:"
 
 #: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Starting:"
@@ -14384,63 +14249,68 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akcia:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Nové stretnutie..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Exportovať kalendár..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "Prihlá_siť sa do Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "P_remenovať..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "Aktualizovať _prihlásenia"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "Zobrazenie _zoznamu"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "_Týždenný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "_Mesačný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Stretnutia"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[bez súhrnu]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "zajtra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "tento týždeň"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "neskôr"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14449,21 +14319,21 @@ msgstr ""
 "\n"
 "Toto sú plánované udalosti %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: 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:1635
+#: 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:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14476,7 +14346,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14487,110 +14357,110 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nemožno vytvoriť adresár %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 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:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Prijímanie kalendára pre %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "nové prihlásenie"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 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:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Prihlásiť sa do Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "Zadajte URL WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "Nemožno spracovať URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Naozaj sa chcete odhlásiť?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Odstrániť prihlásenie"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "prijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "nezáväzne prijaté"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "odmietnuté"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "neodpovedal"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "individuálne"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "skupina"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "zdroj"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "miestnosť"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "V minulosti"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Dnes"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Zajtra"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "Tento týždeň"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "Neskôr"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Prijaté: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Odmietnuté: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Nezáväzne prijaté: "
 
@@ -15002,95 +14872,95 @@ msgstr "Chybná časová značka v pozdrave\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Chybná časová značka v pozdrave (nie ascii)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "Chyba protokolu POP\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpoveď: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Odstraňujem starú správu %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Preskakujem správu %d [%s] (%d B)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "poštová schránka je zamknutá\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "Čas spojenia vypršal\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "nastala chyba relácie POP\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "Príkaz TOP nie je podporovaný\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Žiadne (len SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Názov účtu"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Nastaviť ako predvolené"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "Emailová adresa"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Automatická konfigurácia"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15098,81 +14968,81 @@ msgstr ""
 "Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP a News."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentifikáciu"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "Autentifikovať pri pripojení"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Lokálna poštová schránka"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Lokálne"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "Predvolený inbox"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tejto zložke"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "Autentifikovať pred pripojením POP"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "Zvoliť"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na servere po ich prijatí"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dní a 0 hodín: mazať ihneď"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15180,94 +15050,98 @@ 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:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "Zložka servera IMAP"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 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:1831
+#: src/prefs_account.c:1841
 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:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Veľkosť dávky"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatická kontrola"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Použiť globálne nastavenia"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Automaticky kontrolovať novú poštu každých"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 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:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Pridať hlavičku „user agent”"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15275,216 +15149,216 @@ 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:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "Autentifikovať cez POP pred odosielaním"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "Časový limit autentifikácie POP"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Autorizácia"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Zvoľte Poskytovateľa OAuth2 emailovej služby"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "ID klienta"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "Heslo klienta"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Získať autorizačný kód"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "Otvoriť predvolený prehliadač s požiadavkou"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Kopírovať odkaz"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Autorizačný kód"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
 "Prekopírujte kompletnú URL z prehliadača alebo poskytnutý autorizačný token"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Dokončiť autorizáciu"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Autororizovať"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "Automaticky vložiť podpis"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Prednastavený alternatívny slovník"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Nová"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 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:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 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:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "Nepoužívať TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "Použiť TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Použiť príkaz STARTTLS na vytvorenie šifrovanej relácie"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať TLS (v prípade potreby použiť STARTTLS)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 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:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Automaticky akceptovať platné certifikáty TLS"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Použiť neblokujúce TLS"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Vypnite túto voľbu, ak máte problémy pri spojeniach TLS"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Použiť proxy server"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 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:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Použiť globálne nastavenia proxy servera"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Používateľské meno"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Na odosielanie použiť proxy server"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15492,27 +15366,27 @@ 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:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Doménové meno"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15520,174 +15394,178 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 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:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "Nebol zadaný POP server."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "Nebol zadaný IMAP server."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "ID používateľa nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 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:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "Heslo SMTP nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "nie je zadaná doména."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "nie je zvolená zložka odoslaných."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "nie je zvolená zložka fronty."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "nie je zvolená zložka konceptov."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "nie je zvolená zložka koša."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Nastavenie nového účtu"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Zlyhalo (zlá adresa)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Zvoľte súbor certifikátu"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (zásuvný modul nie je načítaný)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "Autorizácia dokončená"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "Váš autorizačný kód OAuth2 bol v Claws Mail prijatý"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "Autorizácia nebola dokončená"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "Váš autorizačný kód OAuth2 nebol v Claws Mail prijatý"
 
@@ -15922,7 +15800,7 @@ msgstr "aplikuje akcie medzi {} na zvolené správy"
 msgid "for a literal %"
 msgstr "pre znak %"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Akcie"
 
@@ -16006,7 +15884,7 @@ msgstr "Automaticky spustiť externý editor"
 
 #: src/prefs_compose_writing.c:150
 msgid "Automatically save message to Drafts folder every"
-msgstr "Automaticky ukladať text správy medzi Koncepty každých"
+msgstr "Automaticky ukladať koncept správy každých"
 
 #: src/prefs_compose_writing.c:159 src/prefs_wrapping.c:100
 msgid "characters"
@@ -16228,7 +16106,7 @@ msgstr "Skryť"
 msgid "Message flags"
 msgstr "Príznaky správy"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Označiť"
@@ -16254,7 +16132,7 @@ msgstr "Označiť ako nie spam"
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Farebná menovka"
 
@@ -16269,7 +16147,7 @@ msgstr "Presmerovať"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Ohodnotenie"
@@ -16539,8 +16417,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Skryté položky"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Zobrazené položky"
 
@@ -16604,7 +16482,7 @@ msgstr "Vyberte farbu zložky"
 
 #: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
-msgstr "Spustiť spracovanie pravidiel pri štarte"
+msgstr "Spustiť spracovanie pravidiel pri spustení"
 
 #: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
@@ -16742,7 +16620,7 @@ msgstr "Použiť odlišné písmo pri tlačení"
 msgid "Message Printing"
 msgstr "Tlač správy"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Zobrazenie"
@@ -16995,11 +16873,11 @@ msgstr "telo správy"
 msgid "whole message"
 msgstr "celá správa"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "Označená"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Zmazaná"
 
@@ -17007,11 +16885,11 @@ msgstr "Zmazaná"
 msgid "Replied"
 msgstr "Odpovedaná"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Poslané ďalej"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Spam"
@@ -17020,7 +16898,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Má prílohu"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "Podpísané"
 
@@ -17532,7 +17410,7 @@ msgstr "Vyberte farbu skupiny riadkov"
 msgid "Hunk lines"
 msgstr "Skupiny riadkov"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Zoznam správ"
 
@@ -18016,112 +17894,116 @@ msgstr "Vyberte farbu nesprávneho slova. Použite čiernu na podčiarkovanie"
 msgid "Spell Checking"
 msgstr "Kontrola preklepov"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 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:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 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:172
+#: src/prefs_summaries.c:211
 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:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum aktuálnej lokalizácie"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Zobraziť počet správ vedľa názvu zložky"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Počet neprečítaných správ"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Počet neprečítaných a všetkých správ"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
-msgstr "Pri štarte otvoriť poslednú otvorenú zložku"
+msgstr "Pri spustení otvoriť poslednú otvorenú zložku"
+
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "Pri spustení otvoriť zvolenú zložku"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18129,99 +18011,99 @@ msgstr ""
 "Spustiť pravidlá spracovania pred označením všetkých správ v zložke ako "
 "prečítané alebo neprečítané"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "písmen"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "Zoznam správ"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Zamknúť hlavičky stĺpcov"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Zobrazené v stĺpci Od"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Meno a adresa"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Pomôcka formátu dátumu"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Nastaviť predvolený výber pri vstupe do zložky"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Otvoriť správu pri vybratí"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "Pri otvorení zložky"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "Pri zobrazení výsledkov hľadania"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 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:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "Pri mazaní alebo presúvaní správ"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "Pri použití kláves šipiek"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Označiť správu ako prečítanú"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "keď je vybratá, za"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 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:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Zobraziť dialóg „žiadne neprečítané (alebo nové) správy”"
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "Predpokladať „Áno”"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "Predpokladať „Nie”"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Zobraziť odosielateľa pomocou adresára"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 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:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18229,57 +18111,57 @@ 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:601
+#: src/prefs_summaries.c:668
 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:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Potvrdiť pred prepísaním menovky farby"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Zobraziť nástrojové tipy"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Predvolené"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Nové zložky"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Radiť podľa"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Číslo"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "Dátumu vlákna"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "Neradiť"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Zobraziť vlákna"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Zbaliť všetky vlákna"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Skryť prečítané správy"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Súhrny"
 
@@ -18450,7 +18332,7 @@ msgstr "Aktuálne šablóny"
 msgid "Template"
 msgstr "Šablóna"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Predvolená interná téma"
 
@@ -18458,21 +18340,16 @@ msgstr "Predvolená interná téma"
 msgid "Themes"
 msgstr "Témy"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Odstrániť systémovú tému: „%s”"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Odstrániť tému „%s”"
 
-#: src/prefs_themes.c:511
+#: 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:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18481,24 +18358,24 @@ msgstr ""
 "Chyba pri súbore %s\n"
 "počas odstraňovania témy."
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Chyba pri odstraňovaní zložky témy."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Téma bola úspešne odstránená"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Zvoľte zložku témy"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Nainštalovať tému „%s”"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18506,15 +18383,11 @@ msgstr ""
 "Táto zložka nevyzerá ako zložka s témou.\n"
 "Nainštalovať aj tak?"
 
-#: src/prefs_themes.c:576
-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:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "Téma existuje"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18526,25 +18399,25 @@ msgstr ""
 "\n"
 "Chcete ju nahradiť?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Nemožno zmazať starú tému v %s."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Nemožno vytvoriť cieľový adresár %s."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "Téma úspešne nainštalovaná."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "Zlyhala inštalácia témy"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18553,78 +18426,78 @@ msgstr ""
 "Chyba pri súbore %s\n"
 "počas inštalácie témy."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Zobraziť všetky ikony témy"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Je dostupných %d tém (%d používateľských, %d systémových, 1 interná)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Interná téma má %d ikon"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "O tejto téme nie sú k dispozícii žiadne informácie"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Chyba: nemožno zistiť stav témy"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d súborov (%d ikon), veľkosť: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Výber"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Inštalovať novú..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Získať ďalšie..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Informácie"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Autor"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Zobraziť všetko"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "Vykreslenie SVG"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "Povoliť priehľadnosť"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Vynútiť zväčšenie"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "Pixelov na palec (PPI)"
 
@@ -18773,7 +18646,7 @@ msgstr "Neboli definované žiadne kľúče príjemcov."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "Nemožno dekódovať časť"
 
@@ -19217,22 +19090,6 @@ msgstr ""
 "Pri odosielaní správy nastala chyba:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Nastavenia poštovej schránky"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Najprv musíte nastaviť umiestnenie poštovej schránky.\n"
-"Môžete použiť existujúcu poštovú schránku vo formáte MH,\n"
-"ak nejakú máte.\n"
-"Ak si nie ste istý, jednoducho zvoľte OK."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Zdroj správy"
@@ -19485,11 +19342,11 @@ msgstr "%d/%d zvolených (%s/%s), %d neprečítaných"
 
 #: src/summaryview.c:3088
 msgid "Sorting summary..."
-msgstr "Triedim zoznam správ..."
+msgstr "Radenie súhrnu..."
 
 #: src/summaryview.c:3260
 msgid "Setting summary from message data..."
-msgstr "Vytváram zoznam správ..."
+msgstr "Nastavujem súhrn z dát správ..."
 
 #: src/summaryview.c:3466
 msgid "(No Date)"
@@ -19509,11 +19366,11 @@ msgstr "Od: %s, na %s"
 msgid "To: %s, on %s"
 msgstr "Komu: %s, na %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "Nie ste autorom tohoto príspevku."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
@@ -19521,83 +19378,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:4558
+#: src/summaryview.c:4559
 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:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "Cieľ je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 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:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je rovnaký ako aktuálna zložka."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 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:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "Pripojiť alebo prepísať"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Pripojiť alebo prepísať existujúci súbor?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "Pri_pojiť"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "_Prepísať"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Nemožno uložiť súbor „%s”."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, 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:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Preskočiť tieto pravidlá"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 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:5792
+#: src/summaryview.c:5793
 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:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Filtrovanie"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19605,71 +19462,71 @@ msgstr ""
 "Niektoré pravidlá patria konkrétnemu účtu.\n"
 "Prosím vyberte si, ako pristupovať k týmto pravidlám:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Nastavenie spracovania"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 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:6089
+#: src/summaryview.c:6090
 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:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Obnoviť menovku farby"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Nastaviť farebnú menovku"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Ignorované vlákno"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Sledované vlákno"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Odpovedané, ale aj presmerované – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Odpovedané – kliknite na zobrazenie odpovede"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "Presunuté"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "Skopírované"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "Podpísané, má prílohu(y)"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "Zašifrované, má prílohu(y)"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Zašifrované"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19678,11 +19535,11 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 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:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
@@ -20535,179 +20392,3 @@ msgid ""
 msgstr ""
 "Program Claws Mail je pripravený.\n"
 "Kliknite na Uložiť a začnite."
-
-#~ 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"
-
-#, c-format
-#~ msgid ""
-#~ "rule is account-based [id=%d, name='%s'], current account [id=%d, "
-#~ "name='%s']\n"
-#~ msgstr ""
-#~ "pravidlo je závislé na účte [id=%d, názov='%s'], práve použitý účet "
-#~ "[id=%d, názov='%s']\n"
-
-#~ 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"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be permanently deleted. Recovery "
-#~ "will not be possible.\n"
-#~ "\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Všetky zložky a správy v „%s” budú trvalo odstránené. Ich obnovenie "
-#~ "nebude možné\n"
-#~ "\n"
-#~ "Naozaj chcete pokračovať?"
-
-#~ msgid "Skip"
-#~ msgstr "Preskočiť"
-
-#~ msgid "Skip all"
-#~ msgstr "Preskočiť všetko"
-
-#, c-format
-#~ msgid ""
-#~ "All folders and messages under '%s' will be deleted.\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "Všetky zložky a správy v „%s” budú odstránené.\n"
-#~ "Naozaj chcete pokračovať?"
-
-#~ msgid "ThNULL, e entry was not saved. Close anyway?"
-#~ msgstr "Položka nebola uložená. Zavrieť napriek tomu?"
-
-#~ msgid "Select preset:"
-#~ msgstr "Zvoľte sadu klávesových skratiek:"
-
-#~ msgid ""
-#~ "You can also modify each menu shortcut by pressing\n"
-#~ "any key(s) when focusing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Môžete modifikovať skratky každého menu stlačením\n"
-#~ "požadovanej skratky po ukázaní myšou na položku."
-
-#~ msgid "Tag is not set."
-#~ msgstr "Značka nie je nastavená."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Apply tags"
-#~ msgstr "Použiť značky"
-
-#~ 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é."
-
-#~ msgid "_Properties"
-#~ msgstr "_Vlastnosti"
-
-#~ msgid "SSL/TLS error"
-#~ msgstr "Chyba pri SSL/TLS"
-
-#~ msgid "g_thread is not supported by glib.\n"
-#~ msgstr "glib nepodporuje g_thread.\n"
-
-#~ msgid "Attach warner"
-#~ msgstr "Upozornenie na prílohu"
-
-#~ msgid "Warn when"
-#~ msgstr "Upozorniť pri"
-
-#~ msgid "Search the Web"
-#~ msgstr "Hľadať na webe"
-
-#~ msgid "UIDL"
-#~ msgstr "UIDL"
-
-#~ msgid "The Notification plugin needs threading support."
-#~ msgstr "Zásuvný modul Upozornenia potrebuje podporu vlákien (threading)."
-
-#~ msgid "Incorrect part"
-#~ msgstr "Nesprávna časť"
-
-#~ msgid "Not a text part"
-#~ msgstr "Iná ako textová časť"
-
-#~ msgid "Couldn't convert text data to any sane charset."
-#~ msgstr "Nemožno konvertovať textové dáta do žiadneho známeho kódovania."
-
-#~ msgid "Signature boundary not found."
-#~ msgstr "Hranica podpisu nebola nájdená."
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text"
-#~ msgstr "Vyberte farbu prvej úrovne textu"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text"
-#~ msgstr "Vyberte farbu druhej úrovne textu"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text"
-#~ msgstr "Vyberte farbu tretej úrovne textu"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text background"
-#~ msgstr "Vyberte farbu pozadia prvej úrovne textu"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text background"
-#~ msgstr "Vyberte farbu pozadia druhej úrovne textu"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text background"
-#~ msgstr "Vyberte farbu pozadia tretej úrovne textu"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for links"
-#~ msgstr "Vyberte farbu odkazov"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for signatures"
-#~ msgstr "Vyberte farbu podpisov"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for folder"
-#~ msgstr "Vyberte farbu zložky"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for inserted lines"
-#~ msgstr "Vyberte farbu vložených riadkov"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for removed lines"
-#~ msgstr "Vyberte farbu odstránených riadkov"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for hunk lines"
-#~ msgstr "Vyberte farbu skupiny riadkov"
-
-#~ msgid "Available URLs:"
-#~ msgstr "Dostupné linky:"
-
-#~ msgid "Please select the URL to open."
-#~ msgstr "Prosím zvoľte linku."
-
-#~ msgid "Enable customisable keyboard shortcuts"
-#~ msgstr "Povoliť prispôsobenie klávesových skratiek"
-
-#~ 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"
-#~ "Uncheck this option if you want to lock all existing keyboard shortcuts."
-#~ msgstr ""
-#~ "Ak je zvolené, môžete zmeniť klávesové skratky väčšiny položiek menu "
-#~ "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."
-
-#~ msgid "A_dd"
-#~ msgstr "Pri_dať"
-
-#~ msgid "Use secure authentication (APOP)"
-#~ msgstr "Použiť bezpečnú autentifikáciu (APOP)"
diff --git a/po/sv.po b/po/sv.po
index e15ad24dd..b4dc54abd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.17.2\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-10 14:32+0200\n"
-"PO-Revision-Date: 2022-10-11 15:17+0200\n"
+"POT-Creation-Date: 2023-11-13 17:53+0100\n"
+"PO-Revision-Date: 2023-11-13 18:03+0100\n"
 "Last-Translator: Andreas Rönnquist <andreas at ronnquist.net>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.1.1\n"
+"X-Generator: Poedit 3.4\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -56,8 +56,8 @@ msgstr "_Ny"
 msgid "Create a new account"
 msgstr "Skapa ett nytt konto"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -69,8 +69,8 @@ msgstr "Redigera inställningar för valt konto"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -86,8 +86,8 @@ msgstr "Ta bort"
 msgid "Delete the selected account from the list"
 msgstr "Ta bort det valda kontot från listan"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopiera"
@@ -128,26 +128,26 @@ msgstr "Flytta upp det valda kontot"
 msgid " _Set as default account "
 msgstr " _Sätt som standardkonto "
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "St_äng"
@@ -161,53 +161,52 @@ msgstr "Konton med fjärrmappar kan inte kopieras."
 msgid "Copy of %s"
 msgstr "Kopia av %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vill du verkligen ta bort konto '%s'?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Ingen titel)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -216,88 +215,88 @@ msgstr "Ta bort konto"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "Namn"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "Kan inte hämta meddelandefilen %d"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "Kan inte hämta del av meddelande."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Kan inte hämta del av flerdelat meddelande: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -306,11 +305,11 @@ msgstr ""
 "Den valda aktiviteten kan inte användas i Skriv meddelande fönstret\n"
 "på grund av att det innehåller %%f, %%F, %%as eller %%p."
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "Ingen filteraktivitet inställd"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -319,7 +318,7 @@ msgstr ""
 "Ogiltig filteraktivitet(er):\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -330,44 +329,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Färdigt"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Kör: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Avslutades: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Aktivitets in/ut data"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "_Kör"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -378,11 +377,11 @@ msgstr ""
 "('%%h' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Aktivitets gömda användarargument"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -393,24 +392,24 @@ msgstr ""
 "('%%u' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Aktivitets användarargument"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Kan inte kopiera en mapp till sig självt eller till sin understruktur."
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "Kan inte kopiera en adressbok till sig självt."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 "Kan inte flytta en mapp till sig självt eller till sin egen understruktur."
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Grupp"
@@ -483,40 +482,40 @@ msgstr ""
 "Vill du verkligen ersätta alla attributnamn\n"
 "med standarduppsättningen?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
-msgstr "I_nga"
+msgstr "_Nej"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Ja"
 
@@ -555,31 +554,30 @@ msgstr "_Lägg till"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_OK"
@@ -610,7 +608,7 @@ msgid ""
 msgstr ""
 "Claws-Mail kommer nu söka efter dubbletter av e-postadresser i adressboken."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Sök"
@@ -624,7 +622,7 @@ msgid "Duplicate email addresses"
 msgstr "Dubblerade e-postadress(er)"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adress"
@@ -633,11 +631,11 @@ msgstr "Adress"
 msgid "Address book path"
 msgstr "Sökväg till adressbok"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(er)?"
 
@@ -645,7 +643,7 @@ msgstr "Vill du verkligen ta bort adress(er)?"
 msgid "Delete address"
 msgstr "Ta bort adress(er)"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Adressdatan är skrivskyddad och kan därför inte tas bort."
 
@@ -657,7 +655,7 @@ msgstr "Lägg till i adressboken"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Kommentarer"
@@ -666,7 +664,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "Lägg till adress(er)"
 
@@ -674,50 +672,50 @@ msgstr "Lägg till adress(er)"
 msgid "Can't add the specified address"
 msgstr "Kan inte lägga till adressen"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "Adress_bok"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Ny adress_bok"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "Ny _katalog"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "Nytt _vCard"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "Nytt _JPilot"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "Ny LDAP-_server"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "_Redigera adressbok"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "_Ta bort adressbok"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -725,189 +723,189 @@ msgstr "_Ta bort adressbok"
 msgid "_Save"
 msgstr "_Spara"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "Markera _allt"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "Kli_stra in"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "Ny _adress"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "Ny _grupp"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "_Meddelande till"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "Sa_mmanfoga"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "Importera _LDIF fil..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "Importera M_utt fil..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "Importera _Pine fil..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "Exportera _HTML..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "Exportera _LDIF..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Hitta dubbletter..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Ändra anpassade attribut..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "_Bläddra Post"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Klar"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Felaktiga argument"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "Fil inte specificerad"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Fel vid öppnande av fil"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Fel vid läsande av fil"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Nådde slutet på filen"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Kunde inte allokera minne"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Fel filformat"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Fel vid öppnande av katalog"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "Ingen sökväg specificerad"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "Fel vid anslutning till LDAP server"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "Fel vid initiering av LDAP"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "Fel vid bindandet till LDAP server"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "Fel vid sökning av LDAP databas"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "Tidsgräns nådd vid LDAP operation"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "Fel i LDAP-sökkriterie"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "Inga LDAP objekt kunde hittas för sökkriteriet"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "LDAP sökning avbruten på begäran"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "Fel vid start av STARTTLS anslutning"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Distinguished Name (dn) saknas"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Obligatorisk information saknas"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "En annan kontakt finns med samma nyckel"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "Stark(are) autentisering krävs"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Källor"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Sök"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Ta bort grupp"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -915,26 +913,26 @@ msgstr ""
 "Vill du verkligen ta bort grupp(er)?\n"
 "Adresserna som den innehåller kommer inte gå förlorade."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Kan inte klistra in. Destinations adressboken är skrivskyddad."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Kan inte klistra in i en adressgrupp."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Vill du ta bort resultatet av förfrågan samt adresserna i '%s' ?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -943,20 +941,20 @@ msgstr ""
 "Vill du ta bort '%s' ? Om du bara tar bort mappen, så flyttas alla adresser "
 "till överliggande mapp."
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Ta endast bort _mapp"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Ta bort mapp och _adresser"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -965,7 +963,7 @@ msgstr ""
 "Vill du ta bort '%s'?\n"
 "Adresserna som den innehåller kommer inte gå förlorade."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -974,28 +972,28 @@ msgstr ""
 "Vill du ta bort '%s'?\n"
 "Adresserna som den innehåller kommer att gå förlorade."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "Sök '%s'"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Ny Kontakt"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara innehållsfil."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Gammal adressbok framgångsrikt konverterad."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -1003,7 +1001,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil."
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1011,7 +1009,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1019,7 +1017,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa ny adressindexfil."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1027,52 +1025,52 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Upptagen med att söka..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Adressböcker"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "LDAP-servrar"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "LDAP Fråga"
 
@@ -1155,42 +1153,42 @@ msgstr "Samla in e-postadresser från valda meddelanden"
 msgid "Collect email addresses from folder"
 msgstr "Samla in e-postadresser från mapp"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Vanliga adresser"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Personliga adresser"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Vanliga adress"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Personliga adress"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Adress(er) uppdaterade"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "Uppdatering misslyckades. Ändringar inte skrivna till Katalogen."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Fel"
@@ -1311,7 +1309,7 @@ msgstr "Din version av Claws Mail är för gammal för '%s' insticksmodulen."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Din version av Claws Mail är för gammal för insticksmodulen."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "TLS-handskakning misslyckades\n"
 
@@ -1331,7 +1329,7 @@ msgstr "felaktigt SMTP-svar\n"
 msgid "error occurred on SMTP session\n"
 msgstr "fel uppstod I SMTP session\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "fel uppstod vid autentisering\n"
 
@@ -1340,7 +1338,7 @@ msgstr "fel uppstod vid autentisering\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Meddelandet är för stort (Maximal storlek är %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "kunde inte starta STARTTLS-session\n"
 
@@ -1477,212 +1475,212 @@ msgstr "%d,%02dMiB"
 msgid "%.2fGiB"
 msgstr "%.2fGiB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "söndag"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "måndag"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "torsdag"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "fredag"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "lördag"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "mars"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augusti"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "sön"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "mån"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "tis"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ons"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "tor"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "fre"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "lör"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "FM"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "EM"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "fm"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "em"
@@ -1699,371 +1697,371 @@ msgstr ""
 "\n"
 "Signering och kryptering har inaktiverats för detta meddelande."
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "_Lägg till..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "_Stavning"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "Skicka"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Skicka senare"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "_Bifoga fil"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "_Infoga fil"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "Infoga si_gnatur"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "E_rsätt signatur"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Ångra"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Gö_r om"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "Klistra in _special"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Som _citat"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "_Radbruten"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "Ej radbr_uten"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Markera _alla"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "Avancerat"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "Flytta ett tecken bakåt"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "Flytta ett tecken framåt"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "Flytta ett ord bakåt"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "Flytta ett ord framåt"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "Flytta till början av rad"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "Flytta till slutet på rad"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "Flytta till föregående rad"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "Flytta till nästa rad"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Ta bort ett tecken bakåt"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Ta bort ett tecken framåt"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Ta bort ett ord bakåt"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Ta bort ett ord framåt"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Ta bort rad"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Ta bort till slutet av raden"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "Radbryt _stycke"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Radbryt alla _långa rader"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "Redigera med e_xtern redigerare"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "_Kontrollera alla eller kontrollera markering"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "_Markera alla felstavade ord"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "Kontrollera felstavade ord _bakåt"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "_Hoppa till nästa felstavade ord"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "_Svarsläge"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "Sekretess_system"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Teckenkodning"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabiska"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japansk (EUC-JP)"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreanska"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adressbok"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "_Mall"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Aktiviteter"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_Om"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "Automatiskt radbrytning"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Automatiskt _indrag"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "Signera"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "Kryptera"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "Begär läskvitto"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "Ta b_ort referenser"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Visa linjal"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Alla"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "Av_sändare"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "_Sändlista"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "_Högsta"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "Hö_g"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "L_åg"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "_Lägsta"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automatiskt"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitars ASCII (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Nytt meddelande Från-formatfel."
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Nytt meddelande ärende-formatfel."
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "\"Nytt meddelande\"-mallen har ett fel i meddelandetexten på rad %d."
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Kan inte svara. Ursprungsmeddelandet finns troligen inte."
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "\"Från\"-fältet av \"Svar\"-mallen innehåller en ogiltig email-adress."
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Meddelandetexten av \"Svara\"-mallen har ett fel på rad %d."
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -2071,56 +2069,56 @@ msgstr ""
 "\"Från\"-fältet av \"Vidarebefordra\"-mallen innehåller en ogiltig email-"
 "adress."
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "Meddelandetexten av \"Vidarebefordra\"-mallen har ett fel på rad %d."
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Vb: många meddelande"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "\"Omdirigera\"-mallen har ett fel i meddelandetexten på rad %d."
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Svara till:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Uppföljning Till:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Svar-På:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Till:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Kunde inte bifoga en fil (omvandling av teckenuppsättning misslyckades)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2135,16 +2133,16 @@ msgstr[1] ""
 "Följande filer har bifogats: \n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Citattecknen\" av mallen är ogiltiga."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kunde inte ta storleken på filen '%s'."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2152,57 +2150,57 @@ msgid ""
 msgstr ""
 "Du är på väg att infoga en fil på %s i meddelandetexten. Vill du fortsätta?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "Bifog_a ändå"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan inte läsa %s."
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[inget ämne] - Skriv meddelande%s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Skriv meddelande"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2210,62 +2208,62 @@ msgstr ""
 "Konto för att skicka e-post är inte specificerat.\n"
 "Var god välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "Den enda mottagaren är standardadressen '%s'. Skicka ändå?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Skicka"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "Mottagare har inte specificerats."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Ämnesraden är tom. %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Skicka ändå?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Köa det ändå?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "_Kö"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Skickar till %d mottagare. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "Kunde inte köa meddelandet."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2276,7 +2274,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2287,7 +2285,7 @@ msgstr ""
 "\n"
 "Signeringsfel: %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2298,7 +2296,7 @@ msgstr ""
 "\n"
 "Kryptering misslyckades: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2308,7 +2306,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenuppsättning."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2318,7 +2316,7 @@ msgstr ""
 "\n"
 "Kunde inte få tag i mottagarens krypteringsnyckel."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2326,16 +2324,17 @@ msgstr ""
 "Meddelandet var lagt i kö men kunde inte skickas.\n"
 "Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
+"Du kan försöka att \"Skicka\" igen eller köa meddelandet med \"Skicka "
+"senare\""
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2346,7 +2345,7 @@ msgstr ""
 "till den specificerade %s kodningen.\n"
 "Skicka som det %s?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2359,100 +2358,104 @@ msgstr ""
 "\n"
 "Skicka ändå?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Varning om kryptering"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "F_ortsätt"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "Det finns inget konto för att skicka e-post tillgängligt!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Valt konto är inte NNTP: Omöjligt att skicka."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bilagan %s existerar inte längre. Ignorera?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Avbryt utkast"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Avbryt sändning"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Ignorera bilaga"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Ursprunglig %s del"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Lägg till i adress_boken"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Ta bort innehållet i inmatningsfältet"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Använd <tabb> för automatisk ifyllning från adressbok"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Mime typ"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "Spara meddelande i "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "Välj mapp att spara meddelande till"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "Öv_rigt"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "Ämne:"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2461,19 +2464,19 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "_Från:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Konto att använda för denna e-post"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Avsändaradress att användas"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2482,50 +2485,50 @@ msgstr ""
 "Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera "
 "eller kryptera detta meddelande."
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "Ingen"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Mallens meddelandetext har ett fel på rad %d."
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Mall '%s' formatfel."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2534,14 +2537,14 @@ msgstr ""
 "Kunde inte skriva till filen:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr ""
 "Socketkommunikation med en extern redigerare finns inte tillgängligt på "
 "Windows."
 
-#: src/compose.c:9710
+#: src/compose.c:9702
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2552,21 +2555,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Extern redigerare stoppade med ett fel: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "processid: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "processid: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2577,21 +2575,21 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna skicka "
 "denna e-post."
 
-#: src/compose.c:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2599,24 +2597,24 @@ msgstr ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "_Överge e-post"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte läsas."
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2625,59 +2623,50 @@ msgstr ""
 "Filen '%s' innehåller ogiltiga tecken\n"
 "för den aktuella teckenkodningen, inmatning kan bli fel."
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "Överge meddelande"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "Detta meddelande har ändrats. Vill du överge det?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Överge"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Detta meddelande har ändrats. Vill du spara de senaste ändringarna?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vill du använda mallen '%s' ?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"Storlek på inklistrad text överstiger gränsen (%dKiB) för inklisting.\n"
-"Bifoga som fil istället."
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2692,20 +2681,20 @@ msgstr[1] ""
 "Vill du infoga innehållet i de %d filerna i meddelandetexten, eller bifoga "
 "det till meddelandet?"
 
-#: src/compose.c:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel på rad %d."
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2923,7 +2912,7 @@ msgid " Check File "
 msgstr " Undersök fil "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Fil"
 
@@ -2968,12 +2957,12 @@ msgid "Input the new name of folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Ny mapp"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -3001,13 +2990,13 @@ msgstr "Lägg till nytt JPilotfält"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Redigera LDAP - Välj sökbas"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Värdnamn"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3068,7 +3057,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3195,11 +3184,11 @@ msgstr "Matcha namn 'innehållande' sökterm"
 
 #: src/editldap.c:636
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using \"begins-"
+"with\" or \"contains\" search term. Check this option to perform a "
+"\"contains\" search; this type of search usually takes longer to complete. "
+"Note that for performance reasons, address completion uses \"begins-with\" "
+"for all searches against other address interfaces."
 msgstr ""
 "Sökningar efter namn och adresser kan utföras antingen med söktermen "
 "\"begins-with\" (börjar med) eller \"contains\" (innehåller). Kryssa i detta "
@@ -3231,8 +3220,8 @@ msgstr "Bindlösenord"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Lösenord som ska användas vid anslutning som \"Bind DN\" användaren."
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Visa lösenord"
@@ -3254,11 +3243,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximalt antal poster som ska returneras i sökresultatet."
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Utökat"
 
@@ -3276,8 +3265,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "Redigera etiketter"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Etikett"
 
@@ -3405,15 +3394,15 @@ msgstr "HTML målFil"
 msgid "B_rowse"
 msgstr "B_läddra"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Stilmall"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Ingen"
 
@@ -3662,7 +3651,7 @@ msgstr "Exportera adressbok till LDIF-fil"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "Exportera till mbox-fil"
 
@@ -3843,11 +3832,11 @@ msgstr "regel är kontobaserad, och matcher inte aktuellt konto\n"
 #: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account "
+"[id=%d, name='%s']\n"
 msgstr ""
-"regel är kontobaserad [id=%d, namn='%s'], matchar inte aktuellt konto [id="
-"%d, namn='%s']\n"
+"regel är kontobaserad [id=%d, namn='%s'], matchar inte aktuellt konto "
+"[id=%d, namn='%s']\n"
 
 #: src/filtering.c:795
 #, c-format
@@ -3937,61 +3926,61 @@ msgstr ""
 "filtrerar meddelande (%s%s%s)\n"
 "%smeddelandefil: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Inkorgen"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Kö"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Behandlar (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopierar %s till %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Flyttar meddelande %s till %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Uppdaterar cache %s...."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "Behandlar meddelanden..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synkroniserar %s för frånkopplad användning...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Ett mappnamn kan inte börja eller sluta med punkt."
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "Ett mappnamn kan inte börja eller sluta med ett mellanslag."
 
@@ -4000,7 +3989,7 @@ msgid "Select folder"
 msgstr "Välj mapp"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "Nymapp"
 
@@ -4011,99 +4000,103 @@ msgstr "Ärv egenskaper och behandlingsregler från överliggande mapp"
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Ett mappnamn kan inte innehålla '%c'."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Mappen '%s' finns redan."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan inte skapa mappen '%s'."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "_Markera alla som lästa"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Markera alla som olästa"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Markera alla som lästa rekursi_vt"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Markera alla som olästa rekursi_vt"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "Kör behandlingsregler"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Sök i mapp..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Öppna vid uppstart"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "Behandla..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "T_öm papperskorg..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "Skicka köade..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Välj visade kolumner"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Ny(a)"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Oläst(a)"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Totalt"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Markera alla som lästa"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4111,15 +4104,15 @@ msgstr ""
 "Vill du verkligen markera all e-post i denna mapp och dess undermappar som "
 "lästa?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Vill du verkligen markera alla meddelanden i denna mapp som lästa?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Markera alla som olästa"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
@@ -4127,95 +4120,95 @@ msgstr ""
 "Vill du verkligen markera all e-post i denna mapp och dess undermappar som "
 "olästa?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Vill du verkligen markera all e-post i denna mapp som oläst?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Avsöker mapp %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Avsöker mapp %s...."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapplista"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Den lokala bufferten kommer att tas bort om du uppdaterar mapplistan. Vill "
 "du fortsätta?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapplistan..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Söker igenom mapplistan..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunde inte genomsöka mapp %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelande i alla mappar..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Stänger mapp %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öppnar mapp %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "Mappen kunde inte öppnas."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Töm papperskorg"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Ta bort alla meddelande från papperskorgen?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "_Töm papperskorg"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Varning om frånkopplat läge"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Du arbetar frånkopplad. Åsidosätta?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Skicka alla köade meddelanden?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Några fel uppstod vid avsändande av meddelanden i kö."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4224,64 +4217,64 @@ msgstr ""
 "Några fel uppstod vid skickande av köade meddelanden:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Vill du verkligen kopiera mappen '%s' i '%s'?"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Vill du verkligen göra mappen '%s' till en undermapp till '%s' ?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Kopiera mapp"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Flytta mapp"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiera %s till %s..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyttar %s till %s..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "Källa och destination är de samma."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan inte kopiera en mapp till ett av dess barn."
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "Kan inte flytta en mapp till ett av dess barn."
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mapp kan inte flyttas mellan olika brevlådor."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "Kopiering misslyckades!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "Flytt misslyckades!"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Behandlar konfiguration för mappen %s"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Destinationsmappen kan bara användas till att spara undermappar."
 
@@ -4326,8 +4319,8 @@ msgid "read-only"
 msgstr "skrivskyddad"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "okänd"
 
@@ -4367,13 +4360,13 @@ msgstr ""
 "Claws Mail är fri programvara släppt under GPL-licensen. Om du vill donera "
 "till Claws Mail-projektet kan du göra det på:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "Claws-Mail-gruppen\n"
 "och Hiroyuki Yamamoto"
 
@@ -4408,7 +4401,7 @@ msgstr ""
 "Lokal: %s (teckenkodning: %s)\n"
 "Operativsystem: okänt"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Claws Mail-laget"
 
@@ -4532,73 +4525,78 @@ msgstr ""
 "Du bör ha fått en kopia av GNU General Public License tillsammans med detta "
 "program; om inte, se "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Sessionsstatistik\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Startat: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Inkommande trafik\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mottagna meddelanden: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "Skräppostmeddelanden: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Utgående trafik\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nya/Omdirigerade meddelanden: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Besvarade meddelanden: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Vidarebefordrade meddelanden: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totalt utgående meddelanden: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "Om Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Författare"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "F_unktioner"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Licens"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "Ve_rsionsinformation"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "_Statistik"
 
@@ -4806,7 +4804,7 @@ msgid "Configuring..."
 msgstr "Konfigurerar..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Datum"
@@ -4815,9 +4813,9 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "Från"
@@ -4838,9 +4836,9 @@ msgstr "Avsändare:"
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Till"
@@ -4876,9 +4874,9 @@ msgstr "Referenser"
 msgid "References:"
 msgstr "Referenser:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Ämne"
@@ -4888,7 +4886,7 @@ msgstr "Ämne"
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Kommentarer"
 
@@ -5002,8 +5000,8 @@ msgid "Seen:"
 msgstr "Seen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Status"
@@ -5076,7 +5074,7 @@ msgstr "Företräde"
 msgid "Precedence:"
 msgstr "Företräde:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Organisation"
 
@@ -5397,9 +5395,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5413,7 +5410,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5428,7 +5425,7 @@ msgstr "_Ladda..."
 msgid "_Unload"
 msgstr "Ta bort"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -5450,8 +5447,8 @@ msgid "Loaded plugins"
 msgstr "Inlästa insticksmoduler"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "_Applicera"
 
@@ -5464,10 +5461,10 @@ msgid "_Hide"
 msgstr "_Dölj"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Konto"
@@ -5537,17 +5534,17 @@ msgid "forwarded messages"
 msgstr "vidarebefordrade meddelanden"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "meddelanden som har bifogade filer"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "meddelanden som innehåller S i namn eller värde i något brevhuvud"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "meddelanden som innehåller S i värdet i något brevhuvud"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "meddelanden som har bifogade filer"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "meddelanden som innehåller S i brevhuvudet Message-ID"
@@ -5637,20 +5634,20 @@ msgid "unread messages"
 msgstr "olästa meddelanden"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "meddelanden som innehåller V i brevhuvudet H"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "meddelanden som innehåller S i referenshuvud"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "meddelanden som returnerar 0 när de skickas till kommando - %F är "
 "meddelandefil"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "meddelanden som innehåller S i brevhuvudet X-Label"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "logisk OCH operator"
@@ -5698,55 +5695,55 @@ msgstr ""
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Något gick fel under sökning. Vänligen kontrollera dina loggar."
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Från/Till/CC/Ämne/Etiketter"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Rekursivt"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Klibbig"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Sök vid inmatning"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Kör vid markering"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "Töm"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Rensa nuvarande sökning"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Redigera sökkriterie"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Information om utökade symboler"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "_Redigera"
 
@@ -5925,16 +5922,16 @@ msgstr "(Inget ämne)"
 msgid "Error:"
 msgstr "Fel:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Filstorlek:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Ladda bild"
 
@@ -6124,7 +6121,7 @@ msgstr "TLS-fel"
 msgid "Unknown error [%d]"
 msgstr "Okänt fel [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6136,7 +6133,7 @@ msgstr ""
 "CRAM-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om CRAM-MD5 SASL insticksmodulen är installerad."
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6148,7 +6145,7 @@ msgstr ""
 "DIGEST-MD5 inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om DIGEST-MD5 SASL insticksmodulen är installerad."
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6160,7 +6157,55 @@ msgstr ""
 "SCRAM-SHA-1-inloggning fungerar endast om libetpan har kompilerats med SASL-"
 "stöd och om SCRAM SASL-insticksmodulen är installerad."
 
-#: src/imap.c:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-224-inloggning fungerar endast om libetpan har kompilerats med "
+"SASL-stöd och om SCRAM SASL-insticksmodulen är installerad."
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-256-inloggning fungerar endast om libetpan har kompilerats med "
+"SASL-stöd och om SCRAM SASL-insticksmodulen är installerad."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-384-inloggning fungerar endast om libetpan har kompilerats med "
+"SASL-stöd och om SCRAM SASL-insticksmodulen är installerad."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-512-inloggning fungerar endast om libetpan har kompilerats med "
+"SASL-stöd och om SCRAM SASL-insticksmodulen är installerad."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6172,7 +6217,7 @@ msgstr ""
 "PLAIN-inloggning fungerar endast om libetpan har kompilerats med SASL-stöd "
 "samt PLAIN SASL-insticksmodulen är installerad."
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6184,7 +6229,7 @@ msgstr ""
 "LOGIN-inloggning fungerar endast om libetpan har kompilerats med SASL-stöd "
 "samt LOGIN SASL-insticksmodulen är installerad."
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6194,38 +6239,38 @@ msgstr ""
 "\n"
 "OAuth2-fel. Kontrollera och korrigera dina kontoinställningar för OAuth2."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP-anslutning till %s har blivit nedkopplad. Ansluter igen...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna kontakta "
 "IMAP-servern."
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6239,108 +6284,108 @@ msgstr ""
 "Vill du fortsätta att ansluta till den här servern? Kommunikationen kommer "
 "inte vara säker."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Försätt ansluta"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Konto '%s': Ansluter till IMAP-server: %s:%d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Kan inte ansluta till IMAP-server: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP-server: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "Kan inte starta STARTTLS-session.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunde inte logga in på IMAP4-server %s.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunde inte logga in på IMAP-server %s."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "Lägger till meddelanden..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopierar meddelanden..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "Sökning misslyckades på grund av serverfel."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "kan inte sätta borttaget-flaggor\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Letar efter icke prenumererade mappar i %s..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Letar efter undermappar till %s...."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST mislyckades\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte döpa om brevlåda: %s till %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "LIST misslyckades\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "Flaggar meddelande..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Servern kräver STARTTLS för att logga in.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan inte uppdatera egenskaper.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6349,20 +6394,24 @@ msgstr ""
 "Anslutning till %s misslyckades: servern kräver STARTTLS, men Claws-Mail har "
 "kompilerats utan stöd för STARTTLS.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "Serverinloggningar är avaktiverade.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "Hämtar meddelande..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Utplånar borttagna meddelanden..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan inte sätta borttaget-flaggor: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6392,7 +6441,7 @@ msgid "Cop_y folder..."
 msgstr "_Kopiera mapp..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "_Ta bort mapp..."
 
@@ -6412,7 +6461,7 @@ msgstr "Pren_umerationer"
 msgid "_Subscribe..."
 msgstr "_Prenumerera..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "Säg _upp prenumeration..."
 
@@ -6444,21 +6493,21 @@ msgstr ""
 "endast och inga meddelanden, lägg till '/' på slutet av namnet)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Ange nytt namn för '%s':"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6477,7 +6526,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "Välj mapp att kopiera mappen '%s' till"
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6491,8 +6540,8 @@ msgstr ""
 "Vill du verkligen ta bort?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen '%s'."
@@ -6688,9 +6737,9 @@ msgid ""
 msgstr ""
 "Välj LDIF-fältet som kommer att döpas om eller bli valt för import i listan "
 "ovan. Reserverade fält (markerade med en bock i \"R\"-kolumnen), blir "
-"automatiskt importerade och kan inte döpas om. En enkelklick i Select- (\"S"
-"\")-kolumnen markerar fältet för import med en bock. Ett enkelklick var som "
-"i raden väljer det fältet för omdöpning i fältet under listan. Genom att "
+"automatiskt importerade och kan inte döpas om. En enkelklick i Select- "
+"(\"S\")-kolumnen markerar fältet för import med en bock. Ett enkelklick var "
+"som i raden väljer det fältet för omdöpning i fältet under listan. Genom att "
 "dubbelklicka var som helst i raden så väljer du fältet för import."
 
 #: src/importldif.c:774
@@ -6799,8 +6848,8 @@ msgstr "Förbindelse misslyckades"
 msgid "Auth failed"
 msgstr "Aut. misslyckades"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Låst"
 
@@ -6971,8 +7020,8 @@ msgstr "Införlivande avbröts\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "sekunder"
 
@@ -7035,7 +7084,7 @@ msgstr "LDAP-fel (sökning): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Smeknamn"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7044,7 +7093,7 @@ msgstr ""
 "Filen '%s' finns redan.\n"
 "Kan inte ska skapa mapp."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7053,7 +7102,7 @@ msgstr ""
 "Konfiguration för %s hittad.\n"
 "Vill du migrera denna konfiguration?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7066,11 +7115,11 @@ msgstr ""
 "Dina Sylpheed-filterregler kan konverteras av ett\n"
 "skript tillgängligt på %s."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Behåll gammal konfiguration"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7080,27 +7129,27 @@ msgstr ""
 "kommer att ta ett stund om du har cachad IMAP eller diskussionsgruppsdata, "
 "och kommer ta extra plats på din disk."
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopierar konfiguration...Detta kan ta en stund..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Migrationen misslyckades!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Migrerar konfiguration..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(eller äldre)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7119,7 +7168,7 @@ msgstr[1] ""
 "konfiguration för mer information:\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7129,7 +7178,7 @@ msgstr ""
 "Det kan bero på ett misslyckat IMAP-konto. Använd \"Uppdatera mapplista\" i "
 "snabbmenyn till brevlådans föräldramapp för att försöka fixa det."
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7139,76 +7188,76 @@ msgstr ""
 "den. Den är troligtvis tillhandahållen av en utdaterad extern insticksmodul. "
 "Vänligen installera insticksmodulen och försök igen."
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Saknar filnamn\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "Kan inte öppna filnamn för läsning\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Felaktigt brevhuvud\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplicerat brevhuvud 'To:'\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "Nödvändigt brevhuvud 'To:' saknas\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Försök med -h eller --help för användning.\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Saknar fil-argument för alternativet %s"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Saknar eller tomt uri-argument för alternativet %s"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Saknar uri-argument för alternativet %s"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "Saknar åtminstone ett icke-tomt filargument för alternativet %s"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "Saknar mapp, typ och förfrågeargument för alternativet %s"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Saknar typ och förfrågeargument för alternativet %s"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Saknar frågeargument för alternativet %s"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [VAL]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]               öppna nytt meddelandefönster"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7226,13 +7275,13 @@ msgstr ""
 "krävs) tills tom rad,\n"
 "                                   sedan meddelandetexten tills filslut."
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe uri                  prenumerera på den angivna URI'n, om "
 "möjligt"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7241,7 +7290,7 @@ msgstr ""
 "  --attach fil1 [fil2]...          öppna nytt meddelandefönster med valda "
 "filer bifogade"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7250,24 +7299,24 @@ msgstr ""
 "  --insert fil1 [fil2]...          öppna nytt meddelandefönster med valda "
 "filer infogade"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive                        ta emot nya meddelanden"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all                    ta emot nya meddelanden från alla konton"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving               avbryt mottagande av meddelanden"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending                 avbryt skickande av meddelanden"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7287,29 +7336,29 @@ msgstr ""
 "                                   rekursivt: falskt om arg. börjar på 0, n, "
 "N, f eller F"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                           skicka alla köade meddelanden"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...               visa totalt antal meddelanden"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [mapp]...          visa status för varje mapp"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics                     visa sessionsstatistik"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics               återställ sessionsstatistik"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7319,46 +7368,46 @@ msgstr ""
 "                                   mapp är ett mapp-id som 'mapp/"
 "underkatalog', en file://-uri eller en absolut sökväg"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online                         byt till anslutet läge"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                        byt till frånkopplat läge"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q                 avsluta Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d                       avlusningsläge"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug                   växla avlusningsläge"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h                        visa denna hjälp"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v                     skriv ut versionsinformation"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V                skriv ut versionsinformation och "
 "information om inbyggda funktioner"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                     skriv ut konfigurationsmapp"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7366,7 +7415,7 @@ msgstr ""
 "  --alternate-config-dir mapp\n"
 "                                   använd angiven konfigurationsmapp"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7374,48 +7423,48 @@ msgstr ""
 "  --geometry -geometry [BxH][+X+Y]\n"
 "                                   sätt geometri för huvudfönster"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Saknar mappargument för alternativet %s"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Saknar geometriargument för alternativet %s"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Saknar mappargument för alternativet %s"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Okänt alternativ [%s]"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Behandlar (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "toppnivåmapp"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några osända meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "Nätverkshanteraren: nätverket är online.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "Nätverkshanteraren: nätverket är frånkopplat.\n"
 
@@ -7599,11 +7648,11 @@ msgstr "Nästa olästa _mapp"
 msgid "F_older..."
 msgstr "Mapp..."
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Nästa del"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Föregående del"
 
@@ -7845,7 +7894,7 @@ msgstr "_Etiketter"
 msgid "Re-_edit"
 msgstr "_Omredigera"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "Kontrollera signatur"
 
@@ -8050,7 +8099,7 @@ msgstr "Kolumnrubriker"
 msgid "Th_read view"
 msgstr "Tr_ådvy"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Dölj lästa trådar"
 
@@ -8058,7 +8107,7 @@ msgstr "Dölj lästa trådar"
 msgid "_Hide read messages"
 msgstr "_Dölj lästa meddelanden"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Dölj borttagna meddelanden"
 
@@ -8170,11 +8219,11 @@ msgstr "Efter låst"
 msgid "D_on't sort"
 msgstr "S_ortera inte"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "Stigande"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "Fallande"
 
@@ -8182,7 +8231,7 @@ msgstr "Fallande"
 msgid "_Auto detect"
 msgstr "Upptäck _automatiskt"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Redigera etiketter..."
 
@@ -8221,7 +8270,7 @@ msgstr "filtreringslogg avaktiverad\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Namnlös"
 
@@ -8229,19 +8278,19 @@ msgstr "Namnlös"
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelande från papperskorgar?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "A_vsluta inte"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8255,18 +8304,18 @@ msgstr ""
 "Om platsen för en existerande brevlåda specificeras, kommer den\n"
 "att genomsökas automatiskt."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Brevlådan '%s' finns redan."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8275,170 +8324,170 @@ msgstr ""
 "Skapande av brevlåda misslyckades.\n"
 "Några filer finns kanske redan, eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Inte tillåtet att skicka"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Fel vid import av mbox-fil."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Export till mbox misslyckades."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Avsluta Claws Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Vill du synkronisera dina mappar nu?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "_Synkronisera"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Inga meddelandedubbletter funna i vald mapp.\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "Tog bort %d meddelandedubblett i vald mapp.\n"
 msgstr[1] "Tog bort %d meddelandedubbletter i vald mapp.\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
 msgstr[0] "Markerade %d meddelandedubblett i vald mapp.\n"
 msgstr[1] "Markerade %d meddelandedubbletter i vald mapp.\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Tar bort meddelandedubbletter i alla mappar..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Ta bort %d meddelandedubbletter i %d mappar.\n"
 msgstr[1] "Ta bort %d dubblerade meddelande i %d mappar.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Inga meddelandedubbletter hittade i %d mappar.\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Välj mapp att gå till"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Behandlingsregler att applicera före mappregler"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "Behandlingsregler att applicera efter mappregler"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Filtreringskonfiguration"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan inte registrera som standardklient: omöjligt att hitta sökväg till "
 "exekverbar fil."
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws-Mail har blivit registrerad som standardklient."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan inte registrera som standardklient: omöjligt att skriva till registret."
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Avsöker mapp %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "Glömde %d lösenord i %d konton.\n"
 msgstr[1] "Glömde %d lösenord i %d konton.\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "%s brevhuvud"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "brevhuvud"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "brevhuvudsrad"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "meddelandetextrad"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "etikett"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Gemen-/versalkänslig"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "Gemen-/versalokänslig"
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "kollar om meddelande matchar [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "meddelande matchar\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "meddelande matchar inte\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -8475,7 +8524,7 @@ msgstr "Skriv mbox-fil"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finns redan. Vill du skriva över den?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Skriv över"
 
@@ -8708,8 +8757,8 @@ msgstr ""
 "\n"
 "  Meddelandet har flyttats till papperskorgen eller till en annan mapp"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "Ett fel uppstod vid inlärning.\n"
 
@@ -8749,64 +8798,68 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "/Ta bort brevlåda"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "Öppna"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "Öppna _med..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "Skicka till..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "Visa som text"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "_Spara som..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "_Spara alla..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Spara alla bilagor..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Visa fullständig information"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Kontrollera igen"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klicka på ikonen för att markera den."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Klicka på ikonen eller tryck '%s' för att markera den."
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Tidsgränsen för att kontroller signaturen överskreds. Klicka på ikonen för "
 "att försöka igen."
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8814,38 +8867,38 @@ msgstr ""
 "Tidsgränsen för att kontrollera signaturen överskreds. Klicka på ikonen "
 "eller tryck '%s' för att försöka igen."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr "Fel vid kontroll av signatur. Klicka på ikonen för att försöka igen."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "Fel vid kontroll av signatur. Klicka på ikonen eller tryck '%s' för att "
 "försöka igen."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "Kontrollerar signatur..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "Gå tillbaka till e-post"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan inte spara del av flerdelsmeddelande: %s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Skriv över befintlig fil '%s'?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
 #, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
@@ -8854,59 +8907,59 @@ msgstr ""
 "Ett fel har uppstått under sparande av meddelandedel #%d. Vill du avbryta "
 "sparande, eller ignorera fel och fortsätta?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "Fel vid sparande av meddelandedel"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "Ignorera alla"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d fil sparades framgångsrikt."
 msgstr[1] "%d filer sparades framgångsrikt."
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d fil sparades framgångsrikt"
 msgstr[1] "%d filer sparades framgångsrikt"
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d fil misslyckades."
 msgstr[1] "%s, %d filer misslyckades."
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Välj destinationsmapp"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' är inte en mapp."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Spara som"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Öppna med"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8915,7 +8968,7 @@ msgstr ""
 "Skriv in kommandoraden för att öppna filen:\n"
 "('%s' kommer att ersättas med filnamnet)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8926,11 +8979,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Kör icke betrodd binär?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8942,20 +8995,20 @@ msgstr ""
 "\n"
 "Vill du köra denna fil?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "Kör binär"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Storlek:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9068,77 +9121,77 @@ msgstr "Avsluta prenumeration på diskussionsgrupp"
 msgid "Rename newsgroup folder"
 msgstr "Byt namn på diskussionsgrupps-mapp"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 saknar behörighetskod\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2-anslutningsfel\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "OAuth2 TLS-anslutningsfel\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2 åtkomstpolett mottagen\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2 åtkomstpolett icke mottagen\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2 uppdateringspolett mottagen\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2 uppdateringspolett inte mottagen\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "OAuth2 ersättningsuppdateringspolett tillhandahålls\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "OAuth2 ersättningsuppdateringspolett tillhandahålls inte\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 socket-skrivfel\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 socket timeout-fel\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 åtkomstpolett fortfarande färsk\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 mottar åtkomstpolett med hjälp av uppdateringspolett\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 försöker få färsk åtkomstpolett med autentiseringskod\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 åtkomst- och uppdateringspolett uppdaterade\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 original: %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "Oauth2 kodad: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9147,11 +9200,11 @@ msgstr ""
 "OAuth2 avkodad: %s\n"
 "\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Mata in huvudlösenord"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Felaktigt huvudlösenord."
 
@@ -9569,7 +9622,7 @@ msgstr "Ja"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Inga"
 
@@ -9586,7 +9639,7 @@ msgid "Delete selected files"
 msgstr "Ta bort valda filer"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Välj e-post före"
 
@@ -9600,99 +9653,99 @@ msgstr ""
 "Välj filnamn för arkiv [filändelsen bör reflektera att det är ett arkiv som ."
 "tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld av %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Skapa Arkiv"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Mata in Arkiverarens användarargument"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Mapp att arkivera"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Mapp som är rooten på arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klicka på denna knapp för att välja vilken mapp som skall vara root för "
 "arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Namn på arkiv"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Plats och namn för arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "Välj"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr "Klicka på denna knapp för att välja ett namn och plats på arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Välj kompression"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Välj detta alternativ för att använda %s-komprimering för arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Välj format"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Välj detta för att använda %s som format för arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Blandade inställningar"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Rekursivt"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Välj detta alternativ för att inkludera undermappar i arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9703,11 +9756,11 @@ msgstr ""
 "Lägg dock märke till, att detta dramatiskt ökar tiden det\n"
 "kommer ta att skapa arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "Byt n_amn"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9719,7 +9772,7 @@ msgstr ""
 "Namnschema: datum_från at till@ämne.\n"
 "Namn kommer att klippas av till max 96 tecken"
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9727,11 +9780,11 @@ msgstr ""
 "Välj detta alternativ för att ta bort meddelanden efter arkivering\n"
 "För närvarande hanterar detta bara IMAP, Lokal mbox och POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Markeringsalternativ"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9823,7 +9876,7 @@ msgstr "Ta bort bilagor"
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Bilaga"
@@ -9983,19 +10036,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Exkludera"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -10005,15 +10058,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Någon"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: hämtar meddelandetext..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrerar meddelanden..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -10025,7 +10078,7 @@ msgstr ""
 "Använd \"/Markera/Markera som skräp\" och \"/Markera/Markera som ej skräp\" "
 "för att träna Bogofiler med ett par hundra skräp- och icke skräpmeddelanden."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -10034,21 +10087,21 @@ msgstr ""
 "Insticksmodulen Bogofilter kunde inte filtrera ett meddelande. Kommandot `%s "
 "%s %s` kunde inte köra."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: lär från meddelande..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Inlärning misslyckades; `%s` avslutade med status %d."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: lär från meddelanden..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10057,7 +10110,7 @@ msgstr ""
 "Inlärning misslyckades; `%s %s %s` avslutade med fel:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10085,13 +10138,13 @@ msgstr ""
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "Skräppost"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "Skräppostinlärning"
 
@@ -10115,7 +10168,7 @@ msgstr "Meddelanden större än så här kommer inte kontrolleras"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "KiB"
 
@@ -10217,19 +10270,19 @@ msgstr "Sökväg till bogofilters exekverbara fil"
 msgid "Mark spam as read"
 msgstr "Markera skräppost som lästa"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: hämtar meddelandetext..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrerar meddelande..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10241,7 +10294,7 @@ msgstr ""
 "Använd \"/Markera som skräp\" och \"/Markera/Markera som ej skräp\" för att "
 "träna Bsfilter med ett par hundra skräp- och icke skräpmeddelanden."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -10250,11 +10303,11 @@ msgstr ""
 "Insticksmodulen Bsfilter kunde inte filtrera ett meddelande. Kommandot `%s` "
 "kunde inte köra."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: lär från meddelande..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10599,65 +10652,52 @@ msgstr ""
 "\n"
 "Den är verkligen inte användbar."
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Visa bilder"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Visa inbäddade bilder"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Exekvera Javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Exekvera inbäddade javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Exekvera Java-applet"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Exekvera inbäddade Java-applets"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Rendera objekt med hjälp av insticksmoduler"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Rendera inbäddade objekt med hjälp av insicksmoduler"
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Öppna i Visare (fjärrinnehåll är aktiverat)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "Gör ingenting (fjärrinnehåll är inaktiverat)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Proxy"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "Använd proxyinställningar från GNOME"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "Använd proxy"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Fjärrresurser"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10672,115 +10712,120 @@ msgstr ""
 "javaappletar kan fortfarande vara aktiverat för innehåll som är\n"
 "bifogat i e-brevet."
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Aktivera laddning av fjärrinnehåll"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "Vid klickning av länkar, som standard"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Öppna med Extern Webbläsare"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "CSSen i denna fil kommer att appliceras på alla HTML-delar"
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Bläddra"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Välj stilmall"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "Laddning av fjärrinnehåll är avaktiverat."
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Ladda bilder"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Tillåt externt innehåll"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Aktivera Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Aktivera Insticksmoduler"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Aktivera Java"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Öppna länkar med extern browser"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ett fel uppstod: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s är ett felaktigt eller ett flöde som inte stöds"
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Öppna i visare"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Öppna i browser"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Öppna Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Kopiera Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Ladda ner Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Spara Bild Som"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Kopiera Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Importera flöde"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Fancy"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "Det gick inte att hitta det kompletterande WebKit-tillägget %s"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-Visare"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10884,193 +10929,6 @@ msgstr ""
 "Lägger till X-FETCH-TIME-huvudet med datum och tid för mottagande av "
 "meddelande i RFC822-format"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "GData-insticksmodulen: Auktorisering krävs"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"Du måste tillåta Claws Mail att få tillgång till din Google-kontaktlista för "
-"att använda insticksmodulen GData.\n"
-"\n"
-"Besök Google's auktorisering genom att klicka på knappen nedan. Efter att du "
-"har bekräftat godkännandet kommer du att få en auktoriseringskod. Mata in "
-"den koden i fältet nedan för att ge Claws Mail åtkomst till din Google-"
-"kontaktlista."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "Steg 1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr "Klicka här för att öppna Google's auktoriseringsssida i en webbläsare"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "Steg 2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Mata in kod:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "Insticksmodulen GData: Fel vid förfrågan av kontakter: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "Lade till %d av"
-msgstr[1] "Lade till %d av"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "1 kontakt till cachen"
-msgstr[1] "%d kontakter till cachen"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "Insticksmodulen GData: Startar asynkron kontaktförfrågan\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "Insticksmodulen GData: Fel vid förfrågan efter grupper: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "Insticksmodulen GData: Grupper mottagna\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "Insticksmodulen GData: Startar asynkron gruppförfrågan\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData-insticksmodul: Autentiseringsfel: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "GData-insticksmodul: Auktorisering framgångsrik\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData-insticksmodul: Startar interaktiv auktorisering\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr ""
-"GData-insticksmodul: Fick auktoriseringskod, efterfrågar auktorisering\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"GData-insticksmodul: Ingen auktoriseringskod mottagen, "
-"auktoriseringsförfrågan avvisad\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"GData-insticksmodul: Interaktiv auktorisering kör fortfarande, ingen "
-"ytterligare session startad\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData-Insticksmodul: Auktoriseringfönyelsefel: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData-insticksmodul: Auktoriseringsförnyelse framgångsrik\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"Insticksmodulen GData: Förfluten tid sedan senaste uppdatering: %d minuter, "
-"uppdaterar nu\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData-insticksmodul: Försöker förnya auktorisering\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Avsökningsintervall (sekunder):"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Maximalt antal resultat:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-"Misslyckades att registrera kopplingspunkt för adresskomplettering i "
-"insticksmodulen GData"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr ""
-"Misslyckades registrera kopplingspunkt för frånkopplat läge i "
-"insticksmodulen GData"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Den här insticksmodulen ger access till GData-protokollet till Claws Mail.\n"
-"\n"
-"GData-protokollet är ett interface till Googles tjänster.\n"
-"För närvarande är dem enda implementerade funktionaliteten inkludering av "
-"Google Contacts i Tab-komplettering av adresser.\n"
-"Respons till <berndth at gmx.de> är välkommet."
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "GData-integrering"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11239,8 +11097,8 @@ msgid "Cache refresh interval"
 msgstr "Interval för Cacheuppdatering"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "timmar"
 
@@ -11388,11 +11246,11 @@ msgstr "Storlek på bildcache i megabyte"
 msgid "Default font"
 msgstr "Standardtypsnitt"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Öppna Länk"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Kopiera Länkplats"
 
@@ -11488,7 +11346,7 @@ msgstr "Autentiseringsmetoden inte tillgänglig"
 msgid "sending error on Sieve session: %s\n"
 msgstr "sändningsfel i Sieve-session: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Filter"
 
@@ -11620,7 +11478,7 @@ msgstr "Hantera sievefilter på en server som använder protokollet ManageSieve.
 msgid "Enable Sieve"
 msgstr "Aktivera Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Serverinformation"
 
@@ -11657,8 +11515,12 @@ msgstr "Använd STARTTLS när det finns tillgängligt"
 msgid "Require STARTTLS"
 msgstr "Kräv STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Autentisering"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Ingen autentisering"
 
@@ -11672,28 +11534,28 @@ msgstr "Specificera autentisering"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "Användar-ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Automatiskt"
 
@@ -12009,7 +11871,7 @@ msgid "Never"
 msgstr "Aldrig"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Alltid"
 
@@ -12620,9 +12482,9 @@ msgstr "Förfaller efter"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "'0' kommer att lagra lösenfrasen för hela sessionen"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuter"
 
@@ -12833,108 +12695,108 @@ msgstr "Ogiltig signatur från \"%s\"."
 msgid "The signature has not been checked"
 msgstr "Signaturen har inte kontrollerats"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "Fel vid signaturkontroll: ingen status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fel vid signaturkontroll: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Signatur skapad på %s med hjälp av %s nyckel-ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Bra signatur från uid \"%s\" (Giltighet %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Utgången nyckel uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Utgången signatur från uid \"%s\" (Giltighet %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Spärrad nyckel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "DÅLIG signatur från \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Giltighet %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "Spärrad"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Ägartillit: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Ingen nyckel!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Primärnyckel fingeravtryck:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VARNING: Signerarens adress \"%s\" matchar inte DNS-post\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Verifierad signerares adress är \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kunde inte hämta data från meddelande, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kunde inte initiera data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "Hemlig nyckels specifikation är inte entydig"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Hemlig nyckel kunde inte hittas (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fel vid inställning av hemlig nyckel %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-protokoll '%s' är oanvändbar: Motor '%s' är inte korrekt installerad."
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12943,12 +12805,12 @@ msgstr ""
 "Gpgme-protokoll '%s' är oanvändbar: Motor '%s' version %s är installerad, "
 "men version %s krävs.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-protokoll '%s' är oanvändbar (okänt problem)"
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12956,7 +12818,7 @@ msgstr ""
 "GnuPG är inte korrekt installerat eller behöver uppgraderas.\n"
 "OpenPGP-stöd avstängt."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12964,11 +12826,11 @@ msgstr ""
 "Du måste spara kontots information med \"OK\" innan du kan generera ett "
 "nyckelpar.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "Ingen PGP-nyckel hittad"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -12978,12 +12840,12 @@ msgstr ""
 "kommer inte kunna signera e-post eller ta emot krypterad e-post.\n"
 "Vill du skapa ett nytt nyckelpar nu?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kunde inte generera ett nytt nyckelpar: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12991,11 +12853,11 @@ msgstr ""
 "Genererar ditt nya nyckelpar... Flytta runt muspekaren för att hjälpa till "
 "att generera entropi..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kunde inte generera nytt nyckelpar: okänt fel"
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -13008,15 +12870,15 @@ msgstr ""
 "\n"
 "Vill du exportera det till en nyckelserver?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Nyckel genererad"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Nyckel exporterad."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "Kunde inte exportera nyckel."
 
@@ -13224,12 +13086,12 @@ msgid "Show Python console..."
 msgstr "Visa Python-konsol..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Bläddra"
@@ -13347,26 +13209,26 @@ msgstr ""
 "Kunde inte läsa innehållet i gamla filen feeds.xml:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl: Fel vid skrivning av '%s' till flödesexportlistan.\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Kunde inte ta bort gammal OPML-fil '%s': %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr "RSSyl: Kunde inte öppna filen '%s' för export av flödeslistan: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Fel vid skrivning av flödesexportfilen.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13379,7 +13241,7 @@ msgstr ""
 "\n"
 "Mappnamnet '%s' är inte tillåtet."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13393,138 +13255,138 @@ msgstr ""
 "Varje nyhetsmating kommer att hamna i en egen mapp, hämtad från webben. Du "
 "kan läsa dem och ta bort eller spara gamla nyheter."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "RSS-flöde"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(tom)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Uppdatera alla flöden"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Prenumerara på flöde"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Ange URL för nyhetsflödet du vill preumerera på:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' kan inte användas i mappnamn."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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 behöver nätverksåtkomst för att kunna uppdatera flödet."
 msgstr[1] "Claws Mail behöver nätverksåtkomst för att kunna uppdatera flöden."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Vill du verkligen ta bort flödesmappen `%s' ?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Ta bort flödesmapp"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "Välj en OPML-fil"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: Prenumererar på nytt flöde: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: Prenumererar på nytt flöde: '%s' (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Uppdaterar flöde: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Flödesuppdatering klart: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: Fel vid hämtning av flöde vid '%s': %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: Inget giltigt flöde hittat på '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: Kunde inte behandla flöde vid '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: Applikationen avslutas, kunde inte uppdatera flöde vid '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "HTTP Enkel autentisering"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Använd standard uppdateringsintervall"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Behåll gamla objekt"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "_Trimma"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 "Uppdatera flöde, och ta bort objekt som inte längre finns i flödeskällan"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Hämta kommentarer om möjligt"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Markera alltid som ny"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "Markera endast som ny om dess text har förändrats"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "Markera aldrig som ny"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "Lägg till objekttitel vid toppen av meddelandet"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Ignorera byte av titel"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13532,94 +13394,94 @@ msgstr ""
 "Aktivera detta för behålla aktuellt mappnamn, även om flödesförfattaren "
 "ändrar titel på flödet."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "Verifiera TLS-certifikatets giltighet"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Användarnamn"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "Käll-URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "Hämta kommentarer på poster som är yngre än"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dagar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "Sätt till -1 för att hämta alla kommentarer"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Om ett objekt förändras"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Objekt"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Uppdateringsintervall"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Sätt 0 för att inaktivera automatisk uppdatering av detta flöde"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Ställ egenskaper för flöde"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "_Uppdatera flöde"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "Egenskaper f_ör flöde"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "Byt na_mn..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "Förnya rekursivt"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "_Prenumerera på nytt flöde..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "Skapa ny mapp..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Importera flödeslista..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Ta bort träd"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "Lägg till RSS mapp"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Ange namnet på den nya RSS mappen."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13629,56 +13491,56 @@ msgstr ""
 "Det finns kanske redan filer, eller så har du inte rättigheter att skriva "
 "där?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Mina flöden"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Välj kak-fil"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Sstandard uppdateringsintervall"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "Uppdatera alla flöden vid applikationsstart"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
+msgstr "Uppdatera alla flöden vid uppstart"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Verifiera TLS-certifikatens giltighet för nya flöden"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Sökväg till kakfil"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Sökväg till Netscape-formatterad cookies.txt som innehåller dina kakor"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Uppdaterar"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Säkerhet och integritet"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "Kunde inte skapa mapp för nytt flöde '%s'."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Prenumerera på nytt flöde?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Földesmapp:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
@@ -13686,35 +13548,35 @@ msgstr ""
 "Istället för att använda den officiella titeln kan du mata ett annat "
 "mappnamn för flödet."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "R_edigera flödesegenskaper efter prenumerering"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Uppdaterar kommentarer för '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Behörighet krävs)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Förbjuden)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Hittades inte)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Fel %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13728,28 +13590,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr "Inget giltigt flöde hittat vid <b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Namnlöst flöde"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: Möjligen ogiltigt flöde utan titel på %s.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "Updaterar flöde '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13762,12 +13624,12 @@ msgstr ""
 "\n"
 "Vänligen kontakta utvecklarna, detta skall inte hända."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr ""
 "Claws Mail behöver nätverksåtkomst för att kunna uppdatera dina flöden."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13871,42 +13733,46 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "Skräppostrapportering"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Vidarebefordra till:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin-insticksmodulen kunde inte ansluta till spamd.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin-insticksmodulen filtrering misslyckades.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin-insticksmodulen är inaktiverad genom dess inställningar.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrerar meddelande..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -13916,7 +13782,7 @@ msgstr ""
 "orsaken till felet är en icke nåbar smapd-daemon. Vänligen se till att spamd "
 "kör och är tillgänglig."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
@@ -13924,17 +13790,17 @@ msgstr ""
 "Claws-Mail behöver tillgång till nätverket för att kunna förse "
 "fjärrinläraren med detta meddelande."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Kunde inte hämta användarnamn"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin-insticksmodulen är inläst men inaktiverad genom dess "
 "inställningar.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14401,63 +14267,68 @@ msgstr "Närvarande:"
 msgid "Action:"
 msgstr "Aktivitet:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Nytt möte..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "_Exportera kalender..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "_Prenumerera på Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "Byt namn..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "Updatera pren_umerationer"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "_Listvy"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "_Veckovy"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "_Månadsvy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Möten"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[ingen sammanfattning]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "i det förflutna"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "idag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "imorgon"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "den här veckan"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "senare"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14466,21 +14337,21 @@ msgstr ""
 "\n"
 "Detta är aktiviteterna som är planerade %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Timeout (%d sekunder) vid anslutning till %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (Obehörig)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Fel: %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14493,7 +14364,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14504,114 +14375,114 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kunde inte skapa mapp %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Claws-Mail måste vara anslutet till nätverket för att kunna uppdatera Webcal-"
 "flödet."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Hämtar kalender för %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "ny prenumeration"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 "Claws-Mail måste vara anslutet till nätverket för att uppdatera "
 "prenumerationen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Prenumerera på Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "Mata in Webcal URL-en:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "Kunde inte tolka URLen."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Vill du verkligen avbryta prenumerationen?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Ta bort prenumeration"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "accepterad"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "preliminärt accepterat"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "avvisat"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "svarade inte"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "individ"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "grupp"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "resurs"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "rum"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "Tidigare"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Idag"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Imorgon"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "Denna vecka"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "Senare"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Accepterad: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Avvisad: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Preliminärt Accepterat: "
 
@@ -15019,95 +14890,95 @@ msgstr "Syntaxfel på tidsmarkering i hälsning\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Syntaxfel på tidsmarkering i hälsning (inte ASCII)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "POP protokollfel\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ogiltigt UIDL-svar: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Tar bort utgånget meddelande %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Hoppar över meddelande %d [%s] (%d byte)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "brevlådan är låst\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "Tidsgräns för session nådd\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "kommandot stöds inte\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "fel uppstod i POP-session\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "TOP-kommandot stöds ej\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Server för diskussionsgrupper (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Inget (endast SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Använd som standard"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Auto-konfiguration"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15115,81 +14986,81 @@ msgstr ""
 "Varning: denna version av Claws-Mail\n"
 "har byggts utan IMAP- och Diskussionsgrupps-stöd."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Denna server kräver autentisering"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "Autentisera vid kontakt"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "Server för diskussionsgrupper"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Lokal brevlåda"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "SMTP-server (skicka)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "Använd mail-kommandot istället för SMTP-server"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "kommando för att skicka e-post"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "Standardinkorg"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ofiltrerade meddelande kommer sparas i denna mapp"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "Autentisera före POP-anslutning"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "Välj"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagar och 0 timmar : ta bort omedelbart"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Storleksgräns för mottagande"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15197,94 +15068,98 @@ msgstr ""
 "Meddelande som är större än denna gräns kommer att tas emot delvis. När du "
 "väljer dem kommer du kunna ta emot hela eller ta bort dem."
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal artiklar att ladda ner"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "obegränsad om 0 väljs"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Ren text"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "Mapp på IMAP server"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(vanligtvis tom)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Visa enbart prenumererade mappar"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreddseffektivt läge (förhindrar hämtning av fjärretiketter)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Detta läge använder mindre bandbredd, men kan vara långsammare med vissa "
 "servrar."
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Batchstorlek"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Kontrollera automatiskt"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Använd globala inställningar"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Kolla efter ny e-post varje"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillåt insticksmoduler filtrera vid mottagning"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Hämta e-post' hämtar nya meddelanden för detta konto"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "Generera Meddelande-ID"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "Skicka kontots email-adress i Meddelande-ID"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Lägg till huvud för användaragent"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15292,218 +15167,218 @@ msgstr ""
 "Om du ej fyller i dessa, kommer samma användar-ID och lösenord som vid "
 "mottagning att användas."
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "Autentisera med POP innan avsändning"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "POP autentiseringstimeout"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Autentisering"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Välj OAuth2 e-postleverantör"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "KlientID"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "Klienthemlighet"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Skaffa behörighetskod"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "Öppna standardwebbläsare med förfrågan"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Kopiera länk"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Autentiseringskod"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
 "Klistra in fullständig URL från webbläsare eller tillhandahållen "
 "autentiseringspolett"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Fullständig autentisering"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Autentisera"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "Infoga signatur automatiskt"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Kommando utdata"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "Ordlistor för stavningskontroll"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Standardordlista"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Standard alternativordlista"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Nytt"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Svara"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Standard sekretesssystem"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Signera alltid meddelanden"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Kryptera alltid meddelanden"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signera alltid meddelanden som svar på ett signerat meddelande"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Kryptera alltid meddelanden som svar på ett krypterat meddelande"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Kryptera skickade meddelanden med din egen nyckel tillsammans med mottagarens"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Spara skickade krypterade meddelanden i klartext"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "Använd inte TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "Använd TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Använd STARTTLS-kommando för att starta krypterad session"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Använd inte TLS (men, om nödvändigt, använd STARTTLS)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "Klientcertifikat"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Certifikat för mottagning"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Klient-certifikat som PKCS12 eller PEM-fil"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Certifikat för sändning"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Acceptera giltiga TLS-certifikat automatiskt"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Använd icke-blockerande TLS"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Stäng av detta om du har TLS-anslutningsproblem"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Använd proxyserver"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Använd standardinställningar"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Använd globala proxyserverinställningar"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Användarnamn"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Använd proxyserver för att skicka"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15512,27 +15387,27 @@ msgstr ""
 "till konfigurerad utgående server, och förbigå eventuellt konfigurerad "
 "proxyserver."
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "POP-port"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "IMAP-port"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "NNTP-port"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Domännamn"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15540,174 +15415,178 @@ msgstr ""
 "Domännamnet kommer att användas i det genererade Meddelande-ID't, och vid "
 "anslutning till SMTP-servrar."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Använd kommando för att kommunicera med server"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markera kross-postade meddelanden som läst med färg:"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Spara skickade meddelanden i"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Spara köade meddelanden i"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Lagra utkast i"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Lagra bortagna meddelande i"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "POP-server har inte angivits."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standardmapp för Inkorgen finns inte."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "IMAP-server har inte angivits."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "lokal brevlåda har inte angivits."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "e-postkommando har inte angivits."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "Användar-ID kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "Lösenord kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP användar-ID kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP-lösenord kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "domän inte specificerad."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "skickatmapp är inte vald."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "kömapp är inte vald."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "utkastmapp är inte vald."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "skräpmapp är inte vald."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "Skicka"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Sekretess"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoegenskaper"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Misslyckades (fel adress)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "Välj fil med signatur"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Välj certifikatsfil"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (insticksmodulen kunde inte laddas)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "Auktorisation slutförd"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "Din OAuth2 autentiseringskod har mottagits av Claws Mail"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "Auktorisation INTE slutförd"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "Din OAuth2 autentiseringskod har inte mottagits av Claws Mail"
 
@@ -15945,7 +15824,7 @@ msgstr "applicera filteraktivitet mellan {} för valda meddelanden"
 msgid "for a literal %"
 msgstr "för ett bokstavligt %"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Aktiviteter"
 
@@ -15993,12 +15872,12 @@ msgstr "Den %d\\nskrev %s:\\n\\n%q\\n%X"
 
 #: src/prefs_common.c:322 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"
+"\\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"
 msgstr ""
-"\\n\\nStart av vidarebefordrat meddelande:\\n\\n?d{Datum:%d\\n}?f{Från:%f"
-"\\n}?t{Till: %t\\n}?c{Kopia: %c\\n}?n{Diskussionsgrupper: %n\\n}?s{Ämne: %s"
-"\\n}\\n\\n%M"
+"\\n\\nStart av vidarebefordrat meddelande:\\n\\n?d{Datum:%d\\n}?f{Från:"
+"%f\\n}?t{Till: %t\\n}?c{Kopia: %c\\n}?n{Diskussionsgrupper: %n\\n}?s{Ämne: "
+"%s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
@@ -16252,7 +16131,7 @@ msgstr "Dölj"
 msgid "Message flags"
 msgstr "Meddelandeflaggor"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Markera"
@@ -16278,7 +16157,7 @@ msgstr "Markera som ej skräp"
 msgid "Execute"
 msgstr "Kör"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Färgmarkering"
 
@@ -16293,7 +16172,7 @@ msgstr "Omdirigera"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Poäng"
@@ -16564,8 +16443,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Dolda kolumner"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Visade kolumner"
 
@@ -16771,7 +16650,7 @@ msgstr "Använd ett annat typsnitt för utskrift"
 msgid "Message Printing"
 msgstr "Meddelandeutskrift"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Visa"
@@ -17026,11 +16905,11 @@ msgstr "meddelandedel"
 msgid "whole message"
 msgstr "hela meddelandet"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "Markerad"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Borttagen"
 
@@ -17038,11 +16917,11 @@ msgstr "Borttagen"
 msgid "Replied"
 msgstr "Besvarat"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Vidarebefordrat"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Skräppost"
@@ -17051,7 +16930,7 @@ msgstr "Skräppost"
 msgid "Has attachment"
 msgstr "Har bilaga"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "Signerat"
 
@@ -17564,7 +17443,7 @@ msgstr "Välj färg för hunkrader"
 msgid "Hunk lines"
 msgstr "Hunkrader"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Mapplista"
 
@@ -18047,112 +17926,116 @@ msgstr "Välj färg för felstavat ord. Använd svart för att understryka"
 msgid "Spell Checking"
 msgstr "Rättstavning"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "det förkortade veckodagsnamnet"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "föredraget datum och tid för gällande lokal"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "århundrandetal (årtal/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "antingen FM eller EM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "föredraget datum för gällande lokal"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon, namn eller förkortning"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Visa antal meddelanden bredvid mappnamn"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Olästa meddelanden"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Olästa och totalt antal meddelanden"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
 msgstr "Öppna senast öppnade mapp vid uppstart"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "Öppna vald mapp vid uppstart"
+
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18160,99 +18043,99 @@ msgstr ""
 "Kör behandlingsregler innan du markerar alla meddelande i mapp som lästa "
 "eller olästa"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Förkorta namnet på diskussionsgrupper om det är längre än"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "bokstäver"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "Meddelandelista"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Lås kolumnrubriker"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Visas i Från-kolumnen"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Namn och adress"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Datumformatshjälp"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Set meddelandeval vid öppnande av mapp"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Öppna meddelanden när de väljs"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "Vid öppnande av mapp"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "Vid visning av sökresultat"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Vid val av nästa eller föregående meddelande med hjälp av genvägar"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "Vid borttagning eller flyttning av meddelenden"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "Vid användning av riktningsknappar"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Markera meddelande som lästa"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "när de är valda, efter"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "endast om de har öppnats i ett nytt fönster, eller blivit svarade på"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Visa \"inga olästa (eller nya) meddelande\" dialog"
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "Anta 'Ja'"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "Anta 'Nej'"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Visa avsändaren från adressboken"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "Trådar använder ämne som tillägg till standardbrevhuvud"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning och borttagning av meddelanden"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18260,55 +18143,55 @@ msgstr ""
 "När inte ikryssad fördröjs flyttning, kopiering och borttagning av "
 "meddelanden till du väljer 'Verktyg/Utför'"
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr "Bekräfta vid markering av alla meddelanden som lästa eller olästa"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Bekräfta vid förändringar av färgetiketter"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Visa inforutor"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Standard"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Nya mappar"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Sortera enligt"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Nummer"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "Tråddatum"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "Sortera inte"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Trådvy"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Kollapsa alla trådar"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Dölj lästa meddelanden"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Sammanfattningar"
 
@@ -18481,7 +18364,7 @@ msgstr "Befintliga mallar"
 msgid "Template"
 msgstr "Mall"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Internt standardtema"
 
@@ -18489,21 +18372,16 @@ msgstr "Internt standardtema"
 msgid "Themes"
 msgstr "Teman"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Ta bort systemtema '%s'"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Ta bort tema '%s'"
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Är du säker på att du vill ta bort detta tema?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18512,24 +18390,24 @@ msgstr ""
 "Fil %s misslyckades\n"
 "när temat togs bort."
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Borttagning av temakatalogen misslyckades."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Lyckades ta bort tema"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Välj temamapp"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Installera tema '%s'"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18537,15 +18415,11 @@ msgstr ""
 "Denna mapp verkar inte vara en temamapp.\n"
 "Installera ändå?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "Vill du installera temat för alla användare?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "Temat finns redan"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18557,25 +18431,25 @@ msgstr ""
 "\n"
 "Vill du skriva över det?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Kunde inte ta bort gammalt tema i %s."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Kunde inte skapa målmapp %s."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "Temat installerades utan fel."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "Misslyckades med att installera tema"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18584,78 +18458,78 @@ msgstr ""
 "Fil %s misslyckades\n"
 "när temat installerades."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Visa alla temaikoner"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Det finns %d teman installerade (%d användare, %d system, 1 internt)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Internt tema har %d ikoner"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "Ingen filinformation finns tillgänglig för detta tema"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Fel: kunde inte hämta status för temat"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d filer (%d ikoner), storlek: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Välj"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Installera nytt..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Hämta mer..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Information"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Författare"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Visa alla"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "SVG-rendering"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "Aktivera alfakanal"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Tvinga skalning"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "Pixlar per Inch (PPI)"
 
@@ -18804,7 +18678,7 @@ msgstr "Ingen mottagarnyckel är definierad."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fel vid avkodning av BASE64]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "Kunde inte avkoda del"
 
@@ -19259,22 +19133,6 @@ msgstr ""
 "Ett fel uppstod medans meddelandet skickades:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Brevlådeinställningar"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Först måste du ange brevlådans placering.\n"
-"Du kan använda befintlig brevlåda i MH-format\n"
-"om du har en.\n"
-"Är du inte säker, välj bara OK."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Meddelandets källkod"
@@ -19549,92 +19407,92 @@ msgstr "Från: %s, på %s"
 msgid "To: %s, on %s"
 msgstr "Till: %s, på %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "Du är inte artikelns författare."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort de %d valda meddelanden?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Ta bort meddelande"
 msgstr[1] "Ta bort meddelanden"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Välj mapp att flytta valt meddelande till"
 msgstr[1] "Välj mapp att flytta valda meddelanden till"
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "Destinationen att kopiera är samma som aktuell mapp."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Välj mapp att kopiera valt meddelande till"
 msgstr[1] "Välj mapp att kopiera valda meddelanden till"
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "Lägg till eller Skriv över"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Lägg till eller skriv över befintlig fil?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "_Bifoga"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "_Skriv över"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan inte spara filen '%s'."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 "Du är på väg att skriva ut %d meddelanden, ett och ett. Vill du fortsätta?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Hoppa över dessa regler"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Använd dessa regler oavsett vilket konto de tillhör"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "Använd dessa regler om de är giltiga för nuvarande konto"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Filtrerar"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19642,72 +19500,72 @@ msgstr ""
 "Det finns några filtreringsregler som tillhör ett konto.\n"
 "Välj vad som skall göras med dessa regler:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Behandlar konfiguration"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Vill du verkligen återställa färgmarkering på alla valda meddelanden?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Vill du verkligen applicera denna färgetikett till alla valda meddelanden?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Återställ färgetikett"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Sätt färgmarkering"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Ignorera tråd"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Bevakad tråd"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Besvarat men även vidarebefordrat - klicka för att se svar"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Svarat på - klicka för att se svar"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "Att flyttas"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "Att bli kopierad"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "Signerat, har bilaga(or)"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "Krypterad, har bilaga(or)"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "Har bilaga(or)"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19716,11 +19574,11 @@ msgstr ""
 "Fel i reguljärt uttryck (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Gå tillbaka till mapplistan (Du har olästa meddelanden)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Gå tillbaka till mapplistan"
 
@@ -20576,4 +20434,3 @@ msgid ""
 msgstr ""
 "Claws är nu klart att användas.\n"
 "Klicka Spara för att starta."
-
diff --git a/po/tr.po b/po/tr.po
index 6a0fca349..936c2145e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,14 +1,14 @@
 # Turkish translation of Claws Mail.
-# Copyright (C) 1999-2022 The Claws Mail Team
+# Copyright (C) 1999-2023 The Claws Mail Team
 # This file is distributed under the same license as the Claws Mail package.
-# Numan Demirdöğen <if.gnu.linux at gmail.com>, 2016-2022.
+# Numan Demirdöğen <if.gnu.linux at gmail.com>, 2016-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 4.1.0git71\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-11 10:26+0100\n"
-"PO-Revision-Date: 2022-10-13 22:28+0300\n"
+"POT-Creation-Date: 2023-11-19 00:17+0300\n"
+"PO-Revision-Date: 2023-11-18 22:19+0300\n"
 "Last-Translator: Numan Demirdöğen <if.gnu.linux at gmail.com>\n"
 "Language-Team: Türkçe <if.gnu.linux at gmail.com>\n"
 "Language: tr\n"
@@ -39,9 +39,9 @@ msgid ""
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
-"'Posta Al' Hesaplar'ınızdan sırayla posta almanızı sağlayacaktır, onay "
-"kutusu hangi hesapların seçildiğini göstermektedir. Koyu metinle gösterilen "
-"hesap, öntanımlı hesabınızdır."
+"'Posta Al' Hesaplarınızdan sırayla posta almanızı sağlayacaktır, onay kutusu "
+"hangi hesapların seçildiğini göstermektedir. Koyu metinle gösterilen hesap, "
+"öntanımlı hesabınızdır."
 
 #: src/account.c:781 src/foldersel.c:348
 msgid "_New"
@@ -51,8 +51,8 @@ msgstr "_Yeni"
 msgid "Create a new account"
 msgstr "Yeni bir hesap oluştur"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -64,8 +64,8 @@ msgstr "Seçilen hesabın tercihlerini düzenle"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -81,8 +81,8 @@ msgstr "S_il"
 msgid "Delete the selected account from the list"
 msgstr "Seçilen hesabı listeden kaldır"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopyala"
@@ -123,26 +123,26 @@ msgstr "Seçilen hesabı bir yukarı taşı"
 msgid " _Set as default account "
 msgstr " Öntanımlı hesap olarak _ata "
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Kapat"
@@ -156,53 +156,52 @@ msgstr "Uzak dizine sahip hesaplar kopyalanamaz."
 msgid "Copy of %s"
 msgstr "%s hesabının kopyası"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "'%s' hesabını silmek istediğinizden emin misiniz?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(Başlıksız)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "Hesabı sil"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10743
+#: src/compose.c:10748 src/compose.c:10822 src/compose.c:11715
+#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -211,88 +210,88 @@ msgstr "Hesabı sil"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "İ_ptal"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "_Sil"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Posta Al' seçilen hesaplardan posta alır"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "İsim"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "İleti dosyası %d alınamadı"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "İletinin bir parçası alınamadı."
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "Çok bölümlü postanın bir bölümü alınamadı: %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -301,11 +300,11 @@ msgstr ""
 "Seçilen işlem posta yazma penceresinde kullanılamaz\n"
 "çünkü %%f, %%F, %%as ya da %%p içermekte."
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "Herhangi bir süzme kuralı ayarlanmış değil"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -314,7 +313,7 @@ msgstr ""
 "Geçersiz süzme kural(lar)ı:\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -325,44 +324,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9705
+#: src/compose.c:9748 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Yürütülüyor: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- İşlem bitti: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "Kurala ait girdi/çıktı"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "Ç_alıştır"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "_Dur"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -373,11 +372,11 @@ msgstr ""
 "('%%h' değişkenle değiştirilecek)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "Kurala ait gizli kullanıcı değişkeni"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -388,23 +387,23 @@ msgstr ""
 "('%%u' değişkenle değiştirilecek)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "Kurala ait kullanıcı değişkeni"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Bir dizin kendi üzerine ya da alt dizinlerine kopyalanamaz."
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "Bir adres defteri kendi üzerine kopyalanamaz."
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Bir dizin kendi üzerine ya da alt dizinlerine taşınamaz."
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Grup"
@@ -477,40 +476,40 @@ msgstr ""
 "Tüm ek bilgi tanımlarını öntanımlı değerlerle değiştirmek\n"
 "istediğinizden emin misiniz?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_Hayır"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "_Evet"
 
@@ -549,31 +548,30 @@ msgstr "_Ekle"
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_TAMAM"
@@ -603,7 +601,7 @@ msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr "Claws Mail adres defterindeki mükerrer e-posta adresleri arayacak."
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Ara"
@@ -617,7 +615,7 @@ msgid "Duplicate email addresses"
 msgstr "Mükerrer e-posta adresleri"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adres Defteri"
@@ -626,11 +624,11 @@ msgstr "Adres Defteri"
 msgid "Address book path"
 msgstr "Adres defteri yolu"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "E-posta adres(ler)ini sil"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "E-posta adres(ler)i silinsin mi?"
 
@@ -638,7 +636,7 @@ msgstr "E-posta adres(ler)i silinsin mi?"
 msgid "Delete address"
 msgstr "E-posta adresini sil"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Bu e-posta adres verisi saltokunur olduğu için silinemez."
 
@@ -650,7 +648,7 @@ msgstr "Adres defterine ekle"
 msgid "Contact"
 msgstr "Kişiler"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Notlar"
@@ -659,7 +657,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "E-posta adres(ler)i ekle"
 
@@ -667,50 +665,50 @@ msgstr "E-posta adres(ler)i ekle"
 msgid "Can't add the specified address"
 msgstr "Belirtilen e-posta adresi eklenemiyor"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "E-Posta Adresi"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "_Defter"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Araçlar"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "Yeni _Defter"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "Yeni _Dizin"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "Yeni _vCard"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "Yeni _JPilot"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "Yeni LDAP _Sunucu"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "_Defteri düzenle"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "_Defteri sil"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -718,189 +716,189 @@ msgstr "_Defteri sil"
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "_Hepsini seç"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "K_es"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "Yeni _Adres"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
-msgstr "Yeni _Grup"
+msgstr "Yeni _Sınıf"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "_Posta Gönder"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "_Birleştir"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "_LDIF dosyasını içe aktar..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "M_utt dosyasını içer aktar..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "_Pine dosyasını içe aktar..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "_HTML olarak dışarı aktar..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "LDI_F olarak dışarı aktar..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "Mükerrer girdileri bul..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "Ek bilgileri düzenle..."
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "Kayda _Bak"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "Tamamlandı"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Yanlış değişkenler"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "Dosya belirtilmedi"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Dosya açılırken hata"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Dosya okunurken hata"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Dosya sonuna ulaşıldı"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Hafıza tahsis edilirken hata"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Yanlış dosya biçimi"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Dosyaya yazarken hata"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Dizini açarken hata"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "Yol belirtilmedi"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "LDAP sunucusuna bağlanırken hata"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "LDAP başlatılırken hata"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "LDAP sunucusuna bağlarken hata"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "LDAP veritabanı aranırken hata"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "LDAP işlemi gerçekleştirilirken zaman aşımı"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "LDAP arama kıstasında hata"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "Arama kıstası için LDAP girdisi bulunamadı"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "LDAP araması istek üzerine sonlandırıldı"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "STARTTLS bağlantısı başlatma hatası"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "Ayırt Edici İsim (dn) yok"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "Gerekli bilgi eksik"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "Bu anahtara sahip başka bir kişi mevcut"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "(Daha) Güçlü bir kimlik doğrulaması gerekiyor"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "Kaynaklar"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "Ara"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "Grubu sil"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -908,26 +906,26 @@ msgstr ""
 "Grup(lar) silinsin mi?\n"
 "Barındırdığı e-posta adres(ler)i silinmeyecek."
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Yapıştırılamıyor. Hedef adres defteri salt okunur."
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "Adres grubuna yapıştırılamaz."
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "'%s' içindeki arama sonuçlarını ve  adresleri silmek istiyor musunuz?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "Sil"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -936,20 +934,20 @@ msgstr ""
 "'%s' silinsin mi? Sadece dizini silerseniz, dizinin barındırdığı e-posta "
 "adresleri ana dizine taşınacak."
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "Sadece _dizini sil"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "Dizini ve e-posta adreslerini _sil"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -958,7 +956,7 @@ msgstr ""
 "'%s' silinsin mi?\n"
 "Barındırdığı e-posta adresleri silinmeyecek."
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -967,28 +965,28 @@ msgstr ""
 "'%s' silinsin mi?\n"
 "Barındırdığı e-posta adresleri de silinecek."
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "'%s' terimini ara"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "Yani Kişiler"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı için fihrist dosyası kaydedilemedi."
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı için adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla dönüştürüldü."
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -996,7 +994,7 @@ msgstr ""
 "Eski adres defteri dönüştürüldü,\n"
 "yeni bir adres fihrist dosyası kaydedilemedi."
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1004,7 +1002,7 @@ msgstr ""
 "Adres defteri dönüştürülemedi,\n"
 "fakat boş bir yeni adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1012,7 +1010,7 @@ msgstr ""
 "Adres defteri dönüştürülemedi,\n"
 "yeni bir adres fihrist dosyası kaydedilemedi."
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1020,52 +1018,52 @@ msgstr ""
 "Adres defteri dönüştürülemedi\n"
 "ve yeni bir adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "Adres defteri dönüştürme hatası"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "Adres fihristi okunamadı"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "Aranıyor..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "Adres Defterleri"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "LDAP sunucuları"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "LDAP Sorgusu"
 
@@ -1149,42 +1147,42 @@ msgstr "Seçilen iletilerden e-posta adreslerini topla"
 msgid "Collect email addresses from folder"
 msgstr "Dizinden e-posta adreslerini topla"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "Sık kullanılan adresler"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "Kişisel adresler"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "Sık kullanılan adresler"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "Kişisel adresler"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "Adres(ler)i güncelle"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "Güncelleme başarısız. Değişiklikler dizine yazılmadı."
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9825 src/mimeview.c:1870
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Hata"
@@ -1303,7 +1301,7 @@ msgstr "Kullandığınız Claws Mail sürümü '%s' eklentisi için çok eski."
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Kullandığınız Claws Mail sürümü eklenti için çok eski."
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "TLS iletişimi başarısız\n"
 
@@ -1323,7 +1321,7 @@ msgstr "kötü SMTP tepkisi\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP oturumunda hata meydana geldi\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "kimlik doğrulamada hata meydana geldi\n"
 
@@ -1332,7 +1330,7 @@ msgstr "kimlik doğrulamada hata meydana geldi\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "İleti boyutu çok büyük (Azami boyut %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "STARTTLS oturumu başlatılamadı\n"
 
@@ -1469,212 +1467,212 @@ msgstr "%d.%02dMiB"
 msgid "%.2fGiB"
 msgstr "%.2fGiB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "Pazar"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "Salı"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "Cuma"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "Ocak"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "Şubat"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "Mart"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "Nisan"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "Mayıs"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "Haziran"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "Temmuz"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "Ağustos"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "Eylül"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "Ekim"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "Kasım"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "Aralık"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "Paz"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "Pzt"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "Sal"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "Çar"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "Per"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "Cum"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "Cmt"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "Oca"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "Şub"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "Mar"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "Nis"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "May"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "Haz"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "Tem"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "Ağu"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "Eyl"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "Eki"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "Kas"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "Ara"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "ÖÖ"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "ÖS"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "öö"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "ös"
@@ -1691,360 +1689,360 @@ msgstr ""
 "\n"
 "İmzalama ve şifreleme bu e-posta için iptal edildi."
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "_Ekle..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "_Özellikler..."
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_İleti"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "_İmlâ"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Yardım"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "_Gönder"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "Sonra _gönder"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "Dosya _iliştir"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "Dosya _ekle"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "İmza _ekle"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "İmzayı _değiştir"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Geri al"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "_Tekrarla"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Ke_s"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "Özel _yapıştır"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "Alıntı _olarak"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "_Katlanmış"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "_Katlanmamış"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Hepsini _seç"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "_Gelişmiş"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "Bir harf geri git"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "Bir harf ileri git"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "Bir kelime geri git"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "Bir kelime ileri git"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "Satır başına git"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "Satır sonuna git"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "Önceki satıra git"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "Sonraki satıra git"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "Bir önceki harfi sil"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "Bir sonraki harfi sil"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "Bir önceki kelimeyi sil"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "Bir sonraki kelimeyi sil"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "Satırı sil"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "Satır sonuna kadar sil"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "_Mevcut paragrafı katla"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "Tüm uzun satırları _katla"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "_Harici metin düzenleyici ile aç"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "_Hepsini ya da seçileni denetle"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "_Tüm yanlış yazılan kelimeleri vurgula"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "Yanlış yazılan kelimeyi _geriye doğru denetle"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "_Bir sonraki yanlış yazılan kelimeye ilerle"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "Çevaplama _biçimi"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "Gizlilik _Sistemi"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "_Öncelik"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Karakter _kodlaması"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Batı Avrupa"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltık"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arapça"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Kiril"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonca"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Çince"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Korece"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tayca"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adres defteri"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "Şab_lon"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "_Eylemler"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_Hakkında"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "_Otomatik katlama"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "Otomatik _girinti"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "İm_zala"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "Şif_rele"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "_Okundu Bilgisi İste"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "Referansları _kaldır"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "Cetveli _göster"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Hepsini"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Gönderene"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "_E-posta listesi"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "_En yüksek"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "_Yüksek"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "_Düşük"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "En _düşük"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Otomatik"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "Yeni iletide Gönderen biçimi hatası"
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "Yeni iletide başlık biçimi hatası"
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "\"Yeni ileti\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Cevaplanamıyor. Asıl e-posta muhtemelen mevcut değil."
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -2052,12 +2050,12 @@ msgstr ""
 "\"Cevapla\" şablonunun \"Gönderen\" bölümü geçersiz bir e-posta adresi "
 "barındırıyor."
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "\"Cevapla\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -2065,55 +2063,55 @@ msgstr ""
 "\"Yönlendir\" şablonunun \"Gönderen\" bölümü geçersiz bir e-posta adresi "
 "barındırıyor."
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "\"Yönlendir\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "Yön: birçok e-posta"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "\"Yeniden Yönlendir\" şablonu gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Yanıtla:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Haber grubu:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Takiben:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Yanıt-Olarak:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Alıcı:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Dosya iliştirilemedi (karakter seti dönüştürmede hata)."
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2125,16 +2123,16 @@ msgstr[0] ""
 "İliştirilen dosya(lar): \n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "Şablonun \"Alıntı işareti\" geçersiz."
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "'%s' dosyasının boyutu alınamadı."
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2143,57 +2141,57 @@ msgstr ""
 "İleti gövdesine %s boyutunda bir dosya eklemek üzeresiniz. Bunu yapmak "
 "istediğinizden emin misiniz?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10822 src/compose.c:11715
 msgid "_Insert"
 msgstr "_Ekle"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "Boş dosya"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "_Yine de iliştir"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamıyor."
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Düzenlendi]"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - İleti yaz%s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[başlık yok] - İleti yaz%s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "İleti yaz"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2201,63 +2199,63 @@ msgstr ""
 "E-postayı gönderecek hesap seçilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı seçin."
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 "Alıcı olarak tek öntanımlı '%s' adresi girilmiş. Yine de gönderilsin mi?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Gönder"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Başlık boş bırakılmış. %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Yine de gönderilsin mi?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Yine de kuyruğa eklensin mı?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "_Kuyruğa ekle"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "%d adet alıcıya gönderiliyor. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "İleti kuyruğa eklenemedi."
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2268,7 +2266,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2279,7 +2277,7 @@ msgstr ""
 "\n"
 "İmzalama başarısız oldu: %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2290,7 +2288,7 @@ msgstr ""
 "\n"
 "Şifreleme başarısız oldu: %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2300,7 +2298,7 @@ msgstr ""
 "\n"
 "Karakter seti dönüştürmesi başarısız oldu."
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2310,7 +2308,7 @@ msgstr ""
 "\n"
 "Alıcının şifreleme anahtarı alınamadı."
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2318,16 +2316,17 @@ msgstr ""
 "İleti kuyruğa eklenmesine rağmen gönderilemedi.\n"
 "Ana pencereden \"Kuyruktaki iletileri gönder\"i kullanarak tekrar deneyin."
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"Ana pencereden \"Kuyruktaki iletileri gönderi\"i kullanarak tekrar deneyin."
+"İletiyi \"Gönder\" ile deneyebilir ya da \"Sonra Gönder\" ile kuyruğa "
+"eklemeyebilirsiniz"
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2338,7 +2337,7 @@ msgstr ""
 "karakter kodlamasına dönüştürülemedi.\n"
 "%s olarak gönderilsin mi?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2351,100 +2350,104 @@ msgstr ""
 "\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "Şifreleme uyarısı"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "Devam _Et"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "E-posta göndermek için bir hesap mevcut değil!"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Seçilen hesap NNTP değil: Göndermek mümkün değil."
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "%s eki artık mevcut değil. Dikkate alma?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "Taslağı iptal et"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Göndermeyi iptal et"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "Eki dikkate alma"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "Ozgün %s bölümü"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "Adres _defterine ekle"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "Girdi içeriğini sil"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Adres defterinden otomatik tamamlamak için <tab> kullanın"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Mime türü"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "İletiyi şuraya kaydet "
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "_Gözat"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "İletinin kaydedileceği dizini seçin"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "Üst_bilgi"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "_Ekler"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "_Diğerleri"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "_Başlık"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2453,19 +2456,19 @@ msgstr ""
 "İmlâ denetimi başlatılamadı.\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "_Gönderen:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "Bu e-posta için kullanılacak hesap"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "Kullanılacak gönderen adresi"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2474,50 +2477,50 @@ msgstr ""
 "'%s' gizlilik sistemi yüklenemedi. Bu iletiyi imzalayamayacak ya da "
 "şifreleyemeyeceksiniz"
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "_Hiç biri"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Şablon gövdesinin %d. satırında hata bulundu."
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "'%s' şablonu format hatası."
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "Dosya mevcut değil ya da boş."
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "MIME türü"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2526,12 +2529,12 @@ msgstr ""
 "Metin gövdesi dosyaya yazdırılamadı:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr "Haricî editörle socket iletişimi kurmak Windows'ta desteklenmemekte."
 
-#: src/compose.c:9710
+#: src/compose.c:9703
 #, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
@@ -2542,21 +2545,16 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9747
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Harici metin düzenleyici çalışmayı durdurdu: %s"
 
-#: src/compose.c:9828
+#: src/compose.c:9819
 msgid "process id: %"
 msgstr "işlem id: %"
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr "işlem id: %d"
-
-#: src/compose.c:9835
+#: src/compose.c:9822
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2567,19 +2565,19 @@ msgstr ""
 "İşlemi sonlandırmaya zorla?\n"
 "%s"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10233 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Bu e-postayı gönderebilmek için ağ erişimine ihtiyaç var."
 
-#: src/compose.c:10448
+#: src/compose.c:10436
 msgid "Could not save draft."
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10452
+#: src/compose.c:10440
 msgid "Could not save draft"
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10453
+#: src/compose.c:10441
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2587,24 +2585,24 @@ msgstr ""
 "Taslak kaydedilemedi.\n"
 "Çıkmaktan ya da bu e-postadan vaz geçmek ister misiniz?"
 
-#: src/compose.c:10455
+#: src/compose.c:10443
 msgid "_Cancel exit"
 msgstr "Çıkmaktan _vazgeç"
 
-#: src/compose.c:10455
+#: src/compose.c:10443
 msgid "_Discard email"
 msgstr "E-postadan _vaz geç"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10634 src/compose.c:10648
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:10674
+#: src/compose.c:10662
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' dosyası okunamadı."
 
-#: src/compose.c:10676
+#: src/compose.c:10664
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2613,59 +2611,50 @@ msgstr ""
 "'%s' dosyası mevcut karakter kodlaması için\n"
 "geçersiz karakterler barındırıyor, eklemek yanlış olabilir."
 
-#: src/compose.c:10753
+#: src/compose.c:10741
 msgid "Discard message"
 msgstr "İletiden vaz geç"
 
-#: src/compose.c:10754
+#: src/compose.c:10742
 msgid "This message has been modified. Discard it?"
 msgstr "Bu ileti değiştirilmiş. Vaz geç?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10743 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Vaz geç"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10743 src/compose.c:10748
 msgid "_Save to Drafts"
 msgstr "_Taslaklara Kaydet"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10746 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: src/compose.c:10759
+#: src/compose.c:10747
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bu ileti değiştirilmiş. Son değişiklikleri kaydet?"
 
-#: src/compose.c:10760
+#: src/compose.c:10748
 msgid "_Don't save"
 msgstr "_Kaydetme"
 
-#: src/compose.c:10831
+#: src/compose.c:10819
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "'%s' şablonunun uygulanmasını istiyor musunuz?"
 
-#: src/compose.c:10833
+#: src/compose.c:10821
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10822 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "_Yer Değiştir"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr ""
-"Yapıştırılan metin yapıştırma limitini (%dKiB) aşıyor.\n"
-"Dosya olarak ekleyin."
-
-#: src/compose.c:11727
+#: src/compose.c:11708
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2677,20 +2666,20 @@ msgstr[0] ""
 "%d adet dosya içeriğinin ileti gövdesine eklenmesini ya da e-postaya "
 "iliştirilmesini istiyor musunuz?"
 
-#: src/compose.c:11733
+#: src/compose.c:11714
 msgid "Insert or attach?"
 msgstr "Ekle ya da iliştir"
 
-#: src/compose.c:11734
+#: src/compose.c:11715
 msgid "_Attach"
 msgstr "_İliştir"
 
-#: src/compose.c:11949
+#: src/compose.c:11930
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "%d. satırda alıntı biçimi hatası."
 
-#: src/compose.c:12245
+#: src/compose.c:12226
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2908,7 +2897,7 @@ msgid " Check File "
 msgstr " Dosyayı Denetle "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "Dosya"
 
@@ -2918,15 +2907,15 @@ msgstr "Yeni Adres Defteri Ekle"
 
 #: src/editgroup.c:97
 msgid "A Group Name must be supplied."
-msgstr "Bir Grup Adı sağlanmalı."
+msgstr "Bir Sınıf Adı sağlanmalı."
 
 #: src/editgroup.c:292
 msgid "Edit group data"
-msgstr "Grub verisini düzenle"
+msgstr "Sınıf verisini düzenle"
 
 #: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
-msgstr "Grub Adı"
+msgstr "Sınıf Adı"
 
 #: src/editgroup.c:342
 msgid "Available Addresses"
@@ -2934,15 +2923,15 @@ msgstr "Mevcut Adresler"
 
 #: src/editgroup.c:375
 msgid "Addresses in Group"
-msgstr "Grubtaki Adresler"
+msgstr "Sınıftaki Adresler"
 
 #: src/editgroup.c:494
 msgid "Edit group details"
-msgstr "Grup ayrıntılarını düzenle"
+msgstr "Sınıf ayrıntılarını düzenle"
 
 #: src/editgroup.c:496
 msgid "Add new group"
-msgstr "Yeni grup ekle"
+msgstr "Yeni sınıf ekle"
 
 #: src/editgroup.c:543
 msgid "Edit folder"
@@ -2953,12 +2942,12 @@ msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adını girin:"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "Yeni dizin"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını girin:"
 
@@ -2986,13 +2975,13 @@ msgstr "Yeni JPilot Girdisi Ekleyin"
 msgid "Edit LDAP - Select Search Base"
 msgstr "LDAP Düzenle - Arama Tabanını Seç"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Makine Adı"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3053,7 +3042,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTSSL"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "TLS"
 
@@ -3216,8 +3205,8 @@ msgstr "Bind Şifre"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "\"Bind DN\" kullanıcısı olarak bağlanırken kullanılacak şifre."
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Şifreyi göster"
@@ -3239,11 +3228,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Arama sonucunda gösterilecek azamî girdi sayısı."
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "Temel"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "Gelişmiş"
 
@@ -3261,8 +3250,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "Etiket düzenleme"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "Etiket"
 
@@ -3389,15 +3378,15 @@ msgstr "HTML Çıktı Dosyası"
 msgid "B_rowse"
 msgstr "_Gözat"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "Stil"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -3646,7 +3635,7 @@ msgstr "Adres Defterini LDIF Olarak Kaydet"
 msgid "Distinguished Name"
 msgstr "Ayırt Edici İsim (dn):"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "mbox olarak kaydet"
 
@@ -3749,8 +3738,8 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
-"kural hesaba bağlı [id=%d, name='%s'], iletileri almak için şu an "
-"kullanılan hesapla eşleşiyor\n"
+"kural hesaba bağlı [id=%d, name='%s'], iletileri almak için şu an kullanılan "
+"hesapla eşleşiyor\n"
 
 #: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
 #: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
@@ -3772,20 +3761,19 @@ msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
-"kural hesaba bağlı [id=%d, name='%s'], iletileri almak için şu an "
-"kullanılan hesapla eşleşmiyor [id=%d, name='%s']\n"
+"kural hesaba bağlı [id=%d, name='%s'], iletileri almak için şu an kullanılan "
+"hesapla eşleşmiyor [id=%d, name='%s']\n"
 
 #: src/filtering.c:658
 msgid ""
 "rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"kural hesaba bağlı değil, yine de kurallar isteğiniz üzere uygulanıyor\n"
+"kural hesaba bağlı değil, yine de tüm kurallar isteğiniz üzere uygulanıyor\n"
 
 #: src/filtering.c:665
 msgid ""
 "rule is account-based, but all rules are applied on user request anyway\n"
-msgstr ""
-"kural hesaba bağlı, yine de kurallar isteğiniz üzere uygulanıyor\n"
+msgstr "kural hesaba bağlı, yine de tüm kurallar isteğiniz üzere uygulanıyor\n"
 
 #: src/filtering.c:673
 #, c-format
@@ -3798,12 +3786,12 @@ msgstr ""
 
 #: src/filtering.c:696
 msgid "rule is account-based, skipped on user request\n"
-msgstr "kural hesaba bağlı, isğiniz üzere es geçiliyor\n"
+msgstr "kural hesaba bağlı, isteğiniz üzere es geçiliyor\n"
 
 #: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr "kural hesaba bağlı [id=%d, name='%s'],  istek üzerine es geçiliyor\n"
+msgstr "kural hesaba bağlı [id=%d, name='%s'],  isteğiniz üzere es geçiliyor\n"
 
 #: src/filtering.c:728
 msgid "rule is account-based, matching current account\n"
@@ -3919,61 +3907,61 @@ msgstr ""
 "ileti süzülüyor(%s%s%s)\n"
 "%sileti dosyası: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "İşleniyor (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "%s %s üzerine kopyalanıyor...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s %s üzerine taşınıyor...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "%s için önbellek güncelleniyor..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "İletiler işleniyor..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "%s çevrim dışı kullanım için eşleniyor...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Dizin adı nokta ile başlayamaz ya da bitemez."
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "Dizin adı boşluk ile bitemez."
 
@@ -3982,7 +3970,7 @@ msgid "Select folder"
 msgstr "Dizini seç"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "Yeni Dizin"
 
@@ -3993,100 +3981,103 @@ msgstr "Ana dizinden özellikleri ve işleme kurallarını devral"
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' dizin isminde kullanılamaz."
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "`%s' dizini zaten var."
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "`%s' dizini oluşturulamıyor."
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "Tümünü _okunmuş say"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "Hepsini _okunmamış say"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "Bütün dizinlerdekini _okunmuş say"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "Bütün dizinlerdekini _okunmamuş say"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "İşlem kurallarını _yürüt"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "Dizini _ara..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "Açılışta aç"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "İş_leniyor..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "Çöpü _boşalt..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "_Kuyruğa gönder..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "Gösterilen _Sütünları seç"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "Yeni"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Toplam"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "Hepsini okunmuş say"
 
-#: src/folderview.c:871
-#, fuzzy
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
@@ -4094,114 +4085,113 @@ msgstr ""
 "Bu ve bunun alt dizinlerindeki tüm e-postaları okunmuş olarak işaretlemek "
 "istiyor musunuz?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 "Bu dizindeki tüm e-postaları okunmuş olarak işaretlemek istiyor musunuz?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "Hepsini okunmamış say"
 
-#: src/folderview.c:877
-#, fuzzy
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
-"Bu ve bunun alt dizinlerindeki tüm e-postaları okunmamuş olarak işaretlemek "
+"Bu ve bunun alt dizinlerindeki tüm e-postaları okunmamış olarak işaretlemek "
 "istiyor musunuz?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 "Bu dizindeki tüm e-postaları okunmamuş olarak işaretlemek istiyor musunuz?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "%s/%s dizini taranıyor..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden oluştur"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Dizin ağacını yeniden oluşturmak yerel önbelleği silecektir. Devam edilsin "
 "mi?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden oluşturuluyor..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "Dizin ağacı taranıyor..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "%s dizini taranamadı\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "Tüm dizinlerdeki yeni iletiler denetleniyor..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "%s dizini kapatılıyor..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "%s dizini açılıyor..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "Dizin açılamadı."
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "Çöpü _boşalt"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Çevrimdışı uyarı"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Çevrim dışı çalışıyorsunuz. Geçersiz kıl?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Kuyruktaki tüm iletileri gönder"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "Kuruktaki iletiler gönderilirken hata oluştu."
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4210,64 +4200,64 @@ msgstr ""
 "Kuyruktaki iletiler gönderilirken hata oluştu:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "'%s' dizinini '%s' içine kopyalamak istediğinizden emin misiniz?"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "'%s' dizinini '%s' dizininin alt dizini yapmak istiyor musunuz?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "Dizini taşı"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s %s içine kopyalanıyor..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s %s içine taşınıyor..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "Kaynak ve hedef aynı."
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "Bir dizin kendi alt dizinine kopyalanamaz."
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "Bir dizin kendi alt dizinine taşınamaz."
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Bir dizin farklı posta kutuları arasında taşınamaz."
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "Kopyalama başarısız!"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "Taşıma başarısız!"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "%s dizini için düzenlemeler işleniyor"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Hedef dizin sadece alt dizinleri kaydetmek için kullanılabilir."
 
@@ -4312,8 +4302,8 @@ msgid "read-only"
 msgstr "salt okunur"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "bilinmeyen"
 
@@ -4354,13 +4344,13 @@ msgstr ""
 "Claws Mail GPL lisansıyla yayınlanan özgür bir yazılımdır. Claws Mail "
 "projesine bağışta bulunmak istiyorsanız:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "Claws Mail Tayfası\n"
 "ve Hiroyuki Yamamoto"
 
@@ -4395,7 +4385,7 @@ msgstr ""
 "Yerel: %s (karakter seti: %s)\n"
 "İşletim Sistemi: bilinmeyen"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Claws Mail Tayfası"
 
@@ -4448,10 +4438,9 @@ msgid "allows converting to and from different character sets\n"
 msgstr "farklı karakter setlerini dönüştürmeye izin verir\n"
 
 #: src/gtk/about.c:473
-#, fuzzy
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses\n"
-msgstr "PalmOS adres defteri desteğini sağlar\n"
+msgstr "IPv6 adres desteğini sağlar\n"
 
 #: src/gtk/about.c:483
 msgctxt "JPilot"
@@ -4484,10 +4473,9 @@ msgid "adds support for detection of network connection changes\n"
 msgstr "ağ bağlantısındaki değişimlerin saptanması için destek sağlar\n"
 
 #: src/gtk/about.c:543
-#, fuzzy
 msgctxt "OAuth2"
 msgid "adds support for OAuth2 authentication\n"
-msgstr "yazım denetimi desteğini sağlar\n"
+msgstr "OAuth2 kimlik doğrulama desteğini sağlar\n"
 
 #: src/gtk/about.c:576
 msgid ""
@@ -4520,73 +4508,78 @@ msgstr ""
 "Bu programla beraber GNU Genel Kamu Lisansının bir kopyasını almış "
 "olmalısınız. Almadıysanız, bakın "
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "Oturum istatistikleri\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "Başlatıldı: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "Gelen trafik\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Alınan iletiler: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr "İstenmeyen iletiler: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "Giden trafik\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Yeni/yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Cevaplanan iletiler: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Giden toplam ileti: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "Claws Mail Hakkında"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "_Bilgi"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "_Yazarlar"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "Ö_zellikler"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "_Lisans"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "_Sürüm Notları"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "İ_statistikler"
 
@@ -4795,7 +4788,7 @@ msgid "Configuring..."
 msgstr "Ayarlarnıyor..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Tarih"
@@ -4804,9 +4797,9 @@ msgstr "Tarih"
 msgid "Date:"
 msgstr "Tarih:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "Gönderen"
@@ -4827,9 +4820,9 @@ msgstr "Gönderen:"
 msgid "Reply-To"
 msgstr "Yanıtla"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "Alıcı"
@@ -4865,9 +4858,9 @@ msgstr "Referanslar"
 msgid "References:"
 msgstr "Referanslar:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "Başlık"
@@ -4877,7 +4870,7 @@ msgstr "Başlık"
 msgid "Subject:"
 msgstr "Başlık:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "Yorumlar"
 
@@ -4991,8 +4984,8 @@ msgid "Seen:"
 msgstr "Görünen:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "Durum"
@@ -5065,7 +5058,7 @@ msgstr "Öncelik"
 msgid "Precedence:"
 msgstr "Öncelik:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Kurum"
 
@@ -5227,7 +5220,7 @@ msgstr "İstenmeyen ileti"
 
 #: src/gtk/icon_legend.c:75
 msgid "Message has attachment(s)"
-msgstr "Eki bulunan ileti"
+msgstr "Ek(ler)i bulunan ileti"
 
 #: src/gtk/icon_legend.c:76
 msgid "Digitally signed message"
@@ -5278,9 +5271,8 @@ msgid "Folder contains marked messages"
 msgstr "İşaretlenmiş iletiler barındıran dizin"
 
 #: src/gtk/icon_legend.c:91
-#, fuzzy
 msgid "IMAP folder which contains subfolders only"
-msgstr "Sadece alt dizinleri içeren IMAP dizini"
+msgstr "Sadece alt dizinler içeren IMAP dizini"
 
 #: src/gtk/icon_legend.c:92
 msgid "IMAP mailbox showing only subscribed folders"
@@ -5385,9 +5377,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5401,7 +5392,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5416,7 +5407,7 @@ msgstr "_Yükle..."
 msgid "_Unload"
 msgstr "_Kaldır"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "Tanım"
 
@@ -5439,8 +5430,8 @@ msgid "Loaded plugins"
 msgstr "Yüklenmiş eklentiler"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "_Uygula"
 
@@ -5453,10 +5444,10 @@ msgid "_Hide"
 msgstr "_Gizle"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Hesap"
@@ -5526,17 +5517,17 @@ msgid "forwarded messages"
 msgstr "yönlendirilmiş iletiler"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "eklentisi olan iletiler"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "herhangi bir üstbilgi adı ya da değer içinde S içeren iletiler"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "herhangi bir üstbilgi değeri içinde S içeren iletiler"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "eki olan iletiler"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "İleti-ID üstbilgisi içinde S içeren iletiler"
@@ -5626,18 +5617,18 @@ msgid "unread messages"
 msgstr "okunmamış iletiler"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "H üstbilgisinde V içeren iletiler"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "Referanslar üstbilgisinde S içeren iletiler"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "komuta yönlendirildiğinde 0 döndüren iletiler - %F ileti dosyasıdır"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "X-Etiket üstbilgisinde S içeren iletiler"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "mantıksal VE operatörü"
@@ -5685,55 +5676,55 @@ msgstr ""
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Arama sırasında sorun oluştur. Sebebi için kayıtlara bakın."
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Gönderen/Alıcı/Cc/Başlık/Etiket"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Yinelenen"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "Yapışkan"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "Kesintisiz yazma"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "Seçince yürüt"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "_Sil"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "Mevcut aramayı temizle"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Arama ölçütünü düzenle"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Bilgi"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "Genişletilmiş semboller hakkında bilgi"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "_Düzenle"
 
@@ -5912,16 +5903,16 @@ msgstr "(Başlık yok)"
 msgid "Error:"
 msgstr "Hata:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "Dosya boyutu:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "Resmi yükle"
 
@@ -5944,11 +5935,11 @@ msgstr "%s üzerinde IMAP hatası:"
 
 #: src/imap.c:630
 msgid "authenticated"
-msgstr "kimlik denetimi yapıldı"
+msgstr "kimlik doğrulama yapıldı"
 
 #: src/imap.c:633
 msgid "not authenticated"
-msgstr "Kimlik denetimi yapılmamış"
+msgstr "Kimlik doğrulama yapılmamış"
 
 #: src/imap.c:636
 msgid "bad state"
@@ -6111,7 +6102,7 @@ msgstr "TLS hatası"
 msgid "Unknown error [%d]"
 msgstr "Bilinmeyen hata [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6121,9 +6112,9 @@ msgstr ""
 "\n"
 "\n"
 "CRAM-MD5 ile oturum açma, libetpan SASL desteğiyle derlendiyse ve CRAM-MD5 "
-"eklentisi yüklüyse çalışmakta."
+"eklentisi yüklüyse çalışır."
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6133,9 +6124,9 @@ msgstr ""
 "\n"
 "\n"
 "DIGEST-MD5 ile oturum açma, libetpan SASL desteğiyle derlendiyse ve DIGEST-"
-"MD5 SASL eklentisi yüklüyse çalışmakta."
+"MD5 SASL eklentisi yüklüyse çalışır."
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6144,10 +6135,58 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"SCRAM-SHA-1 girişleri sadece libetpan SASL desteğiyle derlendiyse ve SCRAM "
-"eklentisi yüklükse çalışmakta."
+"SCRAM-SHA-1 ile oturum açma, sadece libetpan SASL desteğiyle derlendiyse ve "
+"SCRAM eklentisi yüklüyse çalışır."
+
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-224 ile oturum açma, sadece libetpan SASL desteğiyle derlendiyse "
+"ve SCRAM eklentisi yüklüyse çalışır."
 
-#: src/imap.c:996
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-256 ile oturum açma, sadece libetpan SASL desteğiyle derlendiyse "
+"ve SCRAM eklentisi yüklüyse çalışır."
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-384 ile oturum açma, sadece libetpan SASL desteğiyle derlendiyse "
+"ve SCRAM eklentisi yüklüyse çalışır."
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"SCRAM-SHA-512 ile oturum açma, sadece libetpan SASL desteğiyle derlendiyse "
+"ve SCRAM eklentisi yüklüyse çalışır."
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6159,7 +6198,7 @@ msgstr ""
 "PLAIN ile oturum açma, libetpan SASL desteğiyle derlendiyse ve PLAIN SSL "
 "eklentisi yüklüyse çalışır."
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6171,7 +6210,7 @@ msgstr ""
 "LOGIN ile oturum açma, libetpan SASL desteğiyle derlendiyse ve LOGIN SASL "
 "eklentisi yüklüyse çalışır."
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6181,37 +6220,37 @@ msgstr ""
 "\n"
 "OAuth2 hatası. OAuth2 hesap seçeneklerinizi gözden geçirin."
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "%s adresine bağlanma başarısız oldu: giriş reddedildi.%s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "%s adresine bağlanma başarısız oldu: giriş reddedildi.%s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "%s adresine bağlanma başarısız oldu."
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s adresine yapılmış IMAP bağlantısı koptu. Yeniden bağlanılıyor...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 "IMAP sunucusuna bağlanmak için Claws Mail'in ağ erişimine ihtiyacı var."
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Güvensiz bağlantı"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6225,108 +6264,108 @@ msgstr ""
 "Bu sunucuya bağlanmaya devam etmek istiyor musunuz? İletişim güvenli "
 "olmayacak."
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Bağlanmaya _devam et"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "'%s' hesabı: IMAP sunucusuna bağlanıyor: %s:%d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "IMAP sunucusuna bağlanılamıyor: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "IMAP sunucusuna bağlanılamıyor: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "STARTTLS oturumu başlatılamıyor.\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "%s IMAP4 sunucusunda oturum açılamadı.\n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "%s IMAP sunucusunda oturum açılamadı."
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "İletiler ekleniyor..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "İletiler kopyalanıyor..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "Arama sunucu hatasından dolayı başarısız oldu."
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "silinen işaretler atanamaz\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "%s içindeki abonelikten çıkılan dizinler aranıyor..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s içindeki alt dizinler aranıyor..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu oluşturulamıyor: LIST hatası\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamıyor\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s posta kutusunun adı %s olarak değiştiremiyor\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemiyor\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "LIST başarısız oldu\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "İletiler işaretleniyor..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemiyor: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Oturum açabilmek için STARTTLS gerekli.\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "Kabiliyeler tazelenemedi.\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6335,20 +6374,24 @@ msgstr ""
 "%s sunucusuna bağlanılamadı: sunucuya bağlanmak için STARTTLS gerek, fakat "
 "Claws Mail STARTTLS desteği olmadan derlenmiş.\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "Sunucuya oturum açma kapatılmış.\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "İleti alınıyor..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "Silinen iletiler temizleniyor..."
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "silinen işaretler atanamaz: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6378,7 +6421,7 @@ msgid "Cop_y folder..."
 msgstr "Dizini _kopyala..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "Dizini _sil..."
 
@@ -6398,7 +6441,7 @@ msgstr "Ü_yelikler"
 msgid "_Subscribe..."
 msgstr "_Abone ol..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "_Abonelikten çık..."
 
@@ -6430,21 +6473,21 @@ msgstr ""
 "istemiyorsanız; dizin sonuna '/' ekleyin)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "`%s' için yeni bir ad girin:"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "Dizin adını değiştir"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6463,7 +6506,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "'%s' dizininin kopyalanacağı dizini seçin"
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6477,8 +6520,8 @@ msgstr ""
 "Silmek istediğinizden emin misiniz?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "'%s' dizini kaldırılamıyor."
@@ -6783,10 +6826,10 @@ msgstr "Bağlantı başarısız"
 
 #: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
-msgstr "Kimlik denetimi başarısız"
+msgstr "Kimlik doğrulama başarısız"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "Kilitli"
 
@@ -6827,7 +6870,7 @@ msgstr "POP3 sunucusuna bağlanılamıyor: %s:%d\n"
 #: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
 #: src/send_message.c:522
 msgid "Authenticating..."
-msgstr "Kimlik denetimi yapılıyor..."
+msgstr "Kimlik doğrulama yapılıyor..."
 
 #: src/inc.c:1019
 #, c-format
@@ -6955,8 +6998,8 @@ msgstr "Birleştirme iptal edildi\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "saniye"
 
@@ -7017,7 +7060,7 @@ msgstr "LDAP hatası (arama): %d (%s)\n"
 msgid "Nick Name"
 msgstr "Lakabı"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -7026,7 +7069,7 @@ msgstr ""
 "%s dosyası zaten mevcut.\n"
 "Dizin oluşturulamıyor."
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -7035,7 +7078,7 @@ msgstr ""
 "%s hesabı için ayarlar bunundu.\n"
 "Bu ayarları taşımak istiyor musunuz?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -7048,11 +7091,11 @@ msgstr ""
 "Sylpheed süzme kurallarınız %s içinde bulunan bir\n"
 "betikle dönüştürülebilir."
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "Eski ayarları koru"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -7062,27 +7105,27 @@ msgstr ""
 "önbelleklenmiş IMAP ya da Haberler veriniz varsa bu işlem zaman alacak ve "
 "diskte daha fazla alan kapsayacaktır."
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "Ayarların taşınması"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "Ayarlar kopyalanıyor... Bu süreç zaman alabilir..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "Taşıma başarısız oldu!"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "Ayarlar taşınıyor..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(ya da daha eski)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7097,7 +7140,7 @@ msgstr[0] ""
 "ayarlarını denetleyin:\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -7108,7 +7151,7 @@ msgstr ""
 "posta kutusunun ana dizini üzerinde \"Dizin ağacını yenden oluştur\" "
 "seçeneğini kullanın."
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7119,76 +7162,76 @@ msgstr ""
 "eklenti tarafından sağlanmakta. Lütfen eklentiyi tekrar yükleyip yeniden "
 "deneyin."
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "Dosya adı yok\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "Dosya okumak için açılamıyor\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "Bozuk üstbilgi\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "Mükerrer 'Alıcı:' üstbilgisi\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "Gerekli olan 'Alıcı:' üstbilgisi yok\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Yardım için -h ya da --help deneyin\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "%s seçeneği için dosya değişkeni eksik"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "%s seçeneği için uri değişkeni eksik ya da boş"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "%s seçeneği için uri değişkeni eksik"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "%s seçeneği için boş olmayan en az bir tane dosya değişkeni girin"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "%s seçeneği için dizin, tür ve talep değişkenleri eksik"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "%s seçeneği için tür ve talep değişkenleri eksik"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "%s seçeneği için talep değişkeni eksik"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEK]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]    posta yazma penceresini açar"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7207,11 +7250,11 @@ msgstr ""
 "                         (Alıcı: zorunlu), sonra satır sonuna kadar ileti "
 "gövdesi."
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe uri        girilen URI adresine mümkünse abone olunur"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7221,7 +7264,7 @@ msgstr ""
 "                         posta yazma penceresini belirtilen dosyaları\n"
 "                         postaya iliştirilmiş halde açar"
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7231,23 +7274,23 @@ msgstr ""
 "                         posta yazma penceresini belirtilen dosyaları\n"
 "                         postaya eklenmiş halde açar"
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive              yeni iletileri alır"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          tüm hesaplardaki yeni iletileri alır"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     ileti alınımını iptal et"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       ileti gönderimini iptal et"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7267,15 +7310,15 @@ msgstr ""
 "                         yinelenen: değişken 0, n, N, f ya da F ile başlarsa "
 "yanlış"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 kuyruktaki tüm iletileri gönderir"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dizin]...   toplam ileti sayısını göster"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7283,15 +7326,15 @@ msgstr ""
 "  --status-full [dizin]...\n"
 "                         her dizinin durumunu göster"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statisstics           oturum istatistiklerini göster"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     oturum istatistiklerini sıfırla"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7301,45 +7344,45 @@ msgstr ""
 "                         dizin, 'dizin/alt_dizin' gibi bir dizin id'si, bir "
 "file:// biçiminde uri ya da dizinin yolu"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online               çevrimiçi moda geç"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              çevrim dışı moda geç"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       Claws Mail'i kapat"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             hata ayıklama modu"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug          hata ayıklama modunu değiştir"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              bu yardımı göster"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           sürüm bilgisini yazdır"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      sürüm ve gömülü özelliklere dair bilgileri yazdır"
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           ayar dizinini ekrana yazdır"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7347,7 +7390,7 @@ msgstr ""
 "  --alternate-config-dir dizin\n"
 "                         belirtilen ayar dizinini kullan"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7355,48 +7398,48 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         ana pencere boyutunu ayarla"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "%s seçeneği için dizin değişkeni eksik"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "%s seçeneği için geometri değişkeni eksik"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "%s seçeneği için dizin değişkeni eksik"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "Bilinmeyen seçenek %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "İşleniyor (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "en üst dizin"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "Kuyruktaki iletiler"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: ağ devrede.\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: ağ devre dışı.\n"
 
@@ -7580,11 +7623,11 @@ msgstr "Sonraki okunmamış _dizin"
 msgid "F_older..."
 msgstr "D_izin"
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "Sonraki bölüm"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "Önckei bölüm"
 
@@ -7826,7 +7869,7 @@ msgstr "Etiketler"
 msgid "Re-_edit"
 msgstr "Yeniden _düzenle"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "İmzayı denetle"
 
@@ -8031,7 +8074,7 @@ msgstr "Sütun başlıkları"
 msgid "Th_read view"
 msgstr "_Zİncirleme konuları göster"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "Okunmuş zincirleme konuları gizle"
 
@@ -8039,7 +8082,7 @@ msgstr "Okunmuş zincirleme konuları gizle"
 msgid "_Hide read messages"
 msgstr "Okunmuş iletileri _gizle"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "Silinen iletileri gizle"
 
@@ -8151,11 +8194,11 @@ msgstr "Kilide göre"
 msgid "D_on't sort"
 msgstr "Tasnif _etme"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "Artan sırada"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "Azalan sırada"
 
@@ -8163,7 +8206,7 @@ msgstr "Azalan sırada"
 msgid "_Auto detect"
 msgstr "_Otomatik sapta"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "Etiketleri düzenle..."
 
@@ -8202,7 +8245,7 @@ msgstr "Süzme kaydı kapalı\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Başlıksız"
 
@@ -8210,19 +8253,19 @@ msgstr "Başlıksız"
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Çöp dizinlerindeki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "Çıkma"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8235,18 +8278,18 @@ msgstr ""
 "Mevcut bir mailbox belirtildiyse, doğrudan\n"
 "taranacaktır."
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "`%s' e-posta kutusu zaten var."
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8255,163 +8298,163 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar zaten mevcut olabilir ya da buraya yazma izniniz olmayabilir."
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "Posta göndermeye izin yok"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Mbox içe aktarılamadı."
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "Mbox'a aktarılamadı."
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail'i kapat?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "Çı_k"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "Dizin eşleştirme"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "Dizinleri şimdi eşleştirmek istiyor musunuz?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "_Eşleştir"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "Mükerrer iletiler siliniyor..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Seçilen dizinde mükerrer ileti bulunamadı.\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "Seçilen dizinde %d adet mükerrer ileti silindi.\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
 msgstr[0] "Seçilen dizinde %d adet mükerrer ileti işaretlendi.\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Tüm dizinlerdeki mükerrer iletiler siliniyor..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d adet dizindeki %d adet mükerrer ileti silindi.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "%d adet dizinde mükerrer ileti bulunamadı.\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Gidilecek dizini seçin"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "Dizin kurallarından önce uygulanacak işlem kuralları"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "Dizin kurallarından sonra uygulanacak işlem kuralları"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "Süzme ayarları"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "Öntanımlı istemci olarak atanamıyor: ikiliğin konumu elde edilemiyor"
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail öntanımlı istemci olarak atandı."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "Öntanımlı istemci olarak atanamıyor: kayıt defterine yazmak olanaksız."
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d adet hesapta %d adet unutulmuş şifre.\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "%s üstbilgi"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "üstbilgi"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "üstbilgi satırı"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "gövde satırı"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "etiket"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Büyük/küçük harf duyarlı"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "Büyük/küçük harf duyarlı değil"
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "İletinin eşleşip eşleşmediğine bakılıyor [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "ileti eşleşiyor\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "ileti eşleşmiyor\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(hiç biri)"
 
@@ -8447,7 +8490,7 @@ msgstr "mbox dosyasının üzerine yaz"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Bu dosya zaten var. Üzerine yazmak istiyor musunuz?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "Üzerine yaz"
 
@@ -8676,8 +8719,8 @@ msgstr ""
 "\n"
 "  İleti silindi ya da başka bir dizine taşındı"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "Öğrenirken bir sorun meydana geldi.\n"
 
@@ -8717,63 +8760,67 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Posta kutusunu kaldır"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Aç"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "_Birlikte aç..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "Gönder..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "_Metin olarak görüntüle"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "_Farklı kaydet..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "_Hepsini kaydet..."
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "Tüm ekleri kaydet..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "Mime Türü"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "Tüm bilgileri göster"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "Tekrar denetle"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Denetlemek için simgeye tıklayın."
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Denetlemek için simgeye tıklayın ya da '%s' tuşuna basın."
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "İmza denetimi zaman aşımına uğradı. Tekrar denemek için simgeye tıklayın."
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8781,99 +8828,96 @@ msgstr ""
 "İmza denetimi zaman aşımına uğradı. Tekrar denemek için simgeye tıklayın ya "
 "da '%s' tuşuna basın."
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr "İmza denetimi başarısız. Tekrar denemek için simgeye tıklayın."
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 "İmza denetimi başarısız. Tekrar etmek için simgeye tıklayın ya da '%s' "
 "tuşuna basın."
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "İmza denetleniyor..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "E-postaya geri dön"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Çok bölümlü iletinin bir bölümü kaydedilemedi: %s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "'%s' dosyasının üzerine yazılsın mı?"
 
-#: src/mimeview.c:1840
-#, fuzzy, c-format
+#: src/mimeview.c:1850
+#, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
 "saving or ignore error and continue?"
 msgstr ""
-"İleti bölümü #%d kaydedilirken bir hata meydana geldi. İşlemi sonlandır ya "
-"da hatayı atlayıp devam et?"
+"İleti bölümü %d kaydedilirken bir hata meydana geldi. İşlemi sonlandır ya da "
+"hatayı atlayıp devam et?"
 
-#: src/mimeview.c:1843
-#, fuzzy
+#: src/mimeview.c:1853
 msgid "Error saving message part"
-msgstr "İleti bölümünün hepsi kaydedilemedi"
+msgstr "İleti bölümü kaydedilirken hata"
 
-#: src/mimeview.c:1844
-#, fuzzy
+#: src/mimeview.c:1854
 msgid "Ignore"
-msgstr "Dikkate alınmayan:"
+msgstr "Dikkate alma"
 
-#: src/mimeview.c:1844
-#, fuzzy
+#: src/mimeview.c:1854
 msgid "Ignore all"
-msgstr "Zincirleme konuyu dikkate alma"
+msgstr "Hiçbirini dikkate alma"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d adet dosya başarıyla kaydedildi."
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d adet dosya başarıyla kaydedildi."
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d adet dosya kaydedilemedi."
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Hedef dizini seç"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' bir dizin değil."
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "Farklı kaydet"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "Birlikte aç"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8882,7 +8926,7 @@ msgstr ""
 "Dosyayı açmak için komut satırını aç:\n"
 "('%s' dosya adıyla değiştirilecek)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8893,36 +8937,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "Güvenilmeyen ikilik çalıştırılsın mı?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
-"Bu eklenti çalıştırılabilir bir dosyadır. Güvenilmeyen ikilikleri "
-"çalıştırmak tehlikelidir ve bilgisayarınızda açığa neden olabilir.\n"
+"Bu ek çalıştırılabilir bir dosyadır. Güvenilmeyen ikilikleri çalıştırmak "
+"tehlikelidir ve bilgisayarınızda açığa neden olabilir.\n"
 "\n"
 "Bu dosyayı çalıştırmak istiyor musunuz?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "İkiliği çalıştır"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "Tür:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Boyut:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -8961,7 +9005,7 @@ msgstr "%s:%d ile oturum oluşturmada sorun\n"
 #: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
-msgstr "%s:%d sunucusuna kimlik denetimi hatası yaşandı... \n"
+msgstr "%s:%d kimlik doğrulama hatası... \n"
 
 #: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
@@ -9033,77 +9077,77 @@ msgstr "Haber grubu aboneliğinden çık"
 msgid "Rename newsgroup folder"
 msgstr "Haber grubu dizinini yeniden adlandır"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
-msgstr "OAuth2 kimlik denetim kodu eksik\n"
+msgstr "OAuth2 kimlik doğrulama kodu eksik\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 bağlantısında hata\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "OAuth2 TLS bağlantısında hata\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2 erişim bilgileri alındı\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2 erişim bilgileri alınmadı\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2 yenileme bilgisi alındı\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2 yenileme bilgisi alınmadı\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "OAuth2 yedek yenileme bilgisi sağlandı\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "OAuth2 yedek yenileme bilgisi sağlanmadı\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 soket yazma hatası\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 soket zaman aşım hatası\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 erişim bilgisi hâlâ taze\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 erişim bilgisini yenileyerek elde ediyor\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 kimlik koduyla yeni bir erişim bilgisini deniyor\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 erişim ve yenileme bilgisi güncellendi\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 aslı: %s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 şifreli: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9112,11 +9156,11 @@ msgstr ""
 "OAuth2 çözümlenmiş: %s\n"
 "\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "Ana şifreyi girin"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "Yanlış ana şifre."
 
@@ -9534,7 +9578,7 @@ msgstr "Evet"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "Hayır"
 
@@ -9551,7 +9595,7 @@ msgid "Delete selected files"
 msgstr "Seçilen dosyaları sil"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "Önce e-postaları seç"
 
@@ -9565,97 +9609,97 @@ msgstr ""
 "Yedek için dosya adını seçin [dosya uzantısı .tgz gibi yedekleme türünü "
 "belirtmeli]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld / %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "Yedek Oluştur"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "Yedek değişkenlerini gir"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "Yedeklenecek dizin"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "Yedeğin kök dizini"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "Yedeğin kök dizini olacak dizini seçmek için bu düğmeye tıklayın"
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "Yedeğin adı"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "Yedek konumu ve adı"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Seç"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr "Yedek için bir ad ve konum seçmek için bu düğmeye tıklayın."
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "Sıkıştırma metodunu seç"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Yedeği %s olarak sıkıştırmak için bu seçeneği seçin"
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "Türü seç"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Yedek türü olarak %s kullanmak için bu seçeneği seçin"
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "Diğer seçenekler"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "_Alt Dizinler"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Altdizinlerin de yedeklenmesi için bu seçeneği seçin"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9665,11 +9709,11 @@ msgstr ""
 "seçin. Bu seçenek yedek oluşturma süresini oldukça\n"
 "artıracaktır"
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "Yeniden _adlandır"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9681,7 +9725,7 @@ msgstr ""
 "İsimlendirme şekli: tarih_gönderen at alıcı@başlık.\n"
 "İsimler azamî 96 karakter barındıracak şekilde kısaltılacak"
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9689,11 +9733,11 @@ msgstr ""
 "Yedekleme sonrasında e-postaları silmek için bu seçeneği seçin\n"
 "Şu an IMAP4, yerel mbox ve POP3 desteklenmekte"
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "Seçim seçenekleri"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9774,7 +9818,6 @@ msgid "Choose this option to delete mails after archiving"
 msgstr "Yedekleme sonrasında e-postaları silmek için bu seçeneği seçin"
 
 #: src/plugins/att_remover/att_remover.c:306
-#, fuzzy
 msgid "Filename"
 msgstr "Dosya adı:"
 
@@ -9787,7 +9830,7 @@ msgstr "Ekleri kaldır"
 msgid "Remove"
 msgstr "Kaldır"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Ek"
@@ -9946,19 +9989,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "Hariç Tut"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -9968,15 +10011,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "Herhangi biri"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: posta metinleri alınıyor..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: iletiler süzülüyor..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -9988,7 +10031,7 @@ msgstr ""
 ".Bogofilter'ı eğitmek için bir kaç yüz iletiyi \"/İşaretle/İstenmeyen\" ve "
 "\"/İşaretle/Zararsız\" seçenekleriyle işaretleyin."
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9996,21 +10039,21 @@ msgid ""
 msgstr ""
 "Bogofilter eklentisi bir iletiyi süzemedi. `%s %s %s` komutu yürütülemedi."
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: iletiden öğreniyor..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Öğrenme başarısız; `%s` %d durumuyla geri döndü."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: iletilerden öğreniyor...."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -10019,7 +10062,7 @@ msgstr ""
 "Öğrenme başarısız; `%s %s %s` hata döndürdü:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -10048,13 +10091,13 @@ msgstr ""
 "Seçeneklere /Yapılandırma/Tercihler/Eklentiler/Bogofilter yoluyla "
 "ulaşabilirsiniz."
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "İstenmeyen posta tespiti"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "İstenmeyen posta öğrenimi"
 
@@ -10078,7 +10121,7 @@ msgstr "Bundan daha büyük iletiler denetlenmez"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "KiB"
 
@@ -10181,19 +10224,19 @@ msgstr "Bogofilter ikiliğinin yolu"
 msgid "Mark spam as read"
 msgstr "İstenmeyeni okunmuş olarak işaretle"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: posta metinleri alınıyor..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: iletiler süzülüyor..."
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10205,18 +10248,18 @@ msgstr ""
 ".Bsfilter'ı eğitmek için bir kaç yüz iletiyi \"/İşaretle/İstenmeyen\" ve \"/"
 "İşaretle/Zararsız\" seçenekleriyle işaretleyin."
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr "Bsfilter eklentisi bir iletiyi süzemedi. `%s` komutu yürütülemedi."
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: iletiden öğreniyor..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10362,8 +10405,8 @@ msgstr ""
 "Bu eklenti bir IMAP, yerel ya da POP hesabından alınan tüm iletileri taramak "
 "için Clam AntiVirus'u kullanır.\n"
 "\n"
-"Bir ileti ekinin virüs barındırdığı tespit edildiğinde, ek silinebilir ya da "
-"virüslü dosyalar için ayrılmış bir dizine kaydedilebilir.\n"
+"Bir iletideki ekin virüs barındırdığı tespit edildiğinde, ek silinebilir ya "
+"da virüslü dosyalar için ayrılmış bir dizine kaydedilebilir.\n"
 "\n"
 "Bu eklenti clamd ile bir soket aracılığıyla iletişim\n"
 "kurduğu için ev ve .claws-mail dizin izinlerinin atanması\n"
@@ -10393,7 +10436,7 @@ msgstr "Virüs taramayı aç"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:258
 msgid "Maximum attachment size"
-msgstr "Azami eklenti boyutu"
+msgstr "Azami ek boyutu"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:269
 msgid "Message attachments larger than this will not be scanned"
@@ -10558,66 +10601,52 @@ msgstr ""
 "\n"
 "Pek kullanışlı değil."
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "Görüntüleri göster"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "Gömülü görüntüleri göster"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "Javascript'i çalıştır"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "Gömülü javascript'i çalıştır"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "Java nesnelerini çalıştır"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "Gömülü Java nesnelerini çalıştır"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "Nesneleri eklentileri kullanarak yorumla"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "Gömülü nesneleri eklentiler kullanarak yorumla"
 
-#: src/plugins/fancy/fancy_prefs.c:170
-#, fuzzy
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "Görüntüleyicide aç (uzak içerik etkin)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "Bir şey yapma (uzak içerik kapatıldı)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "Vekil (Proxy)"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "GNOME'un vekil (proxy) ayarlarını kullan"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "Vekil (proxy) kullan"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "Uzak kaynaklar"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10631,116 +10660,120 @@ msgstr ""
 "betiklerin, eklenti ve Java nesnelerinin yorumlanması her hâl-ü\n"
 "kârda açılabilir."
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "Uzak içerik yüklemesini aç"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "Öntanımlı olarak, bağlantıya tıklandığında"
 
-#: src/plugins/fancy/fancy_prefs.c:286
-#, fuzzy
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "Harici tarayıcı ile aç"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "Bu dosyadaki CSS tüm HTML parçalarına uygulanacak"
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Göz_at"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "Sitil seç"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "Uzak içerik yüklemesi kapatıldı"
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "Görüntüleri yükle"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "Uzak içeriği aç"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "Javascript'i Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "Eklentileri Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "Java'yı aç"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "Bağlantıları harici bir tarayıcı ile aç"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Bir hata oluştu: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s kusurlu ya da desteklenmeyen bir besleme"
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "Okuyucuda Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "Tarayıcıda Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "Görüntüyü Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "Bağlantıyı Kopyala"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "Bağlantıyı İndir"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "Görüntüyü Farklı Kaydet"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "Görüntüyü Kopyala"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "Beslemeyi içe aktar"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Fancy"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "Tamamlayıcı WebKit eklentisi %s bulunaması"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Okuyucu"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10842,187 +10875,6 @@ msgstr ""
 "X-FETCH-TIME üstbilgisini RFC822 formatındaki iletinin alındığı tarih ve "
 "zamanla ekler"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "GData eklentisi: Kimlik denetimi gerekmekte"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"GData eklentisini kullanabilmeniz için Claws Mail'e Google kişilerinize "
-"erişme iznini vermelisiniz.\n"
-"\n"
-"Aşağıdaki düğmeye basarak Google'ın erişim izinleri sayfasına ulaşın. Erişim "
-"iznine onay verdikten sonra bir erişim izni kodu alacaksınız. Aldığınız kodu "
-"aşağıdaki alana girerek Claws Mail'in Google kişilerinize erişme iznini "
-"vermiş olacaksınız."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "1. Adım"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr "Google erişim izinleri sayfasını tarayıcıda açmak için buna tıklayın"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "2. Adım"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "Kodu girin:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "GData eklentisi: Kişiler sorgulanırken hata: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "%d kişi eklendi"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "%d kişiden"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "GData eklentisi: kişi aramasına başlanıyor\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "GData eklentisi: Gruplar sorgulanırken hata: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "GData eklentisi: Gruplar alındı\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "GData eklentisi: Grup aramasına başlanıyor\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData eklentisi: Kimlik denetimi hatası: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "GData eklentisi: Kimlik denetimi gerçekleşti\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData eklentisi: İnteraktif kimlik denetimi başlatılıyor\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData eklentisi: Erişim izni kodu alındı, erişim izni isteniyor\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"GData eklentisi: Erişim izni kodu alınmadı, erişim izni isteği "
-"sonlandırıldı\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"GData eklentisi: İnteraktif erişim izni hâlâ yürütülmekte, ek bir oturum "
-"başlatılmadı\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData eklentisi: Kimlik denetimi tazeleme hatası: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData eklentisi: Kimlik denetimi yenileme başarılı\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"GData eklentisi: Son güncellemeden sonra geçen süre: %d dakika, "
-"güncelleniyor\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData eklentisi: Kimlik denetimi yenileniyor\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "Kimlik Doğrulama"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "Kullanıcı adı:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "Sorgulama sıklığı (saniye):"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "Azami sonuç adedi:"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr "GData eklentisindeki adres tamamlama çengeli kaydedilemedi"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "GData eklentisindeki çevrimdışı anahtar çengeli kaydedilemedi"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"Bu eklenti Claws Mail için GData protokolüne erişim sağlar.\n"
-"\n"
-"GData protokolü Google servisleri için bir arayüzdür.\n"
-"Şu an için eklenen tek özellik Google kişilerinin TAB ile tamamlamaya dahil "
-"edilmesidir.\n"
-"\n"
-"Geri bildirim için <berndth at gmx.de>"
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "GData entegrasyonu"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -11183,8 +11035,8 @@ msgid "Cache refresh interval"
 msgstr "Geçici bellek yineleme sıklığı"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "saat"
 
@@ -11330,11 +11182,11 @@ msgstr "Görüntü önbelleğinin megabayt cinsinden boyutu"
 msgid "Default font"
 msgstr "Öntanımlı font"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "Bağlantıyı Aç"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "Bağlantı Konumunu Kopyala"
 
@@ -11419,18 +11271,18 @@ msgstr "Sieve oturumunda işlenemeyen ileti: %d\n"
 
 #: src/plugins/managesieve/managesieve.c:1160
 msgid "Sieve: retrying auth\n"
-msgstr "Sieve: kimlik denetimi yeniden deneniyor\n"
+msgstr "Sieve: kimlik doğrulama yenileniyor\n"
 
 #: src/plugins/managesieve/managesieve.c:1162
 msgid "Auth method not available"
-msgstr "Kimlik denetimi mevcut değil"
+msgstr "Kimlik doğrulama mevcut değil"
 
 #: src/plugins/managesieve/managesieve.c:1179
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "Sieve oturumu hatası gönderiliyor: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "_Süz"
 
@@ -11563,7 +11415,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Sieve'yi aç"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
@@ -11599,43 +11451,47 @@ msgstr "Mevcut olduğundan STARTTLS kullan"
 msgid "Require STARTTLS"
 msgstr "STARTTLS kullan"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "Kimlik Doğrulama"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "Kimlik doğrulama yok"
 
 #: src/plugins/managesieve/sieve_prefs.c:204
 msgid "Use same authentication as for receiving mail"
-msgstr "Posta alımı için kullanılan kimlik denetimini kullan"
+msgstr "Posta alımı için kullanılan kimlik doğrulamayı kullan"
 
 #: src/plugins/managesieve/sieve_prefs.c:206
 msgid "Specify authentication"
-msgstr "Kimlik denetimini belirt"
+msgstr "Kimlik doğrulamayı belirleyin"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "Kullanıcı ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "Parola"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -11935,7 +11791,7 @@ msgid "Never"
 msgstr "Hiç bir zaman"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "Her zaman"
 
@@ -12085,7 +11941,7 @@ msgstr "Trayicon kullan"
 
 #: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
-msgstr "Başlangıçta sakla"
+msgstr "Açılışta sakla"
 
 #: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
@@ -12516,7 +12372,7 @@ msgstr "Temel işlemler"
 
 #: src/plugins/pgpcore/prefs_gpg.c:142
 msgid "Automatically check signatures"
-msgstr "İmzaları kendilipinden denetle"
+msgstr "İmzaları kendiliğinden denetle"
 
 #: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Use keyring for address autocompletion"
@@ -12539,9 +12395,9 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 "'0' olarak ayarlamak parolanın oturum boyunca hafıza tutulmasını sağlar"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "dakikada"
 
@@ -12551,7 +12407,7 @@ msgstr "Parolayı yazarken girdiyi yakala"
 
 #: src/plugins/pgpcore/prefs_gpg.c:199
 msgid "Display warning on start-up if GnuPG doesn't work"
-msgstr "GnuPG çalışmıyorsa başlangıçta uyarı göster"
+msgstr "GnuPG çalışmıyorsa açılışta uyarı göster"
 
 #: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
@@ -12751,107 +12607,107 @@ msgstr "\"%s\" hesabından kötü imza"
 msgid "The signature has not been checked"
 msgstr "İmza denetlendi"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "İmza denetleme hatası: durum bilgisi yok\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "İmza denetleme hatası: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "%s ile yapılan, %s kullanılarak, imza %s anahtar ID'sini kullanıyor\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "\"%s\" uid'den iyi imza (Geçerlilik: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "\"%s\" uid'li anahtar geçerliliğini yitirmiş\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "\"%s\" uid'den geçerliliğini yitirmiş imza (Geçerlilik: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "\"%s\" uid'li anahtar iptal edilmiş\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "\"%s\" hesabından KÖTÜ imza\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "                    uid \"%s\" (Geçerlilik: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "İptal edilmiş"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Sahibinin Güvenirliliği: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "Anahtar yok!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "UYARI: İmzalayanın \"%s\" adresi DNS girdisiyle eşleşmiyor\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "İmzalayanın doğrulanan adresi: \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "İletiden veri alınamadı, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Veri başlatılamadı, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "Gizli anahtar tanımlaması muğlak"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Gizli anahtar bulunamadı (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Gizli anahtar atama hatası: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "'%s' gpgme protokolü kullanılamaz: '%s' motoru düzgün kurulmamış."
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12860,12 +12716,12 @@ msgstr ""
 "'%s' gpgme protokolü kullanılamaz: '%s' motorunun %s sürümü kurulu; fakat %s "
 "sürümü gerekli.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "'%s' gpgme protokolü kullanılamaz (bilinmeyen sorun)"
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12873,7 +12729,7 @@ msgstr ""
 "GnuPG düzgün kurulmamış ya da yükseltilmeli.\n"
 "OpenPGP desteği kapatıldı."
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12881,11 +12737,11 @@ msgstr ""
 "Bir anahtar çifti üretmeden önce hesabın bilgilerini \"OK\" ile kaydetmeniz "
 "gerek\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "PGP anahtarı bulunmadı"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -12895,12 +12751,12 @@ msgstr ""
 "imzalayamayacak ya da şifrelenmiş e-posta alamayacaksınız.\n"
 "Yeni bir anahtar çifti üretmek istiyor musunuz?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Yeni bir anahtar çifti üretilemedi: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12908,11 +12764,11 @@ msgstr ""
 "Yeni anahtar çiftiniz üretiliyor... Entropiyi üretimine yardımcı olması için "
 "fareyi hareket ettirin..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Yeni bir anahtar çifti üretilemedi: bilinmeyen hata"
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12925,15 +12781,15 @@ msgstr ""
 "\n"
 "Anahtarı anahtar sunucusuna yüklemek istiyor musunuz?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "Anahtar üretildi"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "Anahtar yüklendi."
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "Anahtar yüklenemedi"
 
@@ -13139,12 +12995,12 @@ msgid "Show Python console..."
 msgstr "Python uçbirimini göster..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "Gözat"
@@ -13260,27 +13116,27 @@ msgstr ""
 "Eski feeds.xml dosyasının içeriği okunamadı:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 "RSSyl: Besleme dışa aktarım listesine '%s' yazılırken hata meydana geldi.\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: Eski '%s' OPML dosyası silinemedi: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr "RSSyl: Besleme listesi dışa aktarımı için '%s' dosyası açılamadı: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: Besleme dışa aktarım listesi yazılırken hata meydana geldi.\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13293,7 +13149,7 @@ msgstr ""
 "\n"
 "'%s' dosya adına izin verilmiyor."
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13307,136 +13163,136 @@ msgstr ""
 "Her haber beslemesi web'den alınan uygun girdilerle bir dizin "
 "oluşturacaktır. Bu beslemeleri okuyabilir, silebilir ya da saklayabilirsiniz."
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "RSS beslemesi"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(boş)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "Tüm beslemeleri tazele"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "Beslemeye abone ol"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Abone olmak istediğiniz haber beslemesinin URL'sini girin:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' dizin isminde kullanılamaz."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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] "Beslemeyi güncellemek için Claws Mail'in ağa erişebilmesi gerek."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "'%s' besleme ağacını kaldırılsın mı?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "Besleme ağacını kaldır"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "OPML dosyası seç"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: Yeni beslemeye abone olunuyor: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: Yeni beslemeye abone olundu: '%s' (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: Besleme güncelleniyor: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: Besleme güncellemesi bitirildi: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: '%s' konumundaki besleme alınırken hata: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: '%s' konumunda geçerli bir besleme bulunamadı\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: '%s' konumundaki besleme işlenemedi\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: Uygulama kapatılıyor, '%s' konumundaki besleme güncellenemedi\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "HTTP Basic kimlik doğrulama"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "Kullanıcı tanımlı yenileme sıklığı"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "Eski ögeleri tut"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "_Kısalt"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "Beslemeyi güncelle, kaynak beslemede bulunmayan ögeler siliniyor"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "Mümkünse yorumlar al"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "Her zaman yeni olarak işaretle"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "Metni değiştiyse yeni olarak işaretle"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "Asla yeni olarak işaretleme"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "Öge başlığını iletinin başına koy"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "Başlığın yeniden isimlendirilmesini önemseme"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13444,94 +13300,94 @@ msgstr ""
 "Besleme yazarı beslemenin başlığını değiştirse bile mevcut dizin adını "
 "korumak için bunu seç."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "TLS sertifika geçerliliğini doğrula"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "Kullanıcı adı"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "Kaynak URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "Şu tarihten daha yeni tarihli iletilerdeki yorumları al"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "gün"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "Bütün yorumları almak için -1 yazın"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "Bir öğe değiştiyse"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "Ögeler"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "Yenileme sıklığı"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Bu besleme için kendiliğinden yenilemeyi iptal etmek için 0 yazın"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "Besleme özelliklerini ata"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "Beslemeyi _tazele"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "Besleme öz_ellikleri"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "A_dını değiştir..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "Alt dizinleri t_azele"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "_Yeni beslemeye abone ol..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "Yeni _dizin oluştur..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "Besleme listesini içe aktar..."
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "Ağacı kaldır"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "RSS dizin ağacı ekle"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "Yeni RSS dizin ağacı için isim girin."
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13541,56 +13397,56 @@ msgstr ""
 "Bazı dosyalar zaten mevcut olabilir ya da yazmak için yeterli izine sahip "
 "değilsiniz?"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "Beslemelerim"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "Çerez dosyasını seç"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "Öntanımlı yenileme sıklığı"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "Uygulama başlarken tüm beslemeleri yenile"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
+msgstr "Açılışta tüm beslemeleri yenile"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "Yeni beslemelerin TLS sertifika geçerliliklerini doğrula"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Çerez dosyası yolu"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "Çerezlerinizi barındıran Netscape sitilindeki çerez.txt dosya yolu"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "Yenileniyor"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "Güvenlik ve gizlilik"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "'%s' yeni beslemesi için dizin oluşturulamadı."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "Yeni beslemeye abone ol?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Besleme dizini"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
@@ -13598,35 +13454,35 @@ msgstr ""
 "Resmî ismini kullanmak yerine, besleme için farklı bir dizin adı "
 "girebilirsiniz."
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "_Abone olduktan sonra besleme özelliklerini düzenle"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "'%s' beslemenin yorumları güncelleniyor..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (Yetki gerekiyor)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (Yasaklı)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (Bulunmadı)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "Hata %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13640,7 +13496,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13649,21 +13505,21 @@ msgstr ""
 "Geçerli besleme bulunamadı\n"
 "<b>%s</b>"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "Başlıksız besleme"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: '%s' konumunda başlığı olmayan geçersiz bir besleme.\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "'%s' beslemesi güncelleniyor..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13676,11 +13532,11 @@ msgstr ""
 "\n"
 "Lütfen geliştiricilere bildirin, bunun olmaması gerekiyordu."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Beslemeyi güncellemek için Claws Mail'in ağa erişebilmesi lazım."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13783,41 +13639,45 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "İstenmeyen ileti raporlama"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "Açık"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "Yönlendir:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "Kullanıcı adı:"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Şifre:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin eklentisi spamd'ye bağlanamadı.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin eklentisi süzme yapamadı.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin eklentisi seçeneklerden kapatılmış durumda.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: ileti süzülüyor..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -13827,22 +13687,22 @@ msgstr ""
 "ulaşılamayan smapd daemon'u. smapd'nin çalıştığından ve ulaşılabilir "
 "olduğundan emin olun."
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
 msgstr ""
 "Bu postayı uzak sunucuya göndermek için Claws Mail'in ağa erişebilmesi gerek."
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "Kullanıcı adı alınamadı"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin eklentisi yüklenmiş fakat seçeneklerden kapatılmış.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14308,63 +14168,68 @@ msgstr "Katılımcılar:"
 msgid "Action:"
 msgstr "Eylem:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "_Yeni toplantı..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "Takvimi _dışa aktar..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "Webcal'e _abone ol..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "_Yeniden adlandır..."
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "Aboneliği gü_ncelle"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "_Liste görünümü"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "_Hafta görünümü"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "_Ay görünümü"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "Toplantılar"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[özet yok]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "geçmişte"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "bugün"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "yarın"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "bu hafta"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "daha sonra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14374,21 +14239,21 @@ msgstr ""
 "Planlanan etkinlikler %s:\n"
 "\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Zaman aşımı (%d saniye) %s sunucusuna bağlanırken\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (Yetkisiz)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "Hata %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14401,7 +14266,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14412,111 +14277,111 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "%s dizini oluşturulamadı"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 "Webcal beslemesini güncellemek için Claws Mail'in ağa erişebilmesi lazım."
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "%s için takvim alınıyor..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "yeni abonelik"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Aboneliği güncellemek için Claws Mail'in ağa erişebilmesi lazım."
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "Webcal'e  Abone Ol"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "WebCal URL'sini Gir"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "URL ayrıştırılamadı."
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "Abonelikten çıkmak istiyor musunuz?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "Aboneliği sil"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "kabul edildi"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "kesinleştirmeden kabul edildi"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "reddedildi"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "cevaplanmadı"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "bireysel"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "grup"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "kaynak"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "oda"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "Geçmiş"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "Bugün"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "Yarın"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "Bu hafta"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "Daha sonra"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "Kabul edildi: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "Reddedildi: "
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "Kesinleştirilmeden Kabul Edildi: "
 
@@ -14921,95 +14786,95 @@ msgstr "Zaman etiketi yazım hatası\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Zaman etiketi yazım hatası (ASCII değil)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "POP protokol hatası\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "geçersiz UIDL cevabı: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: %d eski iletisi siliniyor [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: %d iletisi atlanıyor [%s] (%d bayt)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "posta kutusu kilitli\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "oturum zaman aşımına uğradı\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "komut desteklenmiyor\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "POP oturumunda hata oluştu\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "TOP komutu desteklenmiyor\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Haberler (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Yerel mbox dosyası"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Hiç biri (sadece SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "Hesabın adı"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Kendiliğinden ayarla"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15017,81 +14882,81 @@ msgstr ""
 "Uyarı: Claws Mail'in bu sürümü\n"
 "IMAP ve Haberler desteği olmadan derlenmiş."
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "Bu sunucu kimlik doğrulaması istiyor"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
-msgstr "Bağlanırken kimlik denetimi yap"
+msgstr "Bağlanırken kimlik doğrulaması yap"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "Haberler sunucusu"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "Alımın yapılacağı sunucu"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "Yerel posta kutusu"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "SMTP sunucu (gönder)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "SMTP sunucu yerine mail komutunu kullan"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "postaları gönderecek komut"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "Yerel"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "Öntanımlı Gelen Kutusu"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Süzülmemiş iletiler bu dizinde tutulacak"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
-msgstr "POP bağlantısından önce kimlik denetimi yap"
+msgstr "POP bağlantısından önce kimlik doğrulaması yap"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "Seç"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "Sonra sil"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 gün ve 0 saat : derhal sil"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15099,94 +14964,98 @@ msgstr ""
 "Bu boyutun üstündeki iletiler tamamen indirilmeyecek. Seçtiğiniz zaman "
 "tamamen indirebilecek ya da silebileceksiniz."
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "Azamî indirilecek yazı sayısı"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "0 girildiyse sonsuz"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(genellikle boş)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "Sadece abone olunan dizinleri göster"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Verimli ağ kullanımı yöntemi (etiketlerin alınmasını önler)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Bu yöntem daha az ağ verisi kullanır; fakat bazı sunucularla yavaş "
 "çalışabilir."
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "Küme büyüklüğü"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Otomatik denetle"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "Genel ayarları kullan"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Yeni iletileri denetle"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken süz"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "İletileri alırken eklenti kullanarak süzmeye izin ver"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'E-Posta Al' bu hesap için yeni iletileri denetler"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Üstbilgi"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "İleti-ID Oluştur"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "İleti-ID içinde hesap posta adresini gönder"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "Uygulama adı üstbilgisini ekle"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı üstbilgi ekle"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Doğrulama (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15194,217 +15063,217 @@ msgstr ""
 "Eğer bu girdileri boş bırakırsanız, posta alımı ile aynı kullanıcı ID ve "
 "parolası kullanılır."
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
-msgstr "Göndermeden önce POP ile kimlik denetimi yap"
+msgstr "Göndermeden önce POP ile kimlik doğrulaması yap"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "POP kimlik doğrulaması zaman aşımı"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "Yetkilendirme"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "OAuth2 E-posta Servis Sunucusu Seç"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "İstemci ID"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "İstemci gizli değeri"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "Yetkilendirme kodunu al"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "İsteği öntanımlı tarayıcı ile aç"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "Bağlantıyı Kopyala"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "Yetkilendirme kodu"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr "Tarayıcıdaki URL'yi ya da sağlanan kimlik doğrulama bilgisini yapıştır"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "Yetkilendirmeyi tamamla"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "Yetkilendir"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "İmza"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "İmzayı kendiliğinden ekle"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "İmza ayracı"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri kendiliğinden ata"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "İmlâ denetim sözlükleri"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Öntanımlı sözlük"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Öntanımlı diğer sözlük"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Yaz"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "Öntanımlı gizlilik sistemi"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "İletileri her zaman imzala"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "İletileri her zaman şifrele"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "İmzalı bir iletiyi yanıtlarken iletileri her zaman imzala"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Şifrelenmiş bir iletiyi yanıtlarken iletileri her zaman şifrele"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Gönderilen iletileri alıcının anahtarının yanı sıra kendi anahtarınızla "
 "şifreleyin"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "Şifrelenmiş iletileri metin dosyası olarak kaydet"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "TLS kullanma"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Şifreli oturumuna başlamak için STARTTLS komutunu kullan"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "TLS kullanma (fakat, gerekliyse, STARTTLS kullan)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "İstemci sertifikaları"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "Alım için sertifika"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "PKCS12 ya da PEM olarak istemci sertifikası"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "Gönderim için sertifika"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "Geçerli TLS sertifikaları doğrudan kabul et"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "Bloklanmamış TLS Kullan"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "TLS bağlantı sorunlarınız varsa bunu kapatın"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Öntanımlı proxy ayarını kullan"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "Genel vekil sunucu (proxy) ayarlarını kullan"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Kimlik doğrulaması kullan"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "Göndermek için vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15412,27 +15281,27 @@ msgstr ""
 "Seçilmediğinde ayarlanan vekil sunucu (proxy) es geçilip iletiler tercih "
 "edilen giden sunucu aracılığıyla gönderilecektir."
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "SMTP portu"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "POP portu"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "IMAP portu"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "NNTP portu"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "Alan adı"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15440,176 +15309,178 @@ msgstr ""
 "Alan adı, oluşturulan İleti-ID'sinde ve SMTP sunuculara bağlanırken "
 "kullanılacak."
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "Sunucuyla iletişim kurmak için komut kullan"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mükerrer iletileri okundu olarak ve renkle işaretle:"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri buraya koy"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "Kuyruktaki iletileri buraya koy"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "Taslak iletilerini buraya koy"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "Silinen iletileri buraya koy"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "Posta adresi girilmemiş."
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "Kullanıcı ID girilmemiş."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "POP sunucu girilmemiş."
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "Öntanımlı Gelen Kutusu yok."
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "IMAP sunucu girilmemiş."
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "yerel posta kutusunun adı girilmemiş."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "mail komutu girilmemiş"
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "Kullanıcı ID'si yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "Şifre yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP kullanıcı ID'si yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP şifresi yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "alan aldı belirtilmedi."
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "gönderilen dizini seçilmedi."
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "kuyruk dizini seçilmedi."
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "taslak dizini seçilmedi."
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "çöp dizini seçilmedi."
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
-msgstr "Al"
+msgstr "Alma"
 
-#: src/prefs_account.c:4134
-#, fuzzy
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
-msgstr "Gönder"
+msgstr "Gönderme"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "Vekil (Proxy)"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Hesap tercihleri"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Başarısız oldu (yanlış adres)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "İmza dosyasını seç"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Sertifika dosyasını seç"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "Protokol"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (eklenti yüklü değil)"
 
-#: src/prefs_account.c:6138
-#, fuzzy
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
-msgstr "Yetkilendirme kodu"
+msgstr "Yetkilendirme tamamlandı"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "OAuth2 yetkilendirme kodunuz Claws Mail tarafından alındı"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "Yetkilendirme TAMAMLANMADI"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "OAuth2 yetkilendirme kodunuz Claws Mail tarafından alındımadı"
 
@@ -15671,7 +15542,7 @@ msgstr "Seçilen eylemi aşağı taşı"
 
 #: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
 msgid "_Bottom"
-msgstr "En alt"
+msgstr "En _alt"
 
 #: src/prefs_actions.c:417
 msgid "Move the selected action to the bottom"
@@ -15844,7 +15715,7 @@ msgstr "{} arasındaki süzme eylemlerini seçilen iletilere uygula"
 msgid "for a literal %"
 msgstr "lafzî bir % için"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "Eylemler"
 
@@ -15944,11 +15815,11 @@ msgstr "Geri alma sayısı"
 
 #: src/prefs_compose_writing.c:194
 msgid "Warn when inserting a file larger than"
-msgstr "şu boyuttan büyük dosya eklerken uyar"
+msgstr "İleti gövdesine eklenen dosya"
 
 #: src/prefs_compose_writing.c:205
 msgid "KiB into message body"
-msgstr "KiB ileti gövdesine"
+msgstr "KiB'den büyükse uyar"
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -16006,7 +15877,7 @@ msgstr "Üstbilgi adı atanmadı."
 
 #: src/prefs_customheader.c:504
 msgid "A colon (:) is not allowed in a custom header."
-msgstr "Üst üste iki nokta (:) üstbilgide kullanılamaz"
+msgstr "İki nokta üst üste (:) üstbilgide kullanılamaz"
 
 #: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
@@ -16151,7 +16022,7 @@ msgstr "Sakla"
 msgid "Message flags"
 msgstr "İleti bayrakları"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "İşaretle"
@@ -16177,7 +16048,7 @@ msgstr "Zararsız olarak işaretle"
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "Renk etiketi"
 
@@ -16192,7 +16063,7 @@ msgstr "Yeniden yönlendir"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "Önem"
@@ -16462,8 +16333,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Gösterilmeyen sütunlar"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Gösterilen sütunlar"
 
@@ -16528,7 +16399,7 @@ msgstr "Dizin için renk seç"
 
 #: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
-msgstr "Başlangıçta İşleme kurallarını çalıştır"
+msgstr "Açılışta İşleme kurallarını çalıştır"
 
 #: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
@@ -16667,7 +16538,7 @@ msgstr "Yazdırırken farklı bir font kullan"
 msgid "Message Printing"
 msgstr "İleti Yazdırma"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Görünüm"
@@ -16921,11 +16792,11 @@ msgstr "gövde bölümü"
 msgid "whole message"
 msgstr "tüm ileti"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "İşaretlenmiş"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "Silinmiş"
 
@@ -16933,20 +16804,20 @@ msgstr "Silinmiş"
 msgid "Replied"
 msgstr "Cevaplanmış"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "Yönlendirilmiş"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "İstenmeyen"
 
 #: src/prefs_matcher.c:408
 msgid "Has attachment"
-msgstr "Eklentisi olan"
+msgstr "Eki olan"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "İmzalanmış"
 
@@ -17281,7 +17152,7 @@ msgstr "benek"
 
 #: src/prefs_message.c:199
 msgid "Scroll"
-msgstr "Kaydır"
+msgstr "Kaydırma"
 
 #: src/prefs_message.c:201
 msgid "Half page"
@@ -17297,7 +17168,7 @@ msgstr "Adım"
 
 #: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
-msgstr "Eklenti tanımlarını göster (isimlerden ziyâde)"
+msgstr "Ekin tanımlarını göster (isimlerden ziyâde)"
 
 #: src/prefs_message.c:236
 msgid "Quotation"
@@ -17350,7 +17221,7 @@ msgstr "İleti metninin renklendirilmesine izin ver"
 
 #: src/prefs_msg_colors.c:160
 msgid "Quote"
-msgstr "Alıntıla"
+msgstr "Alıntılama"
 
 #: src/prefs_msg_colors.c:172
 msgid "Cycle quote colors"
@@ -17447,7 +17318,7 @@ msgstr "Silinen satırlar için renk seç"
 
 #: src/prefs_msg_colors.c:333
 msgid "Removed lines"
-msgstr "Silinen Satırlar"
+msgstr "Silinen satırlar"
 
 #: src/prefs_msg_colors.c:342
 msgctxt "Tooltip and Dialog title"
@@ -17459,7 +17330,7 @@ msgstr "Farklı satırlar için renk seç"
 msgid "Hunk lines"
 msgstr "Farklı satırlar"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "Dizin listesi"
 
@@ -17666,15 +17537,15 @@ msgstr "Posta almak için haricî uygulama kullan"
 
 #: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
-msgstr "Başlangıçta yeni iletileri denetle"
+msgstr "Açılışta yeni iletileri denetle"
 
 #: src/prefs_receive.c:218
 msgid "Dialogs"
-msgstr "Pencereler"
+msgstr "İletişim pencereleri"
 
 #: src/prefs_receive.c:220
 msgid "Show receive dialog"
-msgstr "Alma penceresini göster"
+msgstr "İletişim penceresini göster"
 
 #: src/prefs_receive.c:230
 msgid "Only on manual receiving"
@@ -17682,11 +17553,11 @@ msgstr "Yalnızca kullanıcı kendi elle aldığında"
 
 #: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
-msgstr "İşlemler tamamlandığında alma penceresini kapat"
+msgstr "İşlemler tamamlandığında pencereyi kapat"
 
 #: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
-msgstr "ileti alma sırasında bir hata oluşursa ek pencerede gösterme"
+msgstr "İleti alma sırasında bir hata oluşursa ek pencerede gösterme"
 
 #: src/prefs_receive.c:247
 msgid "After receiving new mail"
@@ -17694,7 +17565,7 @@ msgstr "Yeni ileti aldıktan sonra"
 
 #: src/prefs_receive.c:249
 msgid "Go to Inbox"
-msgstr "Gelen Kutusuna Git"
+msgstr "Gelen Kutusuna git"
 
 #: src/prefs_receive.c:251
 msgid "Update all local folders"
@@ -17743,11 +17614,11 @@ msgstr "Başlık boş bırakılmışsa uyar"
 
 #: src/prefs_send.c:209
 msgid "Warn when sending to more recipients than"
-msgstr "Belirtilenden fazla alıcıya gönderirken uyar"
+msgstr "Bundan fazla alıcıya gönderirken uyar"
 
 #: src/prefs_send.c:225
 msgid "Outgoing encoding"
-msgstr "Giden Kodlaması"
+msgstr "Giden kodlaması"
 
 #: src/prefs_send.c:248
 msgid ""
@@ -17943,112 +17814,116 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "İmlâ denetimi"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "kısaltılmış hafta adı"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "tam hafta adı"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "kısaltılmış ay adı"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "tam ay adı"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "kullanılan yerel ayar için tercih edilen tarih ve zaman"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "yüzyıl numarası (yıl/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "ondalık sayı olarak ayın günü"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saat formatında ondalık sayı olarak saat"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saat formatında ondalık sayı olarak saat"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "ondalık sayı olarak yılın günü"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "ondalık sayı olarak ay"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "ondalık sayı olarak dakika"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "ÖÖ ya da ÖS"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "ondalık sayı olarak saniye"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "ondalık sayı olarak haftanın günü"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "kullanılan yerel ayar için tercih edilen yerel saat"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "yılın son iki hanesi"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "ondalık sayı olarak yıl"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "zaman dilimi, adı ya da kısaltılmış adı"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "Tarih biçimi"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "İşaret"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "Örnek"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "Dizin adının yanında ileti sayısını göster"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "Okunmamış iletiler"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "Okunmamış ve Toplam iletiler"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
-msgstr "Başlangıçta son açılan dizini aç"
+msgstr "Açılışta son açılan dizini aç"
+
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "Açılışta seçilen dizini aç"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
@@ -18056,99 +17931,99 @@ msgstr ""
 "Dizindeki tüm iletileri okundu ya da okunmadı olarak işaretlemeden önce "
 "işleme kuralını çalıştır"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Bundan uzun haber grubu isimlerini kısalt"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "harf"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "İleti listesi"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "Sütun başlıklarını sabitle"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "Gönderen sütununda gösterilen"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "Ad ve Adres"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "Tarih biçimi için yardım"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "Dizine girildiğinde ileti seçimini ata"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "Seçilince iletiyi aç"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "Dizine girerken ki seçim"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "Arama sonuçları gösterilirken"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr "Kısa yolları kullanarak önceki ya da sonraki ileti gösterilirken"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "İletileri silerken ya da taşırken"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "Yönlendirme tuşları kullanılırken"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "Okunmuş olarak işaretle"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "Seçildikten sonra"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "sadece yeni bir pencerede açılınca ya da cevaplanınca"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "\"okunmamış (ya da yeni) ileti yok\" iletisini göster"
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "'Evet'"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "'Hayır'"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "Adres defterini kullanarak göndereni göster"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "Standart üstbilgilerin yanı sıra başlık üstbilgisini de kullansın"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "İletileri silerken ve taşırken hemen çalıştır"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18156,55 +18031,55 @@ msgstr ""
 "'Araçlar/Çalıştır' seçeneğini seçene kadar iletilerin taşınması, "
 "kopyalanması ve silinmesini ötele"
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr "Tüm iletileri okundu ya da okunmadı olarak işaretlerken onayla"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "Renk etiketlerini değiştirmeyi onayla"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "Araç ipuçlarını göster"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Öntanımlı ayarlar"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "Yeni dizinler"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "Sıralama ölçütü"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Adet"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "Zincirleme konu tarihi"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "Tasnif etme"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "Zincirleme konuyu göster"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "Zincirleme konuları küçült"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "Okunmuş iletileri gizle"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "Özet bilgiler"
 
@@ -18378,7 +18253,7 @@ msgstr "Mevcut şablonlar"
 msgid "Template"
 msgstr "Şablon"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "Öntanımlı tema"
 
@@ -18386,21 +18261,16 @@ msgstr "Öntanımlı tema"
 msgid "Themes"
 msgstr "Temalar"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "Sistemin '%s' temasını kaldır"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "'%s' temasını kaldır"
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "Gerçekten bu temayı kaldırmak istiyor musunuz?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18409,24 +18279,24 @@ msgstr ""
 "%s dosyasında sorun oldu\n"
 "tema silinirken"
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "Tema dizini silinemedi."
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "Tema kaldırıldı"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "Tema dizini seç"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "'%s' temasını yükle"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18434,15 +18304,11 @@ msgstr ""
 "Bu dizin bir tema dizini gibi görünmüyor.\n"
 "Yine de yükle?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "Temanın tüm kullanıcılar için kurulmasını istiyor musunuz?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "Tema mevcut"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18454,25 +18320,25 @@ msgstr ""
 "\n"
 "Değiştirmek istiyor musunuz?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "'%s' dizinindeki eski tema kaldırılamadı."
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "%s hedef dizini oluşturulamadı."
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "Tema başarıyla yüklendi."
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "Tema yüklenemedi"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18481,78 +18347,78 @@ msgstr ""
 "%s dosyası tema\n"
 "yüklerken başarısız oldu."
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "Tema simgelerinin hepsini göster"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d adet tema mevcut (%d kullanıcı, %d sistem, 1 öntanımlı)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Öntanımlı tema %d adet simgeye sahip"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "Bu tema için bilgi içeren bir dosya yok"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "Hata: tema durumu alınamadı"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d adet dosya (%d simge), boyutu: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "Seçim"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "Yeni yükle..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "Daha fazlasını edin..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "Bilgi"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "Yazar"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "Önizleme"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "Hepsini göster"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "SVG yorumlama"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
-msgstr "Alfa kanalı aç"
+msgstr "Alfa kanalını aç"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "Ölçeklendirmeyi zorla"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "İnç başına piksel (PPI)"
 
@@ -18701,7 +18567,7 @@ msgstr "Alıcı anahtarı tanımlanmadı."
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64 çözümünde hata]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "İletinin bir parçası çözülemedi"
 
@@ -19105,7 +18971,7 @@ msgstr "HELO gönderiliyor..."
 
 #: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
-msgstr "Kimlik denetimi"
+msgstr "Kimlik doğrulanıyor"
 
 #: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
@@ -19153,22 +19019,6 @@ msgstr ""
 "İleti gönderilirken hata oluştu:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "Posta kutusu ayarları"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"Önce, posta kutusunun konumunu atamalısınız.\n"
-"Eğer varsa, MH türündeki mevcut posta \n"
-"kutusunu kullanabilirsiniz.\n"
-"Emin değilseniz, TAMAM'ı seçin."
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "İletinin kaynağı"
@@ -19443,61 +19293,61 @@ msgstr "Gönderen: %s, %s"
 msgid "To: %s, on %s"
 msgstr "Alıcı: %s, %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "Makalenin yazarı siz değilsiniz."
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "Seçilen %d adet iletiyi gerçekten silmek istiyor musunuz?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "İletiyi  Sil"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin bulunulan dizinle aynı."
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Seçilen iletilerin taşınacağı dizini seçin"
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "Kopyalama için seçilen hedef dizin bulunulan dizinle aynı."
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Seçilen iletilerin kopyalanacağı dizini seçin"
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "İçeriği Güncelle ya da Üzerine Yaz"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "Var olan dosyanın üzerine mi yazılsın yoksa içeriği mi güncellensin?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "İçeriği _güncelle"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "Ü_zerine yaz"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "'%s' dosyası kaydedilemedi."
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
@@ -19505,27 +19355,27 @@ msgstr ""
 "%d adet iletiyi birer birer yazdırmak üzeresiniz. Devam etmek istiyor "
 "musunuz?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "Zincirleme konular oluşturuluyor..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "Bu kuralları geç"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Ait olduğu hesaptan bağımsız olarak bu kuralları uygula"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "Mevcut hesaba uygunsa bu kuralları uygula"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "Filtreleme"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19533,74 +19383,74 @@ msgstr ""
 "Bir hesaba ait bazı süzme kuralları mevcut.\n"
 "Lütfen bu kurallarla ne yapmak istediğinizi seçin:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "Süzülüyor..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "Ayarlar işleniyor"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Seçilen tüm iletilerin renk etiketlerini öntanımlı değerlere getirmeyi "
 "istiyor musunuz?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Bu renk etiketinin seçilen tüm iletilere uygulanmasını istiyor musunuz?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Renk etiketini sıfırla"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Renk etiketini ata"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "Dikkate alınmayan zincirleme konu"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "Takip edilen zincirleme konu"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Cevaplandı ve yönlendirildi - cevabı görmek için tıklayın"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "Cevaplandı - cevabı görmek için tıklayın"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "Taşınacak"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "Kopyalanacak"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
-msgstr "İmzalanmış, eklentisi olan"
+msgstr "İmzalanmış, ek(ler)i olan"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
-msgstr "Şifrelenmiş, eklentisi olan"
+msgstr "Şifrelenmiş, ek(ler)i olan"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "Şifrelenmiş"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
-msgstr "Eklentisi olan"
+msgstr "Ek(ler)i olan"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19609,11 +19459,11 @@ msgstr ""
 "Düzenli ifade (regexp) hatası:\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Dizin listesine geri dön (Okunmamış iletileriniz var)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "Dizin listesine geri dön"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 963877fc4..32391e2a4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,20 +1,20 @@
 # Copyright (C) YEAR The Claws Mail Team
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the claws-mail package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: claws-mail 3.14.0git127\n"
+"Project-Id-Version: claws-mail 4.1.1git113\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-10-11 10:26+0100\n"
-"PO-Revision-Date: 2019-07-23 10:02+8\n"
+"POT-Creation-Date: 2023-11-14 16:26+0800\n"
+"PO-Revision-Date: 2023-11-14 16:59+8\n"
 "Last-Translator: Mark Chang <mark.cyj at gmail.com>\n"
 "Language-Team: Mark Chang <mark.cyj at gmail.com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=1;\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -49,8 +49,8 @@ msgstr "新增(_N)"
 msgid "Create a new account"
 msgstr "新增帳號(_n)"
 
-#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
-#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/account.c:789 src/addressbook.c:400 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/compose.c:616
 #: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
@@ -62,8 +62,8 @@ msgstr "新帳號選項"
 
 #: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
-#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
-#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/addressbook.c:1477 src/addressbook.c:1485 src/addressbook.c:2963
+#: src/addressbook.c:2991 src/addressbook.c:2998 src/editaddress.c:1325
 #: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
 #: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
 #: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
@@ -79,8 +79,8 @@ msgstr "刪除(_e)"
 msgid "Delete the selected account from the list"
 msgstr "從清單中刪除已選擇的動作"
 
-#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
-#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
+#: src/account.c:805 src/addressbook.c:427 src/addressbook.c:463
+#: src/addressbook.c:479 src/compose.c:645 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "複製"
@@ -121,26 +121,26 @@ msgstr "將選擇的動作上移"
 msgid " _Set as default account "
 msgstr " 設定為預設帳號 (_S)"
 
-#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
-#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
-#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
-#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
-#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
-#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/account.c:841 src/action.c:1406 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:421
+#: src/addressbook.c:1431 src/addressbook.c:3266 src/addressbook.c:3318
+#: src/addressbook.c:4187 src/addressbook.c:4192 src/addressbook.c:4308
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:637 src/edittags.c:591
 #: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:926 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:931 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
 #: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
 #: src/inc.c:844 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/mimeview.c:1860 src/mimeview.c:1877
+#: src/messageview.c:226 src/mimeview.c:1870 src/mimeview.c:1887
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:786
 #: src/plugins/pdf_viewer/poppler_viewer.c:1233
-#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
 #: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
 #: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
-#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "關閉"
@@ -154,53 +154,52 @@ msgstr "包含遠端資料夾的帳號無法被複製"
 msgid "Copy of %s"
 msgstr "複製 %s"
 
-#: src/account.c:1137
+#: src/account.c:1138
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你確認要刪除帳號 '%s' 嗎?"
 
-#: src/account.c:1139
+#: src/account.c:1140
 msgid "(Untitled)"
 msgstr "(無標題)"
 
-#: src/account.c:1140
+#: src/account.c:1141
 msgid "Delete account"
 msgstr "刪除帳號"
 
-#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/account.c:1142 src/addrcustomattr.c:162 src/addrcustomattr.c:188
 #: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
-#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
-#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
-#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
-#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10755
-#: src/compose.c:10760 src/compose.c:10834 src/compose.c:11734
-#: src/compose.c:12251 src/editaddress.c:172 src/editaddress.c:815
+#: src/addressadd.c:300 src/addressbook.c:1477 src/addressbook.c:1485
+#: src/addressbook.c:2963 src/addressbook.c:2976 src/addressbook.c:2990
+#: src/addressbook.c:2997 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3700 src/compose.c:3828 src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5210 src/compose.c:5253 src/compose.c:5817 src/compose.c:5876
+#: src/compose.c:6112 src/compose.c:9546 src/compose.c:10742
+#: src/compose.c:10747 src/compose.c:10821 src/compose.c:11714
+#: src/compose.c:12231 src/editaddress.c:172 src/editaddress.c:815
 #: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
 #: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
 #: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
 #: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
-#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
-#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
 #: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1193 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1244 src/imap_gtk.c:369
 #: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
 #: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
-#: src/importpine.c:249 src/inc.c:893 src/main.c:2286 src/mainwindow.c:4007
-#: src/mainwindow.c:4210 src/mbox.c:549 src/messageview.c:2080
-#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1844
-#: src/mimeview.c:2280 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
+#: src/importpine.c:249 src/inc.c:893 src/main.c:2285 src/mainwindow.c:4011
+#: src/mainwindow.c:4214 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1854
+#: src/mimeview.c:2294 src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:211
 #: src/plugins/archive/archiver_gtk.c:117
 #: src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
-#: src/plugins/archive/archiver_gtk.c:944
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
 #: src/plugins/att_remover/att_remover.c:387
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: src/plugins/keyword_warner/keyword_warner.c:196
 #: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
@@ -209,88 +208,88 @@ msgstr "刪除帳號"
 #: src/plugins/managesieve/sieve_manager.c:330
 #: src/plugins/notification/notification_foldercheck.c:588
 #: src/plugins/notification/notification_trayicon.c:550
-#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/rssyl/rssyl_cb_menu.c:361
-#: src/plugins/rssyl/rssyl_feed_props.c:481
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
 #: src/prefs_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:177
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:246
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
 #: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:323
 #: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
 #: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
-#: src/prefs_themes.c:600 src/send_message.c:300 src/ssl_manager.c:453
-#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
-#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
 #: src/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
-#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/account.c:1142 src/addrcustomattr.c:218 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/att_remover/att_remover.c:429
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/rssyl/rssyl_cb_menu.c:194
-#: src/plugins/vcalendar/vcal_folder.c:2030 src/prefs_actions.c:1105
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2028 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:698 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4561
 msgid "_Delete"
 msgstr "刪除"
 
-#: src/account.c:1615
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1621
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "「收信」將從選取的帳號下取回郵件"
 
-#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:127 src/compose.c:7492 src/editaddress.c:1478
 #: src/editaddress.c:1500 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:369
 #: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
 #: src/editgroup.c:286 src/editjpilot.c:255 src/editldap.c:426
 #: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
-#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1859
 #: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
-#: src/prefs_themes.c:1092
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:546 src/prefs_template.c:78
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr "名稱"
 
-#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
+#: src/account.c:1637 src/prefs_account.c:1299 src/prefs_account.c:5039
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "伺服器"
 
-#: src/action.c:380
+#: src/action.c:378
 #, c-format
 msgid "Could not get message file %d"
 msgstr "無法取得訊息檔案 %d"
 
-#: src/action.c:418
+#: src/action.c:416
 msgid "Could not get message part."
 msgstr "無法取得部份的訊息"
 
-#: src/action.c:435
+#: src/action.c:433
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr "無法取得多重郵件中的部份 %s"
 
-#: src/action.c:607
+#: src/action.c:605
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -298,11 +297,11 @@ msgid ""
 msgstr ""
 "無法在新信件視窗中執行您所選擇的操作,因為它包含了%%f, %%F, %%as or %%p。"
 
-#: src/action.c:728
+#: src/action.c:726
 msgid "There is no filtering action set"
 msgstr "沒有設定任何的過濾行為"
 
-#: src/action.c:730
+#: src/action.c:728
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -311,7 +310,7 @@ msgstr ""
 "無效的過濾動作設定:\n"
 "%s"
 
-#: src/action.c:1000
+#: src/action.c:998
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -322,44 +321,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9755 src/ldaputil.c:334
-#: src/plugins/bogofilter/bogofilter.c:858
+#: src/action.c:1000 src/compose.c:5286 src/compose.c:5291 src/compose.c:9704
+#: src/compose.c:9747 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1845
-#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
+#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1843
+#: src/plugins/vcalendar/vcal_folder.c:1846 src/privacy.c:64
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1221 src/action.c:1395
 msgid "Completed"
 msgstr "完成"
 
-#: src/action.c:1260
+#: src/action.c:1258
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 執行: %s\n"
 
-#: src/action.c:1264
+#: src/action.c:1262
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已結束: %s\n"
 
-#: src/action.c:1307
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr "輸出/入的動作"
 
-#: src/action.c:1371
+#: src/action.c:1369
 msgid "_Execute"
 msgstr "執行"
 
-#: src/action.c:1406
+#: src/action.c:1404
 msgid "_Stop"
 msgstr "停止"
 
-#: src/action.c:1648
+#: src/action.c:1646
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -370,11 +369,11 @@ msgstr ""
 "('%%h' 將以此命令覆蓋)\n"
 "  %s"
 
-#: src/action.c:1653
+#: src/action.c:1651
 msgid "Action's hidden user argument"
 msgstr "隱藏使用者命令的動作"
 
-#: src/action.c:1657
+#: src/action.c:1655
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -385,23 +384,23 @@ msgstr ""
 "('%%u' 將以此命令覆蓋)\n"
 "  %s"
 
-#: src/action.c:1662
+#: src/action.c:1660
 msgid "Action's user argument"
 msgstr "使用者命令的動作"
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "無法複製資料夾到當前位置"
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr "無法複製通訊錄到當前位置"
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "無法移動資料夾到當前位置"
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:699 src/addressbook.c:5017
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "群組"
@@ -472,40 +471,40 @@ msgid ""
 "with the default set?"
 msgstr "確認要以預設值覆蓋所有的屬性名稱嗎?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/exphtmldlg.c:181
 #: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
-#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
-#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1676 src/main.c:412
-#: src/mainwindow.c:2870 src/mainwindow.c:2875 src/message_search.c:335
-#: src/mimeview.c:1818 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:409
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
+#: src/mimeview.c:1828 src/plugins/libravatar/libravatar_prefs.c:175
 #: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3088
 msgid "_No"
 msgstr "_N否"
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: src/addrcustomattr.c:199 src/compose.c:9824 src/compose.c:12231
 #: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
-#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
-#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
-#: src/inc.c:1676 src/main.c:412 src/mainwindow.c:2870 src/mainwindow.c:2875
-#: src/message_search.c:335 src/mimeview.c:1819
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:409 src/mainwindow.c:2872 src/mainwindow.c:2877
+#: src/message_search.c:335 src/mimeview.c:1829
 #: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 src/plugins/vcalendar/vcalendar.c:123
 #: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
-#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
-#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
-#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
-#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
-#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
-#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1331 src/summaryview.c:1938 src/summaryview.c:1987
+#: src/summaryview.c:2025 src/summaryview.c:2074 src/summaryview.c:2109
+#: src/summaryview.c:2143 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3088
 msgid "_Yes"
 msgstr "是(_Y)"
 
@@ -544,31 +543,30 @@ msgstr "新增(_A)..."
 
 #: src/addrcustomattr.c:499 src/addressadd.c:301
 #: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
-#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/compose.c:5876 src/compose.c:9547 src/editaddress.c:172
 #: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
 #: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
 #: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
 #: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
 #: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
-#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2285
 #: src/password_gtk.c:213 src/plugins/archive/archiver_gtk.c:575
 #: src/plugins/archive/archiver_gtk.c:622
 #: src/plugins/archive/archiver_gtk.c:749
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1044
 #: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
 #: src/plugins/managesieve/sieve_editor.c:633
 #: src/plugins/notification/notification_foldercheck.c:589
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: src/prefs_customheader.c:178 src/prefs_display_header.c:247
 #: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
 #: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
-#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:324 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "確定(_O)"
@@ -596,7 +594,7 @@ msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr "Claws Mail將在通訊錄中搜尋重複的email"
 
-#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/addrduplicates.c:147 src/addressbook.c:1159 src/compose.c:672
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "尋找(_F)"
@@ -610,7 +608,7 @@ msgid "Duplicate email addresses"
 msgstr "重複的email"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:547
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "地址"
@@ -619,11 +617,11 @@ msgstr "地址"
 msgid "Address book path"
 msgstr "通訊錄路徑"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:791 src/addressbook.c:1429 src/addressbook.c:1483
 msgid "Delete address(es)"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:792 src/addressbook.c:1484
 msgid "Really delete the address(es)?"
 msgstr "確定要刪除地址嗎?"
 
@@ -631,7 +629,7 @@ msgstr "確定要刪除地址嗎?"
 msgid "Delete address"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:842 src/addressbook.c:1430
 msgid "This address data is read-only and cannot be deleted."
 msgstr "這個地址資訊是唯讀的,而且不能被刪除"
 
@@ -643,7 +641,7 @@ msgstr "加入通訊錄"
 msgid "Contact"
 msgstr "連絡人"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:129 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "備註"
@@ -652,7 +650,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3264 src/addressbook.c:3316
 msgid "Add address(es)"
 msgstr "新增連絡人地址"
 
@@ -660,50 +658,50 @@ msgstr "新增連絡人地址"
 msgid "Can't add the specified address"
 msgstr "無法新增指定的連絡人地址"
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:128 src/addressbook.c:5005 src/editaddress.c:1247
 #: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
 #: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr "Email 地址"
 
-#: src/addressbook.c:400
+#: src/addressbook.c:399
 msgid "_Book"
 msgstr "通訊錄(_B)"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/addressbook.c:401 src/compose.c:621 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Book"
 msgstr "新增通訊錄(_B)"
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Folder"
 msgstr "新增資料夾(_F)"
 
-#: src/addressbook.c:407
+#: src/addressbook.c:406
 msgid "New _vCard"
 msgstr "新增vCard(_v)"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:410
 msgid "New _JPilot"
 msgstr "新增JPilot(_J)"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New LDAP _Server"
 msgstr "新增 LDAP Server"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "_Edit book"
 msgstr "編輯通訊錄"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:418
 msgid "_Delete book"
 msgstr "刪除通訊錄"
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:420 src/compose.c:633 src/editaddress.c:1326
 #: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:435
@@ -711,189 +709,189 @@ msgstr "刪除通訊錄"
 msgid "_Save"
 msgstr "儲存"
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:424 src/addressbook.c:470 src/messageview.c:230
 msgid "_Select all"
 msgstr "全選"
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:426 src/addressbook.c:462 src/addressbook.c:478
 msgid "C_ut"
 msgstr "剪下"
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
-#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:646 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "貼上"
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:433 src/addressbook.c:475
 msgid "New _Address"
 msgstr "新連絡人"
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:434 src/addressbook.c:460 src/addressbook.c:476
 msgid "New _Group"
 msgstr "新群組"
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:436 src/addressbook.c:482
 msgid "_Mail To"
 msgstr "寄給"
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:437 src/addressbook.c:486
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: src/addressbook.c:442
+#: src/addressbook.c:441
 msgid "Import _LDIF file..."
 msgstr "匯入 _LDIF 檔案..."
 
-#: src/addressbook.c:443
+#: src/addressbook.c:442
 msgid "Import M_utt file..."
 msgstr "匯入 M_utt 檔案..."
 
-#: src/addressbook.c:444
+#: src/addressbook.c:443
 msgid "Import _Pine file..."
 msgstr "匯入 _Pine 檔案..."
 
-#: src/addressbook.c:446
+#: src/addressbook.c:445
 msgid "Export _HTML..."
 msgstr "匯出 _HTML 檔案..."
 
-#: src/addressbook.c:447
+#: src/addressbook.c:446
 msgid "Export LDI_F..."
 msgstr "匯出 LDI_F 檔案..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Find duplicates..."
 msgstr "尋找重複連絡人..."
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Edit custom attributes..."
 msgstr "編輯使用者屬性"
 
-#: src/addressbook.c:485
+#: src/addressbook.c:484
 msgid "_Browse Entry"
 msgstr "瀏覽(_B)"
 
-#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/addressbook.c:498 src/crash.c:460 src/crash.c:479 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:330
 #: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
-#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
-#: src/prefs_themes.c:949 src/prefs_themes.c:950
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr "未知"
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:505 src/addressbook.c:524 src/importldif.c:121
 msgid "Success"
 msgstr "成功"
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:506 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "錯誤的命令"
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:507 src/importldif.c:123
 msgid "File not specified"
 msgstr "未指定檔案"
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:508 src/importldif.c:124
 msgid "Error opening file"
 msgstr "檔案開啟失敗"
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:509 src/importldif.c:125
 msgid "Error reading file"
 msgstr "讀取檔案錯誤"
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:510 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "已達檔案結尾"
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:511 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "記憶體配置錯誤"
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:512 src/importldif.c:128
 msgid "Bad file format"
 msgstr "檔案格式錯誤"
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:513 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "檔案寫入錯誤"
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:514 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "目錄開啟錯誤"
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:515 src/importldif.c:131
 msgid "No path specified"
 msgstr "指定的路徑不存在"
 
-#: src/addressbook.c:526
+#: src/addressbook.c:525
 msgid "Error connecting to LDAP server"
 msgstr "連線至LDAP伺服器錯誤"
 
-#: src/addressbook.c:527
+#: src/addressbook.c:526
 msgid "Error initializing LDAP"
 msgstr "LDAP初始化錯誤"
 
-#: src/addressbook.c:528
+#: src/addressbook.c:527
 msgid "Error binding to LDAP server"
 msgstr "LDAP伺服器綁定錯誤"
 
-#: src/addressbook.c:529
+#: src/addressbook.c:528
 msgid "Error searching LDAP database"
 msgstr "搜尋LDAP資料庫錯誤"
 
-#: src/addressbook.c:530
+#: src/addressbook.c:529
 msgid "Timeout performing LDAP operation"
 msgstr "進行LDAP操作超時"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:530
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜尋標準錯誤"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:531
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP的搜尋標準進入點不存在"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:532
 msgid "LDAP search terminated on request"
 msgstr "LDAP搜尋被要求終止"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:533
 msgid "Error starting STARTTLS connection"
 msgstr "TLS連線起始失敗"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:534
 msgid "Distinguished Name (dn) is missing"
 msgstr "缺少識別名稱?"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:535
 msgid "Missing required information"
 msgstr "缺少要求的資訊"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:536
 msgid "Another contact exists with that key"
 msgstr "發現另一個連絡人存在相同的金鑰"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:537
 msgid "Strong(er) authentication required"
 msgstr "需要更強而有力的認證碼"
 
-#: src/addressbook.c:906
+#: src/addressbook.c:905
 msgid "Sources"
 msgstr "來源"
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/addressbook.c:909 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1102 src/editldap.c:777
 msgid "Search"
 msgstr "搜尋"
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1474
 msgid "Delete group"
 msgstr "刪除群組"
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1475
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -901,26 +899,26 @@ msgstr ""
 "確認要刪除群組嗎?\n"
 "所有的地址將遺失"
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is read-only."
 msgstr "無法貼上,此地址是唯讀的"
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr "無法貼在地址群組上"
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2959
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "確認要刪除%s內所有搜尋的結果和地址嗎?"
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2962 src/addressbook.c:2990 src/addressbook.c:2997
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
 #: src/toolbar.c:507
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2972
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -928,20 +926,20 @@ msgid ""
 msgstr ""
 "確認刪除%s嗎?如果只刪除資料夾,則裡面原有的地址都將被自動移至上層資料夾內"
 
-#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/addressbook.c:2975 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2976
 msgid "Delete _folder only"
 msgstr "只刪除資料夾(_f)"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr "刪除資料夾和地址(_a)"
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -950,7 +948,7 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址將不會遺失"
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -959,28 +957,28 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址都將遺失"
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr "尋找 %s"
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3247 src/addressbook.c:3297
 msgid "New Contacts"
 msgstr "新增連絡人"
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4136
 msgid "New user, could not save index file."
 msgstr "新連絡人無法儲存至索引檔中"
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4140
 msgid "New user, could not save address book files."
 msgstr "新連絡人無法儲存至通訊錄檔案"
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4150
 msgid "Old address book converted successfully."
 msgstr "舊通訊錄轉換成功"
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4155
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -988,7 +986,7 @@ msgstr ""
 "舊通訊錄已轉換,\n"
 "無法儲存新地址索引檔"
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -996,7 +994,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "但已建立新的空通訊錄檔案"
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4174
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -1004,7 +1002,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "無法儲存新的地址索引檔"
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4179
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1012,52 +1010,52 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "且無法建立新的通訊錄檔案"
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4186 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr "通訊錄轉換失敗"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr "通訊錄錯誤"
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr "無法讀取地址索引"
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4639
 msgid "Busy searching..."
 msgstr "正在搜尋..."
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4969 src/prefs_send.c:220
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4981
 msgid "Address Books"
 msgstr "通訊錄"
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4993
 msgid "Person"
 msgstr "人員"
 
-#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
+#: src/addressbook.c:5029 src/exporthtml.c:881 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3484 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5041
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5053 src/addressbook.c:5065
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5077
 msgid "LDAP servers"
 msgstr "LDAP伺服器"
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5089
 msgid "LDAP Query"
 msgstr "LDAP查詢"
 
@@ -1140,42 +1138,42 @@ msgstr "從選擇的郵件內收集郵件地址"
 msgid "Collect email addresses from folder"
 msgstr "從資料夾內收集郵件地址"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr "共用地址"
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr "個人地址"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr "共用地址"
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr "個人地址"
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr "地址更新"
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr "更新錯誤!所有的改變將不會被儲存"
 
-#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
+#: src/alertpanel.c:154 src/compose.c:9824 src/mimeview.c:1870
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12251 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/mimeview.c:1877 src/plugins/pgpcore/sgpgme.c:1000
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
+#: src/alertpanel.c:167 src/compose.c:5876 src/compose.c:6424
+#: src/compose.c:12231 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1887 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5817 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "錯誤"
@@ -1288,7 +1286,7 @@ msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/session.c:201 src/imap.c:1261
+#: src/common/session.c:201 src/imap.c:1313
 msgid "TLS handshake failed\n"
 msgstr "SSL/TLS 交握失敗\n"
 
@@ -1308,7 +1306,7 @@ msgstr "錯誤的SMTP回應\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP執行時期發生錯誤\n"
 
-#: src/common/smtp.c:583 src/pop.c:938
+#: src/common/smtp.c:583 src/pop.c:991
 msgid "error occurred on authentication\n"
 msgstr "認證發生錯誤\n"
 
@@ -1317,7 +1315,7 @@ msgstr "認證發生錯誤\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "訊息太多(最大的容許量是 %s)\n"
 
-#: src/common/smtp.c:665 src/pop.c:931
+#: src/common/smtp.c:665 src/pop.c:984
 msgid "couldn't start STARTTLS session\n"
 msgstr "無法執行STARTTLS\n"
 
@@ -1440,223 +1438,226 @@ msgid "%dB"
 msgstr "%dB"
 
 #: src/common/utils.c:185
+#, c-format
 msgid "%d.%02dKiB"
 msgstr "%d.%02dKB"
 
 #: src/common/utils.c:186
+#, c-format
 msgid "%d.%02dMiB"
 msgstr "%d.%02dMB"
 
 #: src/common/utils.c:187
+#, c-format
 msgid "%.2fGiB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4117
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "星期一"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "星期五"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4125
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "一月"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "二月"
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "三月"
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "四月"
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "六月"
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "七月"
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "八月"
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "九月"
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "十月"
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "十一月"
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "十二月"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4138
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "星期日"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "星期一"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "星期二"
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "星期三"
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "星期四"
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "星期五"
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "星期六"
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4146
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "一月"
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "二月"
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "三月"
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "四月"
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "六月"
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "七月"
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "八月"
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "九月"
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "十月"
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "十一月"
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "十二月"
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4168
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "上午"
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "下午"
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "上午"
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "下午"
@@ -1672,425 +1673,425 @@ msgstr ""
 "\n"
 "已取消簽證章及加密此信件"
 
-#: src/compose.c:604
+#: src/compose.c:605
 msgid "_Add..."
 msgstr "新增(_A)..."
 
-#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/compose.c:606 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
 #: src/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
 #: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
-#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:608 src/folderview.c:258
 msgid "_Properties..."
 msgstr "屬性(_P)"
 
-#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
+#: src/compose.c:615 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "_Spelling"
 msgstr "拼字(_S)"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:620 src/compose.c:687
 msgid "_Options"
 msgstr "選用(_O)"
 
-#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
+#: src/compose.c:622 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "協助(_H)"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "S_end"
 msgstr "傳送(_e)"
 
-#: src/compose.c:624
+#: src/compose.c:625
 msgid "Send _later"
 msgstr "稍後傳送(_l)"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Attach file"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "_Insert file"
 msgstr "插入檔案(_I)"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "Insert si_gnature"
 msgstr "插入簽名(_g)"
 
-#: src/compose.c:630
+#: src/compose.c:631
 msgid "_Replace signature"
 msgstr "覆蓋簽名(_R)"
 
-#: src/compose.c:634
+#: src/compose.c:635
 msgid "_Print"
 msgstr "列印(_P)"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:641 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "剪下(_t)"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "_Special paste"
 msgstr "特殊貼上(_S)"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "As _quotation"
 msgstr "如引言(_q)"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Wrapped"
 msgstr "已換行(_W)"
 
-#: src/compose.c:650
+#: src/compose.c:651
 msgid "_Unwrapped"
 msgstr "不換行(_U)"
 
-#: src/compose.c:652 src/mainwindow.c:551
+#: src/compose.c:653 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "全選(_a)"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "A_dvanced"
 msgstr "進階(_d)"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character backward"
 msgstr "向後移動一個位元"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a character forward"
 msgstr "向前移動一個位元"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word backward"
 msgstr "向後移動一個字"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move a word forward"
 msgstr "向前移動一個字"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to beginning of line"
 msgstr "移至列首"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to end of line"
 msgstr "移至列尾"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to previous line"
 msgstr "移至上一列"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Move to next line"
 msgstr "移至下一列"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character backward"
 msgstr "向後刪除一個字元"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a character forward"
 msgstr "向前刪除一個字元"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word backward"
 msgstr "向後刪除一個字"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete a word forward"
 msgstr "向前刪除一個字"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete line"
 msgstr "刪除列"
 
-#: src/compose.c:668
+#: src/compose.c:669
 msgid "Delete to end of line"
 msgstr "刪除至列尾"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "_Wrap current paragraph"
 msgstr "目前的段落換行(_W)"
 
-#: src/compose.c:675
+#: src/compose.c:676
 msgid "Wrap all long _lines"
 msgstr "所有的長列換行(_l)"
 
-#: src/compose.c:677
+#: src/compose.c:678
 msgid "Edit with e_xternal editor"
 msgstr "用外部編輯器進行編輯(_x)"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Check all or check selection"
 msgstr "檢查所有或勾選的項目(_C)"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "_Highlight all misspelled words"
 msgstr "標示所有拼錯的單字(_H)"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "Check _backwards misspelled word"
 msgstr "向後檢查拼錯的單字(_b)"
 
-#: src/compose.c:683
+#: src/compose.c:684
 msgid "_Forward to next misspelled word"
 msgstr "向前檢查拼錯的單字(_F)"
 
-#: src/compose.c:690
+#: src/compose.c:691
 msgid "Reply _mode"
 msgstr "回復模式(_m)"
 
-#: src/compose.c:692
+#: src/compose.c:693
 msgid "Privacy _System"
 msgstr "隱私系統(_S)"
 
-#: src/compose.c:696
+#: src/compose.c:697
 msgid "_Priority"
 msgstr "優先權(_P)"
 
-#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
+#: src/compose.c:699 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "字元編碼(_e)"
 
-#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "西歐"
 
-#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "希伯來"
 
-#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "西里爾"
 
-#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "日文"
 
-#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "中文"
 
-#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "韓文"
 
-#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
+#: src/compose.c:712 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "泰文"
 
-#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
+#: src/compose.c:715 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "通訊錄"
 
-#: src/compose.c:716
+#: src/compose.c:717
 msgid "_Template"
 msgstr "樣板"
 
-#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
+#: src/compose.c:719 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "動作"
 
-#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
+#: src/compose.c:723 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "關於"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Aut_o wrapping"
 msgstr "自動換行"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Auto _indent"
 msgstr "自動縮排(_i)"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "Si_gn"
 msgstr "簽名"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Encrypt"
 msgstr "加密"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "_Request Return Receipt"
 msgstr "要求回條"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Remo_ve references"
 msgstr "移除參考"
 
-#: src/compose.c:733
+#: src/compose.c:734
 msgid "Show _ruler"
 msgstr "顯示尺標"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:739 src/compose.c:749
 msgid "_Normal"
 msgstr "一般"
 
-#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "所有"
 
-#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/compose.c:741 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "傳送者"
 
-#: src/compose.c:741
+#: src/compose.c:742
 msgid "_Mailing-list"
 msgstr "寄送清單"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "_Highest"
 msgstr "最高"
 
-#: src/compose.c:747
+#: src/compose.c:748
 msgid "Hi_gh"
 msgstr "高"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "Lo_w"
 msgstr "低"
 
-#: src/compose.c:750
+#: src/compose.c:751
 msgid "_Lowest"
 msgstr "最低"
 
-#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
+#: src/compose.c:756 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "自動"
 
-#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
+#: src/compose.c:757 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
+#: src/compose.c:758 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "萬國碼 (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
+#: src/compose.c:762 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "中歐 (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
+#: src/compose.c:765 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "希臘 (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
+#: src/compose.c:770 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "士耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:1040
+#: src/compose.c:1041
 msgid "New message From format error."
 msgstr "新訊息寄件者格式錯誤"
 
-#: src/compose.c:1133
+#: src/compose.c:1134
 msgid "New message subject format error."
 msgstr "新訊息標題格式錯誤"
 
-#: src/compose.c:1165 src/quote_fmt.c:565
+#: src/compose.c:1166 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "新訊息內容樣板在第%d行出現錯誤"
 
-#: src/compose.c:1434
+#: src/compose.c:1435
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "無法回覆,原始信件可能不存在"
 
-#: src/compose.c:1619 src/quote_fmt.c:582
+#: src/compose.c:1620 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "回寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1668 src/quote_fmt.c:585
+#: src/compose.c:1669 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "回寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1810 src/compose.c:2011 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "轉寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1871 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "轉寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2053
+#: src/compose.c:2054
 msgid "Fw: multiple emails"
 msgstr "回覆:多重郵件"
 
-#: src/compose.c:2575
+#: src/compose.c:2576
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "改寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2649 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "副本:"
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2652 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "密件副本:"
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2655 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "回信給:"
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2658 src/compose.c:5035 src/compose.c:5037
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "新聞群組:"
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2661 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "跟隨至:"
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2664 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "回覆至:"
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2668 src/compose.c:5032 src/compose.c:5040
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "收件者:"
 
-#: src/compose.c:2861
+#: src/compose.c:2864
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "無法夾帶檔案(字元轉換失敗)"
 
-#: src/compose.c:2867
+#: src/compose.c:2870
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2105,73 +2106,73 @@ msgstr[1] ""
 "下列檔案已經夾帶:\n"
 "%s"
 
-#: src/compose.c:3147
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "樣板內\"引用標示\"有誤"
 
-#: src/compose.c:3680
+#: src/compose.c:3679
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "無法取得檔案'%s'大小"
 
-#: src/compose.c:3698
+#: src/compose.c:3697
 #, 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 "你可以在訊息內容中插入一個檔案 %s,確認要這樣幹嗎?"
 
-#: src/compose.c:3701
+#: src/compose.c:3700
 msgid "Are you sure?"
 msgstr "你確定嗎?"
 
-#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
+#: src/compose.c:3701 src/compose.c:10821 src/compose.c:11714
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/compose.c:3827
+#: src/compose.c:3826
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空白的"
 
-#: src/compose.c:3828
+#: src/compose.c:3827
 msgid "Empty file"
 msgstr "清空檔案"
 
-#: src/compose.c:3829
+#: src/compose.c:3828
 msgid "_Attach anyway"
 msgstr "直接夾檔(_A)"
 
-#: src/compose.c:3838
+#: src/compose.c:3837
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s"
 
-#: src/compose.c:3865
+#: src/compose.c:3864
 #, c-format
 msgid "Message: %s"
 msgstr "訊息: %s"
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4876 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " 已編輯"
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4883 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新信件 %s"
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4886 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[無主題] - 新信件 %s"
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4888 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "新信件"
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4915 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2179,62 +2180,62 @@ msgstr ""
 "尚未指定郵件的傳送地址\n"
 "傳送前請選擇一個郵件地址"
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5132 src/compose.c:5169
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "只存在一個預設的收件者 '%s',確認寄出?"
 
-#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/compose.c:5134 src/compose.c:5171 src/compose.c:5209 src/compose.c:5252
 #: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "傳送"
 
-#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
-#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/compose.c:5136 src/compose.c:5173 src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5818 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: src/compose.c:5194
+#: src/compose.c:5190
 msgid "Recipient is not specified."
 msgstr "尚未指定收件者"
 
-#: src/compose.c:5209
+#: src/compose.c:5205
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "主題空白 %s"
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5206 src/compose.c:5249
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "確認寄出?"
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5207 src/compose.c:5250
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "儲存至草稿?"
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5209 src/compose.c:5252 src/toolbar.c:531
 msgid "Send later"
 msgstr "稍後寄送"
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5210 src/compose.c:5253
 msgid "_Queue"
 msgstr "草稿(_Q)"
 
-#: src/compose.c:5252
+#: src/compose.c:5248
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "傳送給 %d 接收者. %s"
 
-#: src/compose.c:5281
+#: src/compose.c:5277
 msgid "Could not queue message."
 msgstr "此訊息無法稍後再送出"
 
-#: src/compose.c:5284
+#: src/compose.c:5280
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2245,7 +2246,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5288
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2256,7 +2257,7 @@ msgstr ""
 "\n"
 "簽名天敗:  %s"
 
-#: src/compose.c:5293
+#: src/compose.c:5289
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2267,7 +2268,7 @@ msgstr ""
 "\n"
 "加密失敗:  %s"
 
-#: src/compose.c:5298
+#: src/compose.c:5294
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2277,7 +2278,7 @@ msgstr ""
 "\n"
 "字元轉換失敗"
 
-#: src/compose.c:5302
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2287,7 +2288,7 @@ msgstr ""
 "\n"
 "無法取得收件者的加密金鑰"
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5361 src/compose.c:5421
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2295,16 +2296,16 @@ msgstr ""
 "草稿信件無法被傳送\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5421
+#: src/compose.c:5417
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 "%s\n"
-"從主視窗用\"傳送草稿訊息\"重試"
+"你可以試著再次傳送或按下\"稍後傳送\"保留此郵件"
 
-#: src/compose.c:5818
+#: src/compose.c:5814
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2314,7 +2315,7 @@ msgstr ""
 "無法轉換訊息的字元編碼至指定的 %s 編碼\n"
 "確認以 %s 傳送?"
 
-#: src/compose.c:5876
+#: src/compose.c:5872
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2326,100 +2327,104 @@ msgstr ""
 "訊息內容將被打斷以利傳輸\n"
 "確定要傳送嗎?"
 
-#: src/compose.c:6115
+#: src/compose.c:6111
 msgid "Encryption warning"
 msgstr "加密警告"
 
-#: src/compose.c:6116
+#: src/compose.c:6112
 msgid "C_ontinue"
 msgstr "繼續(_o)"
 
-#: src/compose.c:6165
+#: src/compose.c:6160
 msgid "No account for sending mails available!"
 msgstr "傳送郵件時找不到有效的帳號"
 
-#: src/compose.c:6174
+#: src/compose.c:6169
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "選擇的帳號並非NNTP:無法傳輸"
 
-#: src/compose.c:6428
+#: src/compose.c:6423
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "附加檔案%s不存在,忽略嗎?"
 
-#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6425
+msgid "Cancel drafting"
+msgstr "取消草稿"
+
+#: src/compose.c:6425 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "終止傳送"
 
-#: src/compose.c:6431
+#: src/compose.c:6426
 msgid "Ignore attachment"
 msgstr "忽略附加檔案"
 
-#: src/compose.c:6487
+#: src/compose.c:6482
 #, c-format
 msgid "Original %s part"
 msgstr "原始的第%s部份"
 
-#: src/compose.c:7094
+#: src/compose.c:7086
 msgid "Add to address _book"
 msgstr "新增至通訊錄"
 
-#: src/compose.c:7249
+#: src/compose.c:7241
 msgid "Delete entry contents"
 msgstr "刪除目錄"
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7245 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "按下 <tab> 可自動完成郵件地址"
 
-#: src/compose.c:7488
+#: src/compose.c:7480
 msgid "Mime type"
 msgstr "Mime格式"
 
-#: src/compose.c:7494 src/mimeview.c:303
+#: src/compose.c:7486 src/mimeview.c:310
 #: src/plugins/att_remover/att_remover.c:305
 #: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/prefs_summaries.c:702 src/prefs_summary_column.c:84
 #: src/summaryview.c:468
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:7556
+#: src/compose.c:7548
 msgid "Save Message to "
 msgstr "儲存訊息到"
 
-#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7581 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:470
 msgid "_Browse"
 msgstr "瀏覽"
 
-#: src/compose.c:7605
+#: src/compose.c:7597
 msgid "Select folder to save message to"
 msgstr "選擇要儲存郵件的目錄"
 
-#: src/compose.c:8059
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr "標頭"
 
-#: src/compose.c:8064
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr "附件檔"
 
-#: src/compose.c:8078
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr "其它"
 
-#: src/compose.c:8093
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr "主旨"
 
-#: src/compose.c:8317
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2428,69 +2433,69 @@ msgstr ""
 "拼字檢查無法正確啟用\n"
 "%s"
 
-#: src/compose.c:8468
+#: src/compose.c:8460
 msgid "_From:"
 msgstr "寄件者:"
 
-#: src/compose.c:8476
+#: src/compose.c:8468
 msgid "Account to use for this email"
 msgstr "此郵件使用的帳號"
 
-#: src/compose.c:8478
+#: src/compose.c:8470
 msgid "Sender address to be used"
 msgstr "使用的寄件者地址"
 
-#: src/compose.c:8660
+#: src/compose.c:8652
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "無法載入隱私系統'%s',此訊息將無法被簽證或加密"
 
-#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8763 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr "空白(_N)"
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8864 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "此樣板內容的第%d行發現錯誤"
 
-#: src/compose.c:8969
+#: src/compose.c:8961
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "樣板中 '%s' 欄位格式錯誤"
 
-#: src/compose.c:9394
+#: src/compose.c:9386
 msgid "Invalid MIME type."
 msgstr "無效的MINE型式"
 
-#: src/compose.c:9409
+#: src/compose.c:9401
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或空白"
 
-#: src/compose.c:9480
+#: src/compose.c:9472
 msgid "Properties"
 msgstr "屬性"
 
-#: src/compose.c:9498
+#: src/compose.c:9490
 msgid "MIME type"
 msgstr "MIME型式"
 
-#: src/compose.c:9531
+#: src/compose.c:9523
 msgid "Encoding"
 msgstr "編碼中"
 
-#: src/compose.c:9551
+#: src/compose.c:9543
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:9552
+#: src/compose.c:9544
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/compose.c:9648
+#: src/compose.c:9640
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2499,12 +2504,13 @@ msgstr ""
 "無法將信件內容寫入檔案:\n"
 "%s"
 
-#: src/compose.c:9677
+#: src/compose.c:9669
 msgid ""
 "Socket communication with an external editor is not available on Windows."
 msgstr "在Windows系上無法以外部編輯器進行Socket通訊"
 
-#: src/compose.c:9710
+#: src/compose.c:9702
+#, c-format
 msgid ""
 "Could not spawn the following external editor command:\n"
 "%s\n"
@@ -2514,41 +2520,38 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9754
+#: src/compose.c:9746
+#, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "外部編輯圖終止,錯誤碼:%s"
 
-#: src/compose.c:9828
+#: src/compose.c:9818
 msgid "process id: %"
 msgstr "進度 ID: %"
 
-#: src/compose.c:9830
-msgid "process id: %d"
-msgstr "處理資料夾"
-
-#: src/compose.c:9835
+#: src/compose.c:9821
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
 "%s"
 msgstr ""
-"外部編輯器正在使用中\n"
+"外部編輯器仍在使用中\n"
 "要強制終止此程序嗎?\n"
-"程序id: %d"
+"%d"
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10232 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail 需要網路的存取權才能傳送此郵件"
 
-#: src/compose.c:10448
+#: src/compose.c:10435
 msgid "Could not save draft."
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10452
+#: src/compose.c:10439
 msgid "Could not save draft"
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10453
+#: src/compose.c:10440
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2556,24 +2559,24 @@ msgstr ""
 "無法儲存為草稿\n"
 "確定要終止離開或放棄此郵件?"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Cancel exit"
 msgstr "終止離開"
 
-#: src/compose.c:10455
+#: src/compose.c:10442
 msgid "_Discard email"
 msgstr "放棄郵件"
 
-#: src/compose.c:10646 src/compose.c:10660
+#: src/compose.c:10633 src/compose.c:10647
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:10674
+#: src/compose.c:10661
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "無法讀取檔案'%s'"
 
-#: src/compose.c:10676
+#: src/compose.c:10663
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2582,58 +2585,50 @@ msgstr ""
 "目前的編碼檔案'%s'包含無效的字元\n"
 "插入可能是無效的"
 
-#: src/compose.c:10753
+#: src/compose.c:10740
 msgid "Discard message"
 msgstr "放棄訊息"
 
-#: src/compose.c:10754
+#: src/compose.c:10741
 msgid "This message has been modified. Discard it?"
 msgstr "此訊息已經被修改過了,要放棄嗎?"
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10742 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "放棄"
 
-#: src/compose.c:10755 src/compose.c:10760
+#: src/compose.c:10742 src/compose.c:10747
 msgid "_Save to Drafts"
 msgstr "儲存至草稿(_S)"
 
-#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10745 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "儲存異動"
 
-#: src/compose.c:10759
+#: src/compose.c:10746
 msgid "This message has been modified. Save the latest changes?"
 msgstr "此訊息已經被修改過了,要儲存最後的修改嗎?"
 
-#: src/compose.c:10760
+#: src/compose.c:10747
 msgid "_Don't save"
 msgstr "不要儲存"
 
-#: src/compose.c:10831
+#: src/compose.c:10818
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "確定要使用樣板 '%s'嗎?"
 
-#: src/compose.c:10833
+#: src/compose.c:10820
 msgid "Apply template"
 msgstr "使用樣板"
 
-#: src/compose.c:10834 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10821 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr "覆蓋(_R)"
 
-#: src/compose.c:10911
-#, c-format
-msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
-msgstr "貼上的文字內容超過限制(%dKiB)"
-"請以附檔替代"
-
-#: src/compose.c:11727
+#: src/compose.c:11707
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2644,20 +2639,20 @@ msgid_plural ""
 msgstr[0] "確定要將此一檔案內容插入至郵件訊息中?還是要將它附加至郵件?"
 msgstr[1] "確定要將%d個檔案的內容插入至郵件訊息中?還是要將它們附加至郵件?"
 
-#: src/compose.c:11733
+#: src/compose.c:11713
 msgid "Insert or attach?"
 msgstr "確定插入或附加檔案?"
 
-#: src/compose.c:11734
+#: src/compose.c:11714
 msgid "_Attach"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:11949
+#: src/compose.c:11929
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "第%d格式有誤"
 
-#: src/compose.c:12245
+#: src/compose.c:12225
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2873,7 +2868,7 @@ msgid " Check File "
 msgstr "檢查檔案"
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2505
 msgid "File"
 msgstr "檔案"
 
@@ -2918,12 +2913,12 @@ msgid "Input the new name of folder:"
 msgstr "輸入新名稱給資料夾"
 
 #: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr "新增資料夾"
 
 #: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr "輸入名稱給新資料夾"
 
@@ -2951,13 +2946,13 @@ msgstr "新增JPilot進入點"
 msgid "Edit LDAP - Select Search Base"
 msgstr "編輯LDAP - 選擇搜尋基準"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3252
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "主機名稱"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3259
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "通訊埠"
@@ -3017,7 +3012,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4227
+#: src/editldap.c:468 src/prefs_account.c:4251
 msgid "TLS"
 msgstr "SSL/TLS"
 
@@ -3164,8 +3159,8 @@ msgstr "綁定密碼"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "以\"Bind DN\"進行連線時,此密碼將被使用"
 
-#: src/editldap.c:727 src/prefs_account.c:1471 src/prefs_account.c:2109
-#: src/prefs_account.c:3040 src/prefs_account.c:3068 src/prefs_account.c:3269
+#: src/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2133
+#: src/prefs_account.c:3064 src/prefs_account.c:3092 src/prefs_account.c:3293
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr "顯示密碼"
@@ -3187,11 +3182,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜尋結果中可以接收的最大登入數量"
 
-#: src/editldap.c:776 src/prefs_account.c:4098
+#: src/editldap.c:776 src/prefs_account.c:4122
 msgid "Basic"
 msgstr "基本"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr "延伸"
 
@@ -3209,8 +3204,8 @@ msgctxt "Window title"
 msgid "Modify tags"
 msgstr "修改"
 
-#: src/edittags.c:203 src/gtk/quicksearch.c:866
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:709
 msgid "Tag"
 msgstr "標籤"
 
@@ -3250,9 +3245,7 @@ msgstr "刪除選擇的檔案"
 msgid ""
 "Choose the tag(s) for the message(s).\n"
 "Changes are immediately applied."
-msgstr ""
-"為信件選擇標籤"
-"所有的異動會立即生效"
+msgstr "為信件選擇標籤所有的異動會立即生效"
 
 #: src/editvcard.c:94
 msgid "File does not appear to be vCard format."
@@ -3335,15 +3328,15 @@ msgstr "HTML輸出檔案"
 msgid "B_rowse"
 msgstr "瀏覽"
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr "樣式"
 
 #: src/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
 #: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
 #: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1138
-#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6268
 msgid "None"
 msgstr "無"
 
@@ -3582,7 +3575,7 @@ msgstr "匯出通訊錄至 LDIF 檔"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:112 src/summaryview.c:8489
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr "匯出至 mbox 檔案"
 
@@ -3715,6 +3708,7 @@ msgid ""
 msgstr "這不是一個以帳號為基準的規則,所有的規則將被使用在使用者需求上\n"
 
 #: src/filtering.c:673
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request anyway\n"
@@ -3736,6 +3730,7 @@ msgid "rule is account-based, matching current account\n"
 msgstr "這是一個以帳號為基準的規則,但是不符合目前帳號\n"
 
 #: src/filtering.c:736
+#, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching current account [id=%d, "
 "name='%s']\n"
@@ -3844,61 +3839,61 @@ msgstr ""
 "郵件過濾中 (%s%s%s)\n"
 "%s郵件檔案: %s\n"
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/folder.c:1600
+#: src/folder.c:1596
 msgid "Sent"
 msgstr "已傳送"
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 src/plugins/attachwarner/attachwarner.c:219
 #: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr "暫存"
 
-#: src/folder.c:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "回收桶"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "處理 (%s)...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "正在複製 %s 到 %s...\n"
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "正在移動 %s 到 %s...\n"
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在為 %s 更新緩衝..."
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr "郵件處理..."
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "離線同步化 %s ...\n"
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
@@ -3907,7 +3902,7 @@ msgid "Select folder"
 msgstr "選擇資料夾"
 
 #: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr "新資料夾"
 
@@ -3918,205 +3913,209 @@ msgstr "從上層資料夾繼承屬性並處理"
 #: src/foldersel.c:583 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:263 src/news_gtk.c:302
 #: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
-#: src/plugins/rssyl/rssyl_cb_menu.c:240
-#: src/plugins/vcalendar/vcal_folder.c:2102
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2100
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' 不能被包含在資料夾名稱內"
 
 #: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2109
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2107
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "資料夾 '%s' 已經存在"
 
 #: src/foldersel.c:605 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:162
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "無法建立資料夾 '%s'"
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr "標示所有為已讀(_a)"
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr "標記所有為未讀(_n)"
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr "遞迴地標示所有為已讀(_v)"
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr "遞迴地標示所有為未讀(_v)"
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr "立即執行規則(u)"
 
-#: src/folderview.c:254 src/mainwindow.c:555
+#: src/folderview.c:256 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "搜尋資料夾(_S)..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr "啟動後開啟"
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr "處理(_i)..."
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "清空回收桶(_t)..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr "傳送暫存郵件(_q)..."
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr "設定已顯示行數"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr "新郵件"
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
 #: src/toolbar.c:522
 msgid "Unread"
 msgstr "未讀郵件"
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "全部郵件"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr "設定資料夾訊息..."
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr "將所有的郵件標示為已讀"
 
-#: src/folderview.c:871
+#: src/folderview.c:874
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "確定要將此資料內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr "將所有的郵件標示為未讀"
 
-#: src/folderview.c:877
+#: src/folderview.c:880
 msgid ""
 "Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "確定要將此資料內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:1075 src/imap.c:4703
+#: src/folderview.c:1078 src/imap.c:4757
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "掃描資料夾 %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4761 src/mainwindow.c:5272 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "掃描資料夾 %s..."
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr "重建資料夾串列"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "重建資料夾串列將移除本地的暫存資料,確定要繼續嗎?"
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr "資料夾串列重建..."
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr "資料夾串列掃描..."
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "無法掃描資料夾 %s\n"
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr "在所有資料夾內檢查新郵件..."
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr "關閉資料夾 %s..."
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr "開啟 %s..."
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr "資料夾無法開啟"
 
-#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/folderview.c:2504 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "清空回收桶"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "刪除所以回收桶內的郵件"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "清空回收桶(_E)"
 
-#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "離線警告"
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "目前為離線模式,要覆寫嗎?"
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "傳送暫存郵件"
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "傳送所有暫存郵件?"
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "傳送暫存郵件時發生一些錯誤"
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2927 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4125,64 +4124,64 @@ msgstr ""
 "傳送暫存郵件時發生一些錯誤:\n"
 "%s"
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "確認要複製資料夾 '%s' 嗎?(從'%s'內)"
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "確認要將資料夾 '%s' 變為 '%s' 的子資料夾嗎?"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr "複製資料夾"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr "移動資料夾"
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "從 %s 複製到 %s ..."
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "從 %s 移動到 %s ..."
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr "來源和目的相同"
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr "不能將資料夾複製到它的子目錄內"
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr "不能將資料夾移動到它的子目錄內"
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "資料夾無法在兩個不同的郵件資料夾間移動"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr "複製失敗"
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr "移動失敗"
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "進行資料夾 %s 配置"
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr "目的資料夾只能被用來儲存子資料夾"
 
@@ -4227,8 +4226,8 @@ msgid "read-only"
 msgstr "唯讀的"
 
 #: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:115
-#: src/plugins/vcalendar/vcal_manager.c:149
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr "未知的"
 
@@ -4266,13 +4265,13 @@ msgstr ""
 "Claws Mail 是自由軟體並遵循GPL規範釋出。若希望贊助 Claws Mail 專案,可以如"
 "下:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:871
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2023\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"版權所有 (C) 1999-2021\n"
+"版權所有 (C) 1999-2023\n"
 "Claws Mail 團隊及\n"
 "Hiroyuki Yamamoto"
 
@@ -4307,7 +4306,7 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: 不明"
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Claws Mail 團隊"
 
@@ -4426,73 +4425,77 @@ msgstr ""
 "你將會伴隨此程式收到一份 GNU General Public License 的複本,如果沒有收到,請"
 "參閱"
 
-#: src/gtk/about.c:736 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2745
 msgid "Session statistics\n"
 msgstr "通信統計\n"
 
-#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2755 src/main.c:2758
 #, c-format
 msgid "Started: %s\n"
 msgstr "開始於: %s\n"
 
-#: src/gtk/about.c:756 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2764
 msgid "Incoming traffic\n"
 msgstr "收件傳輸量\n"
 
-#: src/gtk/about.c:759 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2767
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "已接收郵件: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2772
+msgid "Spam messages: %d\n"
+msgstr "垃圾郵件: %d\n"
+
+#: src/gtk/about.c:771 src/main.c:2779
 msgid "Outgoing traffic\n"
 msgstr "外寄傳輸量\n"
 
-#: src/gtk/about.c:769 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2782
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "新/改寄的郵件: %d\n"
 
-#: src/gtk/about.c:774 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2786
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "回覆的郵件: %d\n"
 
-#: src/gtk/about.c:779 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2790
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "轉寄的郵件: %d\n"
 
-#: src/gtk/about.c:784 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2794
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "所有寄出的郵件: %d\n"
 
-#: src/gtk/about.c:811
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr "關於 Claws Mail"
 
-#: src/gtk/about.c:886
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr "資訊(_I)"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr "作者群(_A)"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr "功能(_F)"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr "許可(_L)"
 
-#: src/gtk/about.c:912
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr "釋出記錄(_R)"
 
-#: src/gtk/about.c:918
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr "統計(_S)"
 
@@ -4697,7 +4700,7 @@ msgid "Configuring..."
 msgstr "配置..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:703
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "日期"
@@ -4706,9 +4709,9 @@ msgstr "日期"
 msgid "Date:"
 msgstr "日期:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/prefs_summaries.c:705 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr "寄件者"
@@ -4729,9 +4732,9 @@ msgstr "寄件者:"
 msgid "Reply-To"
 msgstr "回覆給"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
-#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/prefs_summaries.c:706 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr "收件者"
@@ -4767,9 +4770,9 @@ msgstr "索引"
 msgid "References:"
 msgstr "索引:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
-#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/prefs_summaries.c:707 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr "主旨"
@@ -4779,7 +4782,7 @@ msgstr "主旨"
 msgid "Subject:"
 msgstr "主旨:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr "註解"
 
@@ -4893,8 +4896,8 @@ msgid "Seen:"
 msgstr "已見:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:711
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr "狀態"
@@ -4967,7 +4970,7 @@ msgstr "優先權"
 msgid "Precedence:"
 msgstr "優先權:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1265
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "組織"
 
@@ -5286,9 +5289,8 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:141
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
@@ -5302,7 +5304,7 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:508
 #: src/plugins/notification/notification_prefs.c:526
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
-#: src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5317,7 +5319,7 @@ msgstr "載入(_L)..."
 msgid "_Unload"
 msgstr "卸載(_U)"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:273
 msgid "Description"
 msgstr "說明"
 
@@ -5339,8 +5341,8 @@ msgid "Loaded plugins"
 msgstr "已載入的外掛程式"
 
 #: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
-#: src/plugins/archive/archiver_gtk.c:945
-#: src/plugins/clamd/clamav_plugin_gtk.c:92
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr "指定"
 
@@ -5353,10 +5355,10 @@ msgid "_Hide"
 msgstr "隱藏(_H)"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4152 src/prefs_account.c:4171 src/prefs_account.c:4189
-#: src/prefs_account.c:4207 src/prefs_account.c:4226 src/prefs_account.c:4309
-#: src/prefs_account.c:4327 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4121 src/prefs_account.c:4139 src/prefs_account.c:4157
+#: src/prefs_account.c:4176 src/prefs_account.c:4195 src/prefs_account.c:4213
+#: src/prefs_account.c:4231 src/prefs_account.c:4250 src/prefs_account.c:4333
+#: src/prefs_account.c:4351 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "帳號"
@@ -5426,17 +5428,17 @@ msgid "forwarded messages"
 msgstr "郵件已轉寄"
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
-msgstr "郵件包含附件"
-
-#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "任何標頭名稱或數據包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:427
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in the value of any header"
 msgstr "任何標頭內數據內包含 S 的郵件"
 
+#: src/gtk/quicksearch.c:427
+msgid "messages which have attachments"
+msgstr "郵件包含附件"
+
 #: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "任何 Message-ID 標頭包含 S 的郵件"
@@ -5526,18 +5528,18 @@ msgid "unread messages"
 msgstr "未讀的郵件"
 
 #: src/gtk/quicksearch.c:450
+msgid "messages which contain V in header H"
+msgstr "郵件標頭H內包含V的郵件"
+
+#: src/gtk/quicksearch.c:451
 msgid "messages which contain S in References header"
 msgstr "參考標頭內包含S的郵件"
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:452
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "傳入命令的返回值為0 - %F 為郵件檔案"
 
-#: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
-msgstr "X-Label 標頭內包含S的郵件"
-
 #: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "'而且'的操作邏輯"
@@ -5581,55 +5583,55 @@ msgstr ""
 msgid "Something went wrong during search. Please check your logs."
 msgstr "搜尋過程出現一些錯誤,請檢視你的歷程"
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr "寄件者/收件者/密件/主旨/標籤"
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "循環"
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr "黏貼"
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr "預先輸入"
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr "執行所選擇的"
 
-#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
-#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:252
 #: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr "清除(_l)"
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr "清除目前的搜尋"
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "編輯搜尋規則"
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:563 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr "關於擴展符號的資訊"
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr "編輯(_d)"
 
@@ -5680,6 +5682,7 @@ msgid "Expires on: "
 msgstr "過期日: "
 
 #: src/gtk/sslcertwindow.c:373
+#, c-format
 msgid "TLS certificate for %s"
 msgstr "%s 的 SSL/TLS 簽證"
 
@@ -5807,16 +5810,16 @@ msgstr "(無主旨)"
 msgid "Error:"
 msgstr "錯誤:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/image_viewer.c:314 src/mimeview.c:2612
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "檔案名稱"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr "檔案大小:"
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr "載入圖片"
 
@@ -6006,7 +6009,7 @@ msgstr " LIST 錯誤"
 msgid "Unknown error [%d]"
 msgstr "未知的錯誤 [%d]"
 
-#: src/imap.c:978
+#: src/imap.c:1005
 msgid ""
 "\n"
 "\n"
@@ -6018,7 +6021,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:984
+#: src/imap.c:1011
 msgid ""
 "\n"
 "\n"
@@ -6030,7 +6033,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:990
+#: src/imap.c:1017
 msgid ""
 "\n"
 "\n"
@@ -6042,7 +6045,55 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-1登入才能"
 "正常運作"
 
-#: src/imap.c:996
+#: src/imap.c:1023
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-224登入才能"
+"正常運作"
+
+#: src/imap.c:1029
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-256登入才能"
+"正常運作"
+
+#: src/imap.c:1035
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-384登入才能"
+"正常運作"
+
+#: src/imap.c:1041
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-512登入才能"
+"正常運作"
+
+#: src/imap.c:1047
 msgid ""
 "\n"
 "\n"
@@ -6054,7 +6105,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:1002
+#: src/imap.c:1053
 msgid ""
 "\n"
 "\n"
@@ -6066,7 +6117,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:1008
+#: src/imap.c:1059
 msgid ""
 "\n"
 "\n"
@@ -6076,36 +6127,36 @@ msgstr ""
 "\n"
 "OAuth2錯:檢查並修正你的OAuth2帳號設定"
 
-#: src/imap.c:1014
+#: src/imap.c:1065
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "連線到 %s 失敗:登入被拒絕 %s"
 
-#: src/imap.c:1018
+#: src/imap.c:1069
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "連線到 %s 失敗:登入被拒絕 %s\n"
 
-#: src/imap.c:1036
+#: src/imap.c:1087
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "連線到 %s 失敗"
 
-#: src/imap.c:1043 src/imap.c:1046
+#: src/imap.c:1094 src/imap.c:1097
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 連線到 %s 已經被中斷,正在重新連線...\n"
 
-#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
-#: src/imap.c:4684 src/imap.c:5495
+#: src/imap.c:1127 src/imap.c:3805 src/imap.c:4464 src/imap.c:4558
+#: src/imap.c:4738 src/imap.c:5549
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail 需要有網路的存取能力,才能夠存取 IMAP 伺服器"
 
-#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
+#: src/imap.c:1237 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
+#: src/imap.c:1238 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -6118,108 +6169,108 @@ msgstr ""
 "\n"
 "確認要繼續連線到這個伺服器嗎?此通訊將不安全"
 
-#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
+#: src/imap.c:1244 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "繼續保持連線"
 
-#: src/imap.c:1202
+#: src/imap.c:1254
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "帳號 '%s':連線到 IMAP4 伺服器:  %s:%d..."
 
-#: src/imap.c:1267
+#: src/imap.c:1319
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d"
 
-#: src/imap.c:1270
+#: src/imap.c:1322
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d\n"
 
-#: src/imap.c:1302 src/imap.c:4174
+#: src/imap.c:1354 src/imap.c:4226
 msgid "Can't start STARTTLS session.\n"
 msgstr "無法啟始 STARTTLS 通信\n"
 
-#: src/imap.c:1374
+#: src/imap.c:1426
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "無法登入到 IMAP 伺服器 %s \n"
 
-#: src/imap.c:1377
+#: src/imap.c:1429
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "無法登入到 IMAP 伺服器 %s"
 
-#: src/imap.c:1805
+#: src/imap.c:1857
 msgid "Adding messages..."
 msgstr "加入郵件..."
 
-#: src/imap.c:2010 src/mh.c:530
+#: src/imap.c:2062 src/mh.c:530
 msgid "Copying messages..."
 msgstr "複製郵件..."
 
-#: src/imap.c:2536
+#: src/imap.c:2588
 msgid "Search failed due to server error."
 msgstr "因伺服器錯誤造成搜尋失敗"
 
-#: src/imap.c:2620
+#: src/imap.c:2672
 msgid "can't set deleted flags\n"
 msgstr "無法設定已刪除旗標\n"
 
-#: src/imap.c:2627 src/imap.c:5125
+#: src/imap.c:2679 src/imap.c:5179
 msgid "can't expunge\n"
 msgstr "無法刪掉\n"
 
-#: src/imap.c:3002
+#: src/imap.c:3054
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "在沒有訂閱的資料夾 %s 內尋找..."
 
-#: src/imap.c:3005
+#: src/imap.c:3057
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "在%s尋找子資料夾..."
 
-#: src/imap.c:3296
+#: src/imap.c:3348
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法建立郵件箱:LIST錯誤\n"
 
-#: src/imap.c:3309
+#: src/imap.c:3361
 msgid "can't create mailbox\n"
 msgstr "無法建立郵件箱\n"
 
-#: src/imap.c:3439
+#: src/imap.c:3491
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "無法將郵件箱口稱從 %s 變更為 %s\n"
 
-#: src/imap.c:3552
+#: src/imap.c:3604
 msgid "can't delete mailbox\n"
 msgstr "無法刪除郵件箱\n"
 
-#: src/imap.c:3831
+#: src/imap.c:3883
 msgid "LIST failed\n"
 msgstr "LIST 失敗\n"
 
-#: src/imap.c:3916
+#: src/imap.c:3968
 msgid "Flagging messages..."
 msgstr "標示郵件..."
 
-#: src/imap.c:4019
+#: src/imap.c:4071
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾: %s\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4223
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "伺服器需要以 STARTTLS 進行登入\n"
 
-#: src/imap.c:4181
+#: src/imap.c:4233
 msgid "Can't refresh capabilities.\n"
 msgstr "不能刷新功能\n"
 
-#: src/imap.c:4186
+#: src/imap.c:4238
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6228,20 +6279,24 @@ msgstr ""
 "連線到 %s 失敗:伺服器需要 STARTTLS,但是目前的 Claws Mail 被編譯成不支援 "
 "STARTTLS 的版本\n"
 
-#: src/imap.c:4194
+#: src/imap.c:4246
 msgid "Server logins are disabled.\n"
 msgstr "伺服器登入被關閉\n"
 
-#: src/imap.c:4417
+#: src/imap.c:4469
 msgid "Fetching message..."
 msgstr "取得郵件..."
 
-#: src/imap.c:5118
+#: src/imap.c:4563
+msgid "Expunging deleted messages..."
+msgstr "刪除已刪除的郵件"
+
+#: src/imap.c:5172
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "無法設定被刪除的旗標: %d\n"
 
-#: src/imap.c:6153
+#: src/imap.c:6207
 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"
@@ -6271,7 +6326,7 @@ msgid "Cop_y folder..."
 msgstr "複製資料夾(_y)..."
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr "刪除資料夾(_D)..."
 
@@ -6291,7 +6346,7 @@ msgstr "訂閱內容"
 msgid "_Subscribe..."
 msgstr "訂閱(_S)..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Unsubscribe..."
 msgstr "取消訂閱(_U)..."
 
@@ -6323,21 +6378,21 @@ msgstr ""
 "請在資料夾後加上 '/'"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2094
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2092
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "為 %s 輸入新名稱"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
-#: src/plugins/rssyl/rssyl_cb_menu.c:235
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2093
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2115
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2113
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6356,7 +6411,8 @@ msgid "Select folder to copy folder '%s' to"
 msgstr "將資料夾 %s 複製到選擇的資料夾"
 
 #: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
+#, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
@@ -6368,8 +6424,8 @@ msgstr ""
 "確認要刪除嗎?"
 
 #: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
-#: src/plugins/rssyl/rssyl_cb_menu.c:210
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2046
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "不能移除資料夾 '%s'"
@@ -6671,8 +6727,8 @@ msgstr "連線失敗"
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:647
-#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:714
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr "已鎖定"
 
@@ -6841,8 +6897,8 @@ msgstr "已取消合併\n"
 #: src/inc.c:1639 src/plugins/notification/notification_prefs.c:1064
 #: src/plugins/notification/notification_prefs.c:1355
 #: src/plugins/notification/notification_prefs.c:1661
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1867
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:620
 msgid "seconds"
 msgstr "秒"
 
@@ -6905,7 +6961,7 @@ msgstr "LDAP 錯誤 (搜尋): %d (%s)\n"
 msgid "Nick Name"
 msgstr "暱稱"
 
-#: src/main.c:253
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6914,7 +6970,7 @@ msgstr ""
 "檔案 '%s' 已經存在\n"
 "無法建立資料夾"
 
-#: src/main.c:383
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6923,7 +6979,7 @@ msgstr ""
 "發現 %s 的配置設定\n"
 "確認要合併配置設定內容嗎?"
 
-#: src/main.c:387
+#: src/main.c:384
 #, c-format
 msgid ""
 "\n"
@@ -6936,11 +6992,11 @@ msgstr ""
 "你的 Sylpheed 過濾條件可以使用一個在 %s 的有效 script 進行轉換\n"
 " "
 
-#: src/main.c:400
+#: src/main.c:397
 msgid "Keep old configuration"
 msgstr "保留舊有的配置設定內容"
 
-#: src/main.c:403
+#: src/main.c:400
 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 "
@@ -6949,27 +7005,27 @@ msgstr ""
 "保留備份可以允許你未來回復至舊的版本,但是,如果你有 IMAP 或是新聞資料時,將"
 "會花費一些時間,同時,也會占去磁碟上的部份空間"
 
-#: src/main.c:411
+#: src/main.c:408
 msgid "Migration of configuration"
 msgstr "配置設定的合併內容"
 
-#: src/main.c:422
+#: src/main.c:419
 msgid "Copying configuration... This may take a while..."
 msgstr "正在複製配置內容... 這將會花費一些時間..."
 
-#: src/main.c:431
+#: src/main.c:428
 msgid "Migration failed!"
 msgstr "合併失敗"
 
-#: src/main.c:440
+#: src/main.c:437
 msgid "Migrating configuration..."
 msgstr "正在合併配置內容..."
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1189 src/main.c:1193 src/main.c:1197
 msgid "(or older)"
 msgstr "(或較舊的)"
 
-#: src/main.c:1540
+#: src/main.c:1535
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6986,7 +7042,7 @@ msgstr[1] ""
 "以下這些外掛程式載入失敗,請檢查外掛程式配置以獲取更多的資訊:\n"
 "%s"
 
-#: src/main.c:1582
+#: src/main.c:1577
 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 "
@@ -6995,7 +7051,7 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它並不完整。這可能是源自於一個無效的 IMAP 帳"
 "號。請嘗試使用郵件箱的最上層資料夾內的\"重建資料夾\"功能進行修復"
 
-#: src/main.c:1588
+#: src/main.c:1583
 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 "
@@ -7004,75 +7060,75 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它無法載入。這可能是源自於一個過時的延伸外掛"
 "程式,請重新安裝外掛程式後,再試一次。"
 
-#: src/main.c:1828
+#: src/main.c:1827
 msgid "Missing filename\n"
 msgstr "找不到案名稱\n"
 
-#: src/main.c:1835
+#: src/main.c:1834
 msgid "Cannot open filename for reading\n"
 msgstr "無法開啟要讀取的檔案名稱\n"
 
-#: src/main.c:1846
+#: src/main.c:1845
 msgid "Malformed header\n"
 msgstr "變形的標頭\n"
 
-#: src/main.c:1853
+#: src/main.c:1852
 msgid "Duplicated 'To:' header\n"
 msgstr "重複的'收件者:'標頭\n"
 
-#: src/main.c:1864
+#: src/main.c:1863
 msgid "Missing required 'To:' header\n"
 msgstr "遺失必要的'收件者:'標頭\n"
 
-#: src/main.c:1888
+#: src/main.c:1887
 msgid "%s. Try -h or --help for usage.\n"
-msgstr "嘗試使用 -h 或 -help 取得用法\n"
+msgstr "%s. 嘗試使用 -h 或 -help 取得使用方法\n"
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1916 src/main.c:1979
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "缺少選項 %s 的參數"
 
-#: src/main.c:1939
+#: src/main.c:1938
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "缺少選項 %s 的uri參數或該參數是空值"
 
-#: src/main.c:1942
+#: src/main.c:1941
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "缺少選項 %s 的uri參數"
 
-#: src/main.c:1975
+#: src/main.c:1974
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "選項 %s 至少缺了一個有效的參數檔"
 
-#: src/main.c:2044
+#: src/main.c:2043
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "選項 %s 缺少目錄、型別和需要的參數"
 
-#: src/main.c:2047
+#: src/main.c:2046
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "選項 %s 缺少型別和需要的參數"
 
-#: src/main.c:2050
+#: src/main.c:2049
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "缺少選項%s要求的參數"
 
-#: src/main.c:2066
+#: src/main.c:2065
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用方式: %s [選項]...\n"
 
-#: src/main.c:2068
+#: src/main.c:2067
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]    開啟新郵件視窗"
 
-#: src/main.c:2069
+#: src/main.c:2068
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7089,11 +7145,11 @@ msgstr ""
 "行,接著是\n"
 "                         郵件的內容,直到檔案結束"
 
-#: src/main.c:2074
+#: src/main.c:2073
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      如果可能的話加入訂閱的 URI"
 
-#: src/main.c:2075
+#: src/main.c:2074
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7103,7 +7159,7 @@ msgstr ""
 "                         以指定的附加檔案開啟新郵件視窗\n"
 "                         "
 
-#: src/main.c:2078
+#: src/main.c:2077
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7113,23 +7169,23 @@ msgstr ""
 "                         以指定的附加檔案夾在新開啟的郵件視窗\n"
 "                         "
 
-#: src/main.c:2081
+#: src/main.c:2080
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新郵件"
 
-#: src/main.c:2082
+#: src/main.c:2081
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帳號的新郵件"
 
-#: src/main.c:2083
+#: src/main.c:2082
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     取消接收郵件"
 
-#: src/main.c:2084
+#: src/main.c:2083
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       取消傳送郵件"
 
-#: src/main.c:2085
+#: src/main.c:2084
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7147,15 +7203,15 @@ msgstr ""
 "                         需求: 尋找字串\n"
 "                         遞迴: 若字串的開頭為 0, n, N, f or F,將會失敗"
 
-#: src/main.c:2092
+#: src/main.c:2091
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 傳送所有暫存的郵件"
 
-#: src/main.c:2093
+#: src/main.c:2092
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示所有郵件的數量"
 
-#: src/main.c:2094
+#: src/main.c:2093
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -7163,15 +7219,15 @@ msgstr ""
 "  --status-full [資料夾]...\n"
 "                         顯示每一個資料夾的狀態"
 
-#: src/main.c:2096
+#: src/main.c:2095
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           顯示統計資訊"
 
-#: src/main.c:2097
+#: src/main.c:2096
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     重置統計資訊"
 
-#: src/main.c:2098
+#: src/main.c:2097
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7181,44 +7237,44 @@ msgstr ""
 "                         資料夾是一個資料夾 id 像是'資料夾/子資料夾',一個"
 "file:// uri或是絕對路徑"
 
-#: src/main.c:2100
+#: src/main.c:2099
 msgid "  --online               switch to online mode"
 msgstr "  --online               切換至上線模式"
 
-#: src/main.c:2101
+#: src/main.c:2100
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切換至離線模式"
 
-#: src/main.c:2102
+#: src/main.c:2101
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       離開 Claws Mail"
 
-#: src/main.c:2103
+#: src/main.c:2102
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d               除錯模式"
 
-#: src/main.c:2104
+#: src/main.c:2103
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         釘住除錯模式"
 
-#: src/main.c:2105
+#: src/main.c:2104
 msgid "  --help -h              display this help"
 msgstr "  --help -h              顯示這個說明"
 
-#: src/main.c:2106
+#: src/main.c:2105
 msgid "  --version -v           output version information"
 msgstr "  --version -v           顯示版本資訊"
 
-#: src/main.c:2107
+#: src/main.c:2106
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr "  --version-full -V      顯示版本資訊及內鍵的功能資訊 "
 
-#: src/main.c:2108
+#: src/main.c:2107
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           顯示配置路徑"
 
-#: src/main.c:2109
+#: src/main.c:2108
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7226,7 +7282,7 @@ msgstr ""
 "  --alternate-config-dir [路徑]\n"
 "                         使用指定的配置路徑"
 
-#: src/main.c:2111
+#: src/main.c:2110
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7234,48 +7290,48 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "\t\t\t\t\t\t\t設定主視窗的大小"
 
-#: src/main.c:2128
+#: src/main.c:2127
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "缺少選項 %s 的路徑參數"
 
-#: src/main.c:2136
+#: src/main.c:2135
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "缺少選項 %s 的幾何參數"
 
-#: src/main.c:2147
+#: src/main.c:2146
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "缺少選項 %s 的目錄參數"
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2179 src/main.c:2182
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知的選項 %s"
 
-#: src/main.c:2199
+#: src/main.c:2198
 #, c-format
 msgid "Processing (%s)..."
 msgstr "處理 (%s)..."
 
-#: src/main.c:2202
+#: src/main.c:2201
 msgid "top level folder"
 msgstr "最上層資料夾"
 
-#: src/main.c:2284
+#: src/main.c:2283
 msgid "Queued messages"
 msgstr "已暫存郵件"
 
-#: src/main.c:2285
+#: src/main.c:2284
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "尚有未傳送郵件在暫存區,確定要離開嗎?"
 
-#: src/main.c:3052
+#: src/main.c:3006
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager(網路管理員):網路是上線的\n"
 
-#: src/main.c:3058
+#: src/main.c:3012
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager(網路管理員):網路是離線的\n"
 
@@ -7459,11 +7515,11 @@ msgstr "下一個未讀資料夾(_f)"
 msgid "F_older..."
 msgstr "資料夾"
 
-#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr "下一個部份"
 
-#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr "上一個部份"
 
@@ -7705,7 +7761,7 @@ msgstr "標籤(_g)"
 msgid "Re-_edit"
 msgstr "重新編輯(_e)"
 
-#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1062
 msgid "Check signature"
 msgstr "檢查簽名"
 
@@ -7910,7 +7966,7 @@ msgstr "標頭列"
 msgid "Th_read view"
 msgstr "串列檢視(_r)"
 
-#: src/mainwindow.c:832 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:736
 msgid "Hide read threads"
 msgstr "隱藏讀取串列"
 
@@ -7918,7 +7974,7 @@ msgstr "隱藏讀取串列"
 msgid "_Hide read messages"
 msgstr "隱藏讀取郵件(_H)"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:742
 msgid "Hide deleted messages"
 msgstr "隱藏刪除郵件"
 
@@ -8030,11 +8086,11 @@ msgstr "根據鎖定"
 msgid "D_on't sort"
 msgstr "不排序(_o)"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:723
 msgid "Ascending"
 msgstr "升冪"
 
-#: src/mainwindow.c:880 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:724
 msgid "Descending"
 msgstr "降冪"
 
@@ -8042,7 +8098,7 @@ msgstr "降冪"
 msgid "_Auto detect"
 msgstr "自動偵測(_A)"
 
-#: src/mainwindow.c:1297 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr "指定標籤"
 
@@ -8081,7 +8137,7 @@ msgstr "關閉過濾器日誌\n"
 #: src/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
 #: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "無標題的"
 
@@ -8089,19 +8145,19 @@ msgstr "無標題的"
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:2869 src/mainwindow.c:2874
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "刪除回收桶中所有的郵件"
 
-#: src/mainwindow.c:2870
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr "不要離開"
 
-#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "新增郵件夾"
 
-#: src/mainwindow.c:2902
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8113,18 +8169,18 @@ msgstr ""
 "如果指定的郵件箱已經存在,它將會被自動地發現\n"
 " "
 
-#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "郵件夾 '%s' 已經存在"
 
-#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "郵件夾"
 
-#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8133,167 +8189,167 @@ msgstr ""
 "郵件箱建立失敗\n"
 "可能有部份檔案已經存在,或是沒有足夠的存取權限"
 
-#: src/mainwindow.c:3387
+#: src/mainwindow.c:3391
 msgid "No posting allowed"
 msgstr "不允許發郵件"
 
-#: src/mainwindow.c:3947
+#: src/mainwindow.c:3951
 msgid "Mbox import has failed."
 msgstr "Mbox 匯入失敗"
 
-#: src/mainwindow.c:3956 src/mainwindow.c:3965
+#: src/mainwindow.c:3960 src/mainwindow.c:3969
 msgid "Export to mbox has failed."
 msgstr "匯出至 mbox 失敗"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4010 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "離開 Clasw Mail?"
 
-#: src/mainwindow.c:4007
+#: src/mainwindow.c:4011
 msgid "_Quit"
 msgstr "離開中"
 
-#: src/mainwindow.c:4208
+#: src/mainwindow.c:4212
 msgid "Folder synchronisation"
 msgstr "資料夾同步"
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4213
 msgid "Do you want to synchronise your folders now?"
 msgstr "同步資料夾?"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4214
 msgid "_Synchronise"
 msgstr "同步(_S)"
 
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4697
 msgid "Deleting duplicated messages..."
 msgstr "正在刪除重複的郵件..."
 
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4707
 msgid "No duplicate message found in selected folder.\n"
 msgstr "選擇的路徑中沒有重複的郵件\n"
 
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4713
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4717
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
 msgstr[0] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4755
 msgid "Deleting duplicated messages in all folders..."
 msgstr "正在所有的路徑中刪除重複的郵件..."
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4761
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "已刪除 %d 重複郵件於 %d 資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於 %d 資料夾內\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4766
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "資料夾 %d 內沒有重複的郵件\n"
 
-#: src/mainwindow.c:4924 src/messageview.c:2647
+#: src/mainwindow.c:4928 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "選擇要前往的資料夾"
 
-#: src/mainwindow.c:5027 src/summaryview.c:5932
+#: src/mainwindow.c:5031 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr "在資料夾的規則進行前套用"
 
-#: src/mainwindow.c:5035
+#: src/mainwindow.c:5039
 msgid "Processing rules to apply after folder rules"
 msgstr "在資料夾的規則進行後套用"
 
-#: src/mainwindow.c:5043 src/summaryview.c:5943
+#: src/mainwindow.c:5047 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr "過濾配置"
 
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5160
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入取得可執行的路徑"
 
-#: src/mainwindow.c:5247
+#: src/mainwindow.c:5251
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail 已註冊為預設客戶端郵件程式"
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5253
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入 registry"
 
-#: src/mainwindow.c:5263 src/setup.c:91
+#: src/mainwindow.c:5267 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "掃描資料夾 %s%c%s..."
 
-#: src/mainwindow.c:5407
+#: src/mainwindow.c:5411
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "忘記了 %d 密碼於 %d 帳號內\n"
 msgstr[1] "忘記了 %d 密碼於 %d 帳號內\n"
 
-#: 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:222 src/matcher.c:223
+#: 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:222
 #, c-format
 msgid "%s header"
 msgstr "%s 標頭"
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr "標頭"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr "標頭線"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr "內容線"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr "標籤"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:536 src/matcher.c:541 src/matcher.c:560 src/matcher.c:565
 msgid "Case insensitive"
 msgstr "不區分大小寫"
 
-#: src/matcher.c:1902
+#: src/matcher.c:1901
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "檢查郵件是否相符 [ %s ]\n"
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1974 src/matcher.c:1993 src/matcher.c:2006
 msgid "message matches\n"
 msgstr "郵件相符\n"
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1981 src/matcher.c:1999 src/matcher.c:2008
 msgid "message does not match\n"
 msgstr "郵件不相符\n"
 
-#: src/matcher.c:2274 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:2273 src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276
+#: src/matcher.c:2277 src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280
 msgid "(none)"
 msgstr "(空)"
 
@@ -8330,7 +8386,7 @@ msgstr "覆寫 mbox 檔案"
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "此檔案已經鄉在,要覆寫嗎?"
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1828 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr "覆寫"
 
@@ -8559,8 +8615,8 @@ msgstr ""
 "\n"
 "  郵件已被刪除或移至其它資料夾"
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7294
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr "學習過程中發生錯誤\n"
 
@@ -8600,154 +8656,160 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "移除郵件箱"
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr "以...開啟(_w)"
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "複制"
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr "傳送到..."
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr "以文字顯示(_D)"
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr "另存新檔(_S)..."
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr "全部儲存(_a)"
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr "儲存所有的附加檔案..."
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr "MINI格式"
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1067 src/mimeview.c:1072 src/mimeview.c:1077
+#: src/mimeview.c:1082
 msgid "View full information"
 msgstr "顯示完整資訊"
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1089
 msgid "Check again"
 msgstr "再檢查一次"
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s 點選圖示去檢查它"
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1104
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s 點選圖示或點擊'%s'去檢查它 "
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1111
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "檢查簽章超時,點選圖示再試一次"
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1113
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr "檢查簽章超時,點選圖示或點擊'%s'再試一次"
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1120
 msgid "Error checking the signature. Click the icon to try again."
 msgstr "檢查簽章超時,點選圖示再試一次"
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1122
+#, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr "檢查簽章超時,點選圖示或點擊'%s'再試一次"
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1241
 msgid "Checking signature..."
 msgstr "檢查簽章..."
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1296
 msgid "Go back to email"
 msgstr "回到電子郵件"
 
-#: src/mimeview.c:1736 src/mimeview.c:1829 src/mimeview.c:2082
-#: src/mimeview.c:2118 src/mimeview.c:2230 src/plugins/fancy/fancy_viewer.c:510
-#: src/plugins/fancy/fancy_viewer.c:539
+#: src/mimeview.c:1746 src/mimeview.c:1839 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "無法儲存多重郵件的一個部份:%s"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1825
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆寫已存在的檔案 '%s' 嗎?"
 
-#: src/mimeview.c:1840
+#: src/mimeview.c:1850
+#, c-format
 msgid ""
 "An error has occurred while saving message part %d. Do you want to cancel "
 "saving or ignore error and continue?"
 msgstr "當儲存郵件的第#%d個部份時發生錯誤!確定要取消或跳過錯誤並繼續嗎?"
 
-#: src/mimeview.c:1843
+#: src/mimeview.c:1853
 msgid "Error saving message part"
 msgstr "儲存所有郵件發生錯誤"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore"
 msgstr "忽略:"
 
-#: src/mimeview.c:1844
+#: src/mimeview.c:1854
 msgid "Ignore all"
 msgstr "忽略串列"
 
-#: src/mimeview.c:1856
+#: src/mimeview.c:1866
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1878
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
-#: src/mimeview.c:1873
+#: src/mimeview.c:1883
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s,%d 檔案失敗"
 msgstr[1] "%s,%d 檔案失敗"
 
-#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1920 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "選擇目的資料夾"
 
-#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1927 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s'並不是一個路徑"
 
-#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
-#: src/summaryview.c:5017
+#: src/mimeview.c:2049 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr "另存新檔"
 
-#: src/mimeview.c:2165 src/mimeview.c:2172
+#: src/mimeview.c:2179 src/mimeview.c:2186
 msgid "Open with"
 msgstr "以...開啟"
 
-#: src/mimeview.c:2166 src/mimeview.c:2173
+#: src/mimeview.c:2180 src/mimeview.c:2187
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8756,7 +8818,7 @@ msgstr ""
 "輸入命令列以開啟檔案:\n"
 "('%s' 將被用檔名覆蓋)"
 
-#: src/mimeview.c:2268
+#: src/mimeview.c:2282
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8767,11 +8829,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2276
+#: src/mimeview.c:2290
 msgid "Execute untrusted binary?"
 msgstr "要執行不信任的二進制檔案嗎?"
 
-#: src/mimeview.c:2277
+#: src/mimeview.c:2291
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8783,20 +8845,20 @@ msgstr ""
 "\n"
 "你仍希望執行這個檔案嗎?"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2295
 msgid "Run binary"
 msgstr "執行二進制檔"
 
-#: src/mimeview.c:2583
+#: src/mimeview.c:2597
 msgid "Type:"
 msgstr "型式:"
 
-#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/mimeview.c:2598 src/plugins/pdf_viewer/poppler_viewer.c:706
 #: src/summaryview.c:2784
 msgid "Size:"
 msgstr "大小:"
 
-#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2612 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -8905,77 +8967,77 @@ msgstr "取消訂閱新聞群組"
 msgid "Rename newsgroup folder"
 msgstr "新聞群組資料夾重新命名"
 
-#: src/oauth2.c:241
+#: src/oauth2.c:244
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 缺少認證碼\n"
 
-#: src/oauth2.c:247 src/oauth2.c:388
+#: src/oauth2.c:250 src/oauth2.c:393
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 連線錯誤\n"
 
-#: src/oauth2.c:257 src/oauth2.c:397
+#: src/oauth2.c:262 src/oauth2.c:404
 msgid "OAuth2 TLS connection error\n"
 msgstr "OAuth2 SSL 連線錯誤\n"
 
-#: src/oauth2.c:336 src/oauth2.c:470
+#: src/oauth2.c:341 src/oauth2.c:477
 msgid "OAuth2 access token obtained\n"
 msgstr "已取得OAuth2 的取存token\n"
 
-#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+#: src/oauth2.c:343 src/oauth2.c:479 src/oauth2.c:655
 msgid "OAuth2 access token not obtained\n"
 msgstr "未取得OAuth2 的取存token\n"
 
-#: src/oauth2.c:345
+#: src/oauth2.c:350
 msgid "OAuth2 refresh token obtained\n"
 msgstr "已取得OAuth2 的更新token\n"
 
-#: src/oauth2.c:347
+#: src/oauth2.c:352
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "未取得OAuth2 的更新token\n"
 
-#: src/oauth2.c:479
+#: src/oauth2.c:486
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "已取得OAuth2 的更新token\n"
 
-#: src/oauth2.c:481
+#: src/oauth2.c:488
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "未取得OAuth2 的更新token\n"
 
-#: src/oauth2.c:512
+#: src/oauth2.c:520
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 Socket寫入錯誤\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:542
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 socket 逾時錯誤\n"
 
-#: src/oauth2.c:628
+#: src/oauth2.c:636
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 存取token仍有效\n"
 
-#: src/oauth2.c:635
+#: src/oauth2.c:643
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 正以更新token取得存取token\n"
 
-#: src/oauth2.c:639
+#: src/oauth2.c:647
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 正以認證碼嘗試更新存取token\n"
 
-#: src/oauth2.c:656
+#: src/oauth2.c:666
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 存取token已更新\n"
 
-#: src/oauth2.c:688
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 原始的:%s\n"
 
-#: src/oauth2.c:689
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 已加密: %s\n"
 
-#: src/oauth2.c:690
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -8984,11 +9046,11 @@ msgstr ""
 "OAuth2 已解碼: %s\n"
 "\n"
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr "在鍵入密碼時擷取輸入內容"
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr "不正確的區塊"
 
@@ -9401,7 +9463,7 @@ msgstr "是"
 #: src/plugins/archive/archiver_gtk.c:853
 #: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
-#: src/prefs_summaries.c:407
+#: src/prefs_summaries.c:449
 msgid "No"
 msgstr "否"
 
@@ -9418,7 +9480,7 @@ msgid "Delete selected files"
 msgstr "刪除選擇的檔案"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr "先選擇郵件"
 
@@ -9430,97 +9492,97 @@ msgstr "選擇封存資料夾"
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr "選擇封存檔案名稱 [後綴將類似 .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld of %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr "建立新的封存"
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr "輸入封存命令"
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr "封存資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr "封存資料夾的根目錄"
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "按下此鍵為封存資料夾選擇根目錄"
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr "封存名稱"
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr "封存路徑和名稱"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
 #: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "選擇(_S)"
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr "按下此鍵為封存選擇名稱和路徑"
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr "選擇壓縮方式"
 
-#: src/plugins/archive/archiver_gtk.c:1112
-#: src/plugins/archive/archiver_gtk.c:1118
-#: src/plugins/archive/archiver_gtk.c:1124
-#: src/plugins/archive/archiver_gtk.c:1131
-#: src/plugins/archive/archiver_gtk.c:1137
-#: src/plugins/archive/archiver_gtk.c:1145
-#: src/plugins/archive/archiver_gtk.c:1153
-#: src/plugins/archive/archiver_gtk.c:1159
-#: src/plugins/archive/archiver_gtk.c:1165
-#: src/plugins/archive/archiver_gtk.c:1173
-#: src/plugins/archive/archiver_gtk.c:1180
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 壓縮功能"
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr "選擇格式"
 
-#: src/plugins/archive/archiver_gtk.c:1241
-#: src/plugins/archive/archiver_gtk.c:1247
-#: src/plugins/archive/archiver_gtk.c:1253
-#: src/plugins/archive/archiver_gtk.c:1259
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 格式"
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr "雜項選項"
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr "遞迴(_R)"
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr "選擇這個選項,將在封存中包含子資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr "MD5檢查碼(_M)"
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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"
@@ -9530,11 +9592,11 @@ msgstr ""
 "必需要了解的是,這個功能將會在新建封存時,增加不少的時間\n"
 " "
 
-#: src/plugins/archive/archiver_gtk.c:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr "修改名稱(_e)"
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9545,7 +9607,7 @@ msgstr ""
 "名稱的設計為: 日期起源@至@主旨\n"
 "名稱長度將被限制為最長96個字元"
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9553,11 +9615,11 @@ msgstr ""
 "選擇這個選項,將在封存後刪除郵件\n"
 "此功能只能套用在 IMAP4,本地郵件箱和 POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr "選擇選項"
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9648,7 +9710,7 @@ msgstr "移除附加檔"
 msgid "Remove"
 msgstr "移除"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:712
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "附加檔"
@@ -9805,19 +9867,19 @@ msgstr ""
 msgid "Exclude"
 msgstr "不包含"
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:196
 #: src/plugins/bsfilter/bsfilter_gtk.c:265
 #: src/plugins/bsfilter/bsfilter_gtk.c:325
-#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin.c:121
 #: src/plugins/spamassassin/spamassassin_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
@@ -9827,15 +9889,15 @@ msgstr "Bogofilter"
 msgid "Any"
 msgstr "任何"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: 正在取得內容..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: 正在取得郵件..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -9847,28 +9909,28 @@ msgstr ""
 "使用 \"/Mark/Mark as spam\" 和 \"/Mark/Mark as ham\" 來對 Bogofilter 進行訓"
 "練,建議使用數百個垃圾郵件及一般郵件來進行。"
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 msgstr "此Bogofilter外掛程式無法過濾一個郵件。這個命令 `%s %s %s` 無法被執行"
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: 從郵件中學習..."
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "學習失敗; `%s` 返回狀態為 %d."
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: 從郵件中學習..."
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9877,7 +9939,7 @@ msgstr ""
 "學習失敗; `%s %s %s` 返回錯誤:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 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 "
@@ -9902,13 +9964,13 @@ msgstr ""
 "\n"
 "可以在/Configuration/Preferences/Plugins/Bogofilter中找到所有的選項"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr "垃圾郵件偵測"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr "垃圾郵件學習中"
 
@@ -9932,7 +9994,7 @@ msgstr "郵件大小超過此將不被檢查"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
 msgid "KiB"
 msgstr "KB"
 
@@ -10032,19 +10094,19 @@ msgstr "bogofilter執行檔案的路徑"
 msgid "Mark spam as read"
 msgstr "將垃圾郵件標記為已讀"
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: 取得內容..."
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: 過濾郵件"
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -10056,18 +10118,18 @@ msgstr ""
 "使用 \"/Mark/Mark as spam\" 和 \"/Mark/Mark as ham\" 來對Bsfilter進行訓練,建"
 "議使用數百個垃圾郵件及一般郵件來進行。"
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr "此Bsfilter外掛程式無法過濾一封郵件,無法執行`%s`這個命令"
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: 從郵件進進行學習..."
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -10400,65 +10462,52 @@ msgstr ""
 "\n"
 "它並不是真的那麼有用"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr "顯示圖片"
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr "顯示內嵌的圖片"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr "執行 javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr "執行內嵌的 javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr "執行 Java applets"
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr "執行內嵌的 Java applets"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr "使用外掛程式處理物件"
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr "使用外掛程式處理內嵌的物件"
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr "在顯示視窗中開啟 (使用遠端資源)"
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr "無效 (使用遠端資源)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr "代理伺服器"
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr "使用 GNOME 的代表伺服器設定"
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr "使用代理伺服器"
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr "遠端資源"
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -10470,115 +10519,120 @@ msgstr ""
 "要求。\n"
 "對於郵件中有夾帶的圖片、scripts、外掛物件或Java applets,則依然可以進行處理"
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "載入遠端資源"
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr "當按下超連結,預設將執行"
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr "在外部瀏覽器開啟"
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "此檔案內的CSS將套用在所有的HTML上"
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: src/plugins/notification/notification_prefs.c:1334
-#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2537
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "瀏覽(W)"
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr "選擇風格"
 
-#: src/plugins/fancy/fancy_viewer.c:478
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr "不載入遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:587
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr "載入圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:589
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr "使用遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:591
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr "啟用 Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:593
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: src/plugins/fancy/fancy_viewer.c:595
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr "啟用 Java"
 
-#: src/plugins/fancy/fancy_viewer.c:597
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr "以外部瀏覽器開啟連結"
 
-#: src/plugins/fancy/fancy_viewer.c:793
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "發生錯誤: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:853
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s 是一個畸形或不支援的輸入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:875
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr "在檢視器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr "在瀏覽器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr "開啟圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:903
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr "複製連結"
 
-#: src/plugins/fancy/fancy_viewer.c:908
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr "下載連結"
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr "另存圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:929
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:967
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr "匯入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:1260
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr "Fancy"
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr "尋找 WebKit 擴展套件 %s 失敗"
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1288
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML 檢視器"
 
-#: src/plugins/fancy/fancy_viewer.c:1293
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10675,180 +10729,8 @@ msgid ""
 "RFC822 format"
 msgstr "將RFC822格式郵件內之取得時程和時間加入 the X-FETCH-TIME 標頭"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "GData外掛程式: 需要認證"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"你需要認證Claws Mail,才能使用GData外掛程式存取你的Google連絡人清單\n"
-"\n"
-"按下下方的按鈕以參訪Google的認證頁。當你確認了認證後,將可以取得認證碼。在下"
-"方的區域中輸入這組認證碼後,你將可以使用Claws Mail對Google連絡人清單進行存取 "
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr "步驟1:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr "按下這裡在瀏覽器內開啟Google認證頁"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr "步驟2:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr "輸入認證碼:"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr "GData外掛程式: 連個人查詢錯誤: %s\n"
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] "新增 %d 至"
-msgstr[1] "新增 %d 至"
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] "1 個連絡人加入至快取"
-msgstr[1] "%d 個連絡人加入至快取"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr "GData外掛程式: 開始進行非同步連絡人查詢\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr "GData外掛程式: 群組查詢錯誤: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr "GData外掛程式: 群組已接收\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr "GData外掛程式: 開始非同步的群組查尋\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData外掛程式:認證錯誤: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "GData外掛程式: 認證成功\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-msgstr "GData外掛程式: 開始進行內部認證\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:483
-msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData外掛程式: 已取得認證碼,要求認證\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr "GData外掛程式:沒有收到認證碼,認證要求取消\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr "GData外掛程式: 認證執行中,沒有已執行的額外項目\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData外掛程式: 認證刷新失敗: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData外掛程式: 認證刷新成功\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-"GData 外掛: 從上次刷新開始到現在所經過的時間: %d 分鐘,目前正在刷新中\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData外掛程式: 正在嘗試刷新認證\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
-msgid "Authentication"
-msgstr "認證"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr "使用者名稱"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr "輪詢間隔時間(秒)"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr "結果的最大數量"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr "GData"
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr "在GData外掛程式中註冊地址自動完成Hook失敗"
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr "在GData外掛程式中註冊離線開關Hook失敗"
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-"此外掛程式提供了Claws Mail具備GData通訊協定的存取能力.\n"
-"\n"
-"GData通訊協定是一個Google服務的界面\n"
-"截至目前,只實作了將Google連絡人加入Tab-address自動完成的功能\n"
-"歡迎回饋給 <berndth at gmx.de>"
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr "GData整合"
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
+#, c-format
 msgid ""
 "A keyword is used in the mail you are sending. The keyword appears on line "
 "%d, which begins with the text: %s\n"
@@ -10875,8 +10757,7 @@ msgid ""
 "Shows a warning when sending or queueing a message and a reference to one or "
 "more keywords is found in the message text."
 msgstr ""
-"當信件傳送或暫存信件時,若在郵件中參考到一個或多個關鍵字時,"
-"顯示警告訊息"
+"當信件傳送或暫存信件時,若在郵件中參考到一個或多個關鍵字時,顯示警告訊息"
 
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:138
 msgid "Don't check for keywords when forwarding or redirecting messages"
@@ -11007,8 +10888,8 @@ msgid "Cache refresh interval"
 msgstr "快取刷新的間隔時間"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1693
-#: src/prefs_account.c:1853 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr "小時"
 
@@ -11154,11 +11035,11 @@ msgstr "影像快取大小 megabytes"
 msgid "Default font"
 msgstr "預設字型"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr "開啟連結"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr "複製連結路徑"
 
@@ -11252,7 +11133,7 @@ msgstr "認證方法無效"
 msgid "sending error on Sieve session: %s\n"
 msgstr "在Sieve程序中發生傳送錯誤: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr "過濾器(_F)"
 
@@ -11384,7 +11265,7 @@ msgstr "在伺服器上使用ManageSieve協定管理Sieve過濾器"
 msgid "Enable Sieve"
 msgstr "啟用Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr "伺服器資訊"
 
@@ -11420,8 +11301,12 @@ msgstr "當STARTTLS有效機使用它"
 msgid "Require STARTTLS"
 msgstr "需要STARTTLS"
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2047
+msgid "Authentication"
+msgstr "認證"
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr "沒有認證"
 
@@ -11435,28 +11320,28 @@ msgstr "指定認證"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
-#: src/prefs_account.c:2073
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2097
 msgid "User ID"
 msgstr "使用者名稱"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1464
-#: src/prefs_account.c:2096 src/prefs_account.c:3036 src/prefs_account.c:3064
-#: src/prefs_account.c:3259 src/prefs_proxy.c:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2120 src/prefs_account.c:3060 src/prefs_account.c:3088
+#: src/prefs_account.c:3283 src/prefs_proxy.c:134
 msgid "Password"
 msgstr "密碼"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
-#: src/prefs_account.c:1775 src/prefs_account.c:2041
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2065
 msgid "Authentication method"
 msgstr "認證方式"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1785
-#: src/prefs_account.c:2050 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2074 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr "自動"
 
@@ -11753,7 +11638,7 @@ msgid "Never"
 msgstr "從不"
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:592 src/prefs_summaries.c:645
 msgid "Always"
 msgstr "總是"
 
@@ -12357,9 +12242,9 @@ msgstr "過期了"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "設定為 '0' 將會為整個程序儲存密碼"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
-#: src/prefs_account.c:2162 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2186 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "分"
 
@@ -12568,106 +12453,107 @@ msgstr "來自於 \"%s\" 的不良簽名,"
 msgid "The signature has not been checked"
 msgstr "這個簽名尚未被檢查過"
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr "檢查簽名發生錯誤:沒有狀態\n"
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "檢查簽名發生錯誤: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "此簽名是以 %s 製作,使用 %s 金鑰 ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的良好簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "逾期的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的逾期簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "已撤銷的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "來自 \"%s\" 的不良簽名\n"
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
+#, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "uid\"%s\"(有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr "已撤銷"
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "擁有者信任: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr "沒有金鑰!"
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr "主要的金鑰指紋:"
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告:簽名者的地址 \"%s\" 和DNS項目不符合\n"
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "已驗證的簽名者地址是 \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "無法取得來自郵件 %s 的資料"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "無法初始化資料, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr "密鑰規格模稜兩可"
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "無不到密鑰 (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "設定密鑰錯誤: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme 協定 '%s' 無法使用:引擎 '%s' 尚未被正確的安裝"
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12676,12 +12562,12 @@ msgstr ""
 "Gpgme 協定 '%s' 無法使用:已安裝引擎 '%s' ,版本為 %s,但是 需要的版本應為 "
 "%s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme 協定 '%s' 無法使用 (未知的問題)"
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12689,17 +12575,17 @@ msgstr ""
 "GnuPG 尚未正確的安裝,或是需要升級\n"
 "OpenPGP支援已關閉"
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr "你必需要先按下\"OK\"鍵,以儲存帳號的資訊,才能產生一對金鑰\n"
 
-#: src/plugins/pgpcore/sgpgme.c:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr "找不到PGP金鑰"
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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"
@@ -12709,22 +12595,22 @@ msgstr ""
 "件\n"
 "你確定現在要產生一對新的金鑰嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "無法產生一對新的金鑰: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "你的新金鑰對正在建立中... 請將移動滑鼠以利產生... generate entropy..."
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "無法產生新的金鑰對: 未知的錯誤"
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12737,15 +12623,15 @@ msgstr ""
 "\n"
 "你要將它匯出至金鑰伺服器嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr "金鑰已產生"
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr "金鑰已匯出"
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr "無法匯出金鑰"
 
@@ -12945,12 +12831,12 @@ msgid "Show Python console..."
 msgstr "顯示 Python 控制台..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr "更新"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3025
-#: src/prefs_account.c:3053 src/prefs_account.c:3482 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3049
+#: src/prefs_account.c:3077 src/prefs_account.c:3506 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr "瀏覽"
@@ -13057,26 +12943,26 @@ msgstr ""
 "無法讀取舊版的 feeds.xml 標案內容:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl:  當寫入'%s'以匯出feed清單時發生錯誤\n"
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: 無法刪除舊版本的 OPML 檔案 '%s': %s\n"
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr "RSSyl: 無法開啟檔案 '%s' 以匯出feed清單: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: 寫入feed匯出檔案時發生錯誤\n"
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -13089,7 +12975,7 @@ msgstr ""
 "\n"
 "資料夾名稱 '%s' 是不允許的"
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -13103,137 +12989,137 @@ msgstr ""
 "每一個從網路上擷取的新聞feeds,將會以合適的進入點建立一個資料夾。你可以讀取、"
 "刪除或是保留舊有的進入點 "
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(空白)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr "更新所有的feeds"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr "訂閱feed"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "輸入你希望訂閱的新聞feed的URL:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' 不能用於資料夾名稱"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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需要網路的存取能力才能進行feed的更新"
 msgstr[1] "Claws Mail需要網路的存取能力才能進行feed的更新"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "你確定要移除feed `%s' 的樹狀結構嗎?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr "移除feed的樹狀結構"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr "選擇一個 OPML 檔案"
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr "RSSyl: 訂閱新的feed: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr "RSSyl: 已訂閱新的feed: '%s' (%s)\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr "RSSyl: 正在更新 feed: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr "RSSyl: 已完成更新 feed: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr "RSSyl: 在 '%s' 擷取feed時發生錯誤: %s\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr "RSSyl: 在 '%s' 沒有合法的 feed\n"
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr "RSSyl: 無法在 '%s' 進行 feed \n"
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: 應用程式已經存在,無法在 '%s' 結束feed的更新動作\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr "HTTP 基礎認證"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr "使用預設更新時間"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr "保持舊有的項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr "對齊(_T)"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "更新 feed,刪除那些已經不在來源feed內的項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr "如果可以的話擷取註解"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr "永遠標示為新feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr "只有當此文件內容異動時,才會把它標示為新文件"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr "永遠不要標示為新feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr "增加項目的標題至郵件的頂端"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr "忽略標題的變更"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13241,94 +13127,94 @@ msgstr ""
 "啟用這個功能可以保持目前的資料夾名稱,甚至當feed作者改變feed的標題時也一樣有"
 "效"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr "驗證 SSL/TLS 認證的有效期限"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr "使用者名稱"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr "來源 URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr "如果可以的話擷取註解,貼文出現至今少於"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "天"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr "設定為 -1 時將會擷取所有的註解"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr "如果項目改變了"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr "項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr "刷新的間隔時間"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "若要關閉此feed的自動更新功能,將它設定為0"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr "設定 feed 屬性"
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr "更新 feed(_R)"
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr "Feed 屬性(_o)"
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr "修改名稱(_m)"
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr "全部更新(_e)"
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr "加入新feed(_n)"
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr "建立新資料夾(_f)"
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr "匯入 feed 清單"
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr "移除 feed"
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr "加入RSS資料夾"
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr "請為新的RSS資料夾輸入新的名稱"
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -13337,90 +13223,90 @@ msgstr ""
 "建立資料夾失敗\n"
 "可能某些檔案已經存在或沒有存取的權限"
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr "我的Feeds"
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr "選擇cookies檔案"
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr "預設更新時間"
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
-msgstr "啟動時更新所有feeds"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
+msgstr "啟動時刷新所有的feeds"
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr "對所有新的feeds進行SSL/TLS認證的驗證"
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr "Cookies檔案路徑"
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr "在指向 Netscape-style 的 cookies.txt 檔案包含了你的 cookies"
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr "更新"
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr "安全與隱私"
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr "無法建為新的feed '%s' 建立資料夾"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr "加入新 feed 嗎?"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr "Feed 資料夾:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr "你可以為 feed 輸入一個不同的資料夾名稱,以及代官方的預設名稱"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr "加入後編輯 feed 屬性(_E)"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "為 '%s' 更新註解..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (要求認證)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr "403 (無法認證)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1632
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (找不到)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr "錯誤 %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -13433,7 +13319,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -13442,21 +13328,21 @@ msgstr ""
 "在<b>%s</b>\n"
 "沒有有效的 feed"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr "無標題的 Feed"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: 可能在 '%s' 中存在不合法的 feed 沒有主旨\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "正在更新 feed '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -13468,11 +13354,11 @@ msgstr ""
 "進行 feed\n"
 "請連絡開發人員,這是不應該發生的。"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail 需要網路存取,以更新你的 feeds."
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -13570,41 +13456,45 @@ msgstr ""
 msgid "Spam reporting"
 msgstr "垃圾郵件提報"
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr "啟用"
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr "轉寄至:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr "使用者名稱"
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "垃圾暗殺者(SpamAssassin)"
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "垃圾暗殺者(SpamAssassin)外掛程式無法連接到 spamd\n"
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin外掛程式過濾失敗\n"
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin外掛程式藉由它的選項被關閉了\n"
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: 過濾郵件..."
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 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 "
@@ -13613,21 +13503,21 @@ msgstr ""
 "SpamAssassin外掛程式無法過濾一個郵件。這可能是因為無法連繫到spamd。請確認 "
 "spamd 已經執行而且是可以被存取的。 "
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
 msgstr "Claws Mail 需要網路的存取能力才能將郵件送至遠端的學習器  "
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr "取得使用者名稱失敗"
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin外掛程式已載入,但是已在它的選項目被關閉了。\n"
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -14083,63 +13973,68 @@ msgstr "出席人員:"
 msgid "Action:"
 msgstr "動作:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_New meeting..."
 msgstr "新會議(_N)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Export calendar..."
 msgstr "匯出行事曆(_E)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Subscribe to Webcal..."
 msgstr "向webCal訂閱(_S)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Rename..."
 msgstr "修改名稱(_R)"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "U_pdate subscriptions"
 msgstr "更新訂閱(_p)"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_List view"
 msgstr "檢視清單(_L)"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Week view"
 msgstr "以週檢視(_W)"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Month view"
 msgstr "以月份檢視(_M)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1100
 msgid "Meetings"
 msgstr "會議"
 
-#: src/plugins/vcalendar/vcal_folder.c:1501
+#: src/plugins/vcalendar/vcal_folder.c:1478
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr "[無摘要]"
+
+#: src/plugins/vcalendar/vcal_folder.c:1499
 msgid "in the past"
 msgstr "在過去"
 
-#: src/plugins/vcalendar/vcal_folder.c:1504
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "today"
 msgstr "今天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1507
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "tomorrow"
 msgstr "明天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "this week"
 msgstr "本週"
 
-#: src/plugins/vcalendar/vcal_folder.c:1513
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "later"
 msgstr "稍後"
 
-#: src/plugins/vcalendar/vcal_folder.c:1517
+#: src/plugins/vcalendar/vcal_folder.c:1515
 #, c-format
 msgid ""
 "\n"
@@ -14148,21 +14043,21 @@ msgstr ""
 "\n"
 "這些是已計劃的事件 %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "已超時 (%d 秒),發生在連線至 %s 時\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "403 (Unauthorised)"
 msgstr "403 (無法認證)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1635
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "錯誤 %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1809
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14175,7 +14070,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1840
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14186,110 +14081,110 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1873
-#: src/plugins/vcalendar/vcal_folder.c:1876
+#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1874
 #, c-format
 msgid "Could not create directory %s"
 msgstr "無法建立目錄 %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1916
+#: src/plugins/vcalendar/vcal_folder.c:1914
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail 需要網路的存取能力以更新Webcal feed"
 
-#: src/plugins/vcalendar/vcal_folder.c:1927
+#: src/plugins/vcalendar/vcal_folder.c:1925
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "為 %s 取得行事曆..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1928
+#: src/plugins/vcalendar/vcal_folder.c:1926
 msgid "new subscription"
 msgstr "新的訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1939
+#: src/plugins/vcalendar/vcal_folder.c:1937
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail 需要網路的存取能力以進行訂閱更新"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Subscribe to Webcal"
 msgstr "向WebCal訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1984
+#: src/plugins/vcalendar/vcal_folder.c:1982
 msgid "Enter the Webcal URL:"
 msgstr "輸入WebCal的URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2000
+#: src/plugins/vcalendar/vcal_folder.c:1998
 msgid "Could not parse the URL."
 msgstr "無法解析此URL"
 
-#: src/plugins/vcalendar/vcal_folder.c:2028
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Do you really want to unsubscribe?"
 msgstr "你確定要取消訂閱?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2029
+#: src/plugins/vcalendar/vcal_folder.c:2027
 msgid "Delete subscription"
 msgstr "取消訂閱"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr "已接受"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr "已暫時接受"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr "拒絕"
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr "尚未回覆"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr "個人"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr "群組"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr "資源"
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr "處室"
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr "過去"
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr "今天"
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr "明天"
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr "本週"
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr "稍後"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr "接受:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr "拒絕:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr "暫時接受:"
 
@@ -14692,95 +14587,95 @@ msgstr "在問候語中的時間戳記語法錯誤\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "在問候語中的時間戳記語法錯誤 (非ASCII)\n"
 
-#: src/pop.c:218 src/pop.c:245
+#: src/pop.c:265 src/pop.c:292
 msgid "POP protocol error\n"
 msgstr "POP3 協定錯誤\n"
 
-#: src/pop.c:291
+#: src/pop.c:338
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無效的 UIDL 回應: %s\n"
 
-#: src/pop.c:874
+#: src/pop.c:926
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP3: 刪除已過期的郵件 %d [%s]\n"
 
-#: src/pop.c:890
+#: src/pop.c:942
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d [%s] (%d 位元)\n"
 
-#: src/pop.c:922
+#: src/pop.c:975
 msgid "mailbox is locked\n"
 msgstr "郵件箱已鎖定\n"
 
-#: src/pop.c:925
+#: src/pop.c:978
 msgid "Session timeout\n"
 msgstr "通信超時\n"
 
-#: src/pop.c:944
+#: src/pop.c:997
 msgid "command not supported\n"
 msgstr "未支援的命令\n"
 
-#: src/pop.c:949
+#: src/pop.c:1002
 msgid "error occurred on POP session\n"
 msgstr "POP3通信發生錯誤\n"
 
-#: src/pop.c:1156
+#: src/pop.c:1214
 msgid "TOP command unsupported\n"
 msgstr "未支援的頂端命令\n"
 
-#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2977
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2992
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:416
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account.c:417 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "本地 mbox 檔案"
 
-#: src/prefs_account.c:418
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "空  (只針對SMTP)"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr "帳號名稱"
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr "設定為預設值"
 
-#: src/prefs_account.c:1246
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account.c:1255
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr "郵件地址"
 
-#: src/prefs_account.c:1321 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "自動配置"
 
-#: src/prefs_account.c:1323 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr "取消"
 
-#: src/prefs_account.c:1340
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14788,387 +14683,391 @@ msgstr ""
 "警告:此 Claws Mail 編譯版本未支援\n"
 "IMPA 和 新聞功能"
 
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr "此伺服器要求認證"
 
-#: src/prefs_account.c:1375
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr "連線時進行認證"
 
-#: src/prefs_account.c:1425
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account.c:1430
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr "POP3 伺服器 (接收)"
 
-#: src/prefs_account.c:1435
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr "本地郵件夾"
 
-#: src/prefs_account.c:1440
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr "SMTP 伺服器 (傳送)"
 
-#: src/prefs_account.c:1446
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr "與其使用郵件命令,不如使用 SMTP 伺服器"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr "傳送郵件命令"
 
-#: src/prefs_account.c:1519
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr "本地"
 
-#: src/prefs_account.c:1604 src/prefs_account.c:1726
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr "預設收件夾"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
-#: src/prefs_account.c:1739
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未過濾郵件將被儲存在這個資料夾"
 
-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr "POP連線前進行認證"
 
-#: src/prefs_account.c:1651 src/prefs_account.c:2261
+#: src/prefs_account.c:1657 src/prefs_account.c:2285
 msgid "Select"
 msgstr "選擇"
 
-#: src/prefs_account.c:1662
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr "郵件接收後從伺服器上移除"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr "超過"
 
-#: src/prefs_account.c:1680 src/prefs_account.c:1690
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 天 0 小時後: 立刻移除"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 "郵件超過此限制將被部份接收,當選擇它們後,你將可以把它們全部下找或刪除。"
 
-#: src/prefs_account.c:1745 src/prefs_account.c:2983
+#: src/prefs_account.c:1751 src/prefs_account.c:3007
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr "可允許最大的郵件下載數量"
 
-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr "若設為0代表沒有限制"
 
-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr "尋找字串:"
 
-#: src/prefs_account.c:1804
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr "(通常是空白的)"
 
-#: src/prefs_account.c:1822
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr "只顯示訂閱資料夾"
 
-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "寬頻效果模式 (防止接到遠端的標籤)"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "此模式使用較少的頻寬,對於某此伺服器可能會有速度較慢的情況發生"
 
-#: src/prefs_account.c:1838 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr "批次大小"
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "自動檢查"
 
-#: src/prefs_account.c:1841
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr "使用全域設定"
 
-#: src/prefs_account.c:1847 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "檢查新郵件頻率"
 
-#: src/prefs_account.c:1886
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr "接收郵件時允許使用外掛程式進行過濾"
 
-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'接收郵件' 檢查此帳號的新郵件"
 
-#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:208
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "郵件標頭"
 
-#: src/prefs_account.c:1998
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr "產生  Message-ID"
 
-#: src/prefs_account.c:2001
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr "將傳送帳號的郵件地址放入  Message-ID"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2028
 msgid "Add user agent header"
 msgstr "加入使用者代理郵件標頭"
 
-#: src/prefs_account.c:2011
+#: src/prefs_account.c:2035
 msgid "Add user-defined header"
 msgstr "加入使用者自訂郵件標頭"
 
-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2050
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account.c:2128
+#: src/prefs_account.c:2152
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若以下欄位空白,將以使用者名稱和密碼進行接收"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2163
 msgid "Authenticate with POP before sending"
 msgstr "傳送前用 POP3 認證"
 
-#: src/prefs_account.c:2154
+#: src/prefs_account.c:2178
 msgid "POP authentication timeout"
 msgstr "POP 認證超時:"
 
-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2259
 msgid "Authorization"
 msgstr "認證"
 
-#: src/prefs_account.c:2252
+#: src/prefs_account.c:2276
 msgid "Select OAuth2 Email Service Provider"
 msgstr "選擇 OAuth2 電子郵件服務提供者"
 
-#: src/prefs_account.c:2292
+#: src/prefs_account.c:2316
 msgid "Client ID"
 msgstr "客戶端 ID"
 
-#: src/prefs_account.c:2303
+#: src/prefs_account.c:2327
 msgid "Client secret"
 msgstr "客戶端安全"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2352
 msgid "Obtain authorization code"
 msgstr "取得認證碼"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2356
 msgid "Open default browser with request"
 msgstr "按照要求開啟預設的瀏覽器"
 
-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2363
 msgid "Copy link"
 msgstr "複製連結"
 
-#: src/prefs_account.c:2352
+#: src/prefs_account.c:2376
 msgid "Authorization code"
 msgstr "認證碼"
 
-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2385
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr "貼上來自於瀏覽器的完整URL或提供認證token"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2392
 msgid "Complete authorization"
 msgstr "完成認證"
 
-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2396
 msgid "Authorize"
 msgstr "授權"
 
-#: src/prefs_account.c:2459 src/prefs_account.c:2505
+#: src/prefs_account.c:2483 src/prefs_account.c:2529
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account.c:2462
+#: src/prefs_account.c:2486
 msgid "Automatically insert signature"
 msgstr "自動插入簽名"
 
-#: src/prefs_account.c:2467
+#: src/prefs_account.c:2491
 msgid "Signature separator"
 msgstr "簽名分隔線"
 
-#: src/prefs_account.c:2492
+#: src/prefs_account.c:2516
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2549
 msgid "Automatically set the following addresses"
 msgstr "自動設置轉寄地址"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2598
 msgid "Spell check dictionaries"
 msgstr "併字檢查字典"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2608 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "預設定典"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2620 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "預設替代定典"
 
-#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: src/prefs_account.c:2705 src/prefs_account.c:4196
 #: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
 #: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "新郵件"
 
-#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2720 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "回覆"
 
-#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2735 src/prefs_filtering_action.c:183
 #: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2782
 msgid "Default privacy system"
 msgstr "預設的隱私系統"
 
-#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2811 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "總是進行郵件簽章"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2813 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "總是將郵件加密"
 
-#: src/prefs_account.c:2791
+#: src/prefs_account.c:2815
 msgid "Always sign messages when replying to a signed message"
 msgstr "當回覆簽章郵件時,總是將郵件進行簽章"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:2818
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "當回覆已加密郵件時,總是將郵件進行加密"
 
-#: src/prefs_account.c:2797
+#: src/prefs_account.c:2821
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "除了收件者外,將已傳送的郵件用私有金鑰進行加密"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2823
 msgid "Save sent encrypted messages as clear text"
 msgstr "將已傳送的加密郵件儲存為明碼文件"
 
-#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+#: src/prefs_account.c:2981 src/prefs_account.c:2996 src/prefs_account.c:3010
 msgid "Don't use TLS"
 msgstr "不使用 SSL/TLS"
 
-#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
-#: src/prefs_account.c:3006
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3019
+#: src/prefs_account.c:3030
 msgid "Use TLS"
 msgstr "使用 SSL/TLS"
 
-#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3033
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "使用 STARTTLS 命令啟用加密通訊"
 
-#: src/prefs_account.c:2999
+#: src/prefs_account.c:3023
 msgid "Send (SMTP)"
 msgstr "傳送 (SMTP)"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3027
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "不使用 SSL/TLS (若需要,使用 STARTTLS)"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3038
 msgid "Client certificates"
 msgstr "客戶端認證"
 
-#: src/prefs_account.c:3022
+#: src/prefs_account.c:3046
 msgid "Certificate for receiving"
 msgstr "進行接收認證"
 
-#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
-#: src/prefs_account.c:3057
+#: src/prefs_account.c:3051 src/prefs_account.c:3053 src/prefs_account.c:3079
+#: src/prefs_account.c:3081
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "客戶端認證檔案為 PKCS12 或 PEM 檔"
 
-#: src/prefs_account.c:3050
+#: src/prefs_account.c:3074
 msgid "Certificate for sending"
 msgstr "進行傳送認證"
 
-#: src/prefs_account.c:3090
+#: src/prefs_account.c:3114
 msgid "Automatically accept valid TLS certificates"
 msgstr "自動接放不明的合法 SSL/TLS 認證"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3117
 msgid "Use non-blocking TLS"
 msgstr "使用非阻斷式 SSL/TLS"
 
-#: src/prefs_account.c:3105
+#: src/prefs_account.c:3129
 msgid "Turn this off if you have TLS connection problems"
 msgstr "如果發生 SSL/TLS 連線問題,請把此功能關閉"
 
-#: src/prefs_account.c:3197 src/prefs_proxy.c:75
+#: src/prefs_account.c:3221 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "使用代理伺服器"
 
-#: src/prefs_account.c:3206
+#: src/prefs_account.c:3230
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "使用預設值"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3232
 msgid "Use global proxy server settings"
 msgstr "使用全域的代理伺服器設定"
 
-#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3269 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "使用認證"
 
-#: src/prefs_account.c:3250 src/prefs_proxy.c:125
+#: src/prefs_account.c:3274 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "使用者名稱"
 
-#: src/prefs_account.c:3279
+#: src/prefs_account.c:3303
 msgid "Use proxy server for sending"
 msgstr "使用代理伺服器寄送郵件"
 
-#: src/prefs_account.c:3281
+#: src/prefs_account.c:3305
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15176,200 +15075,204 @@ msgstr ""
 "若關閉此功能,郵件將忽略任何設置的代理伺服器,轉而使用已設置的外部伺服器直接"
 "連線並寄送郵件"
 
-#: src/prefs_account.c:3392
+#: src/prefs_account.c:3416
 msgid "SMTP port"
 msgstr "SMTP 通訊埠"
 
-#: src/prefs_account.c:3399
+#: src/prefs_account.c:3423
 msgid "POP port"
 msgstr "POP3 通訊埠"
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3430
 msgid "IMAP port"
 msgstr "IMAP4 通訊埠"
 
-#: src/prefs_account.c:3413
+#: src/prefs_account.c:3437
 msgid "NNTP port"
 msgstr "NNTP 通訊埠"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3443
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: src/prefs_account.c:3422
+#: src/prefs_account.c:3446
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr "網域名稱將被用來產生 Message-ID 以及當要連接到 SMTP 伺服器時"
 
-#: src/prefs_account.c:3436
+#: src/prefs_account.c:3460
 msgid "Use command to communicate with server"
 msgstr "以命令和伺服器進行通訊"
 
-#: src/prefs_account.c:3445
+#: src/prefs_account.c:3469
 msgid "Mark cross-posted messages as read and color:"
 msgstr "標示已傳送郵件為已讀並更改顏色"
 
-#: src/prefs_account.c:3494
+#: src/prefs_account.c:3518
 msgid "Put sent messages in"
 msgstr "郵已傳送郵件放在"
 
-#: src/prefs_account.c:3496
+#: src/prefs_account.c:3520
 msgid "Put queued messages in"
 msgstr "將暫存郵件放在"
 
-#: src/prefs_account.c:3498
+#: src/prefs_account.c:3522
 msgid "Put draft messages in"
 msgstr "將草稿郵件放在"
 
-#: src/prefs_account.c:3500
+#: src/prefs_account.c:3524
 msgid "Put deleted messages in"
 msgstr "將刪除的郵件放在"
 
-#: src/prefs_account.c:3557
+#: src/prefs_account.c:3581
 msgid "Account name is not entered."
 msgstr "未指定帳號名稱"
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3585
 msgid "Mail address is not entered."
 msgstr "未指定郵件地方"
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3593
 msgid "SMTP server is not entered."
 msgstr "未指定 SMTP 伺服器"
 
-#: src/prefs_account.c:3574
+#: src/prefs_account.c:3598
 msgid "User ID is not entered."
 msgstr "使用者 ID 未指定"
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3603
 msgid "POP server is not entered."
 msgstr "未指定 POP3 伺服器"
 
-#: src/prefs_account.c:3599
+#: src/prefs_account.c:3623
 msgid "The default Inbox folder doesn't exist."
 msgstr "預設收件夾不存在"
 
-#: src/prefs_account.c:3605
+#: src/prefs_account.c:3629
 msgid "IMAP server is not entered."
 msgstr "IMAP4 伺服器未指定"
 
-#: src/prefs_account.c:3610
+#: src/prefs_account.c:3634
 msgid "NNTP server is not entered."
 msgstr "NNTP 伺服器未指定"
 
-#: src/prefs_account.c:3616
+#: src/prefs_account.c:3640
 msgid "local mailbox filename is not entered."
 msgstr "本地郵件夾名稱未指定"
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3646
 msgid "mail command is not entered."
 msgstr "郵件命令未指定"
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3656
 msgid "User ID cannot contain a newline character."
 msgstr "使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3639
+#: src/prefs_account.c:3663
 msgid "Password cannot contain a newline character."
 msgstr "密碼不能包含新行的字元"
 
-#: src/prefs_account.c:3676
+#: src/prefs_account.c:3700
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP的使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3681
+#: src/prefs_account.c:3705
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP的密碼不能包含新行的字元"
 
-#: src/prefs_account.c:3776
+#: src/prefs_account.c:3800
 msgid "domain is not specified."
 msgstr "尚未指定收件者"
 
-#: src/prefs_account.c:3781
+#: src/prefs_account.c:3805
 msgid "sent folder is not selected."
 msgstr "尚未選擇已傳送資料夾"
 
-#: src/prefs_account.c:3786
+#: src/prefs_account.c:3810
 msgid "queue folder is not selected."
 msgstr "尚未選擇暫存資料夾"
 
-#: src/prefs_account.c:3791
+#: src/prefs_account.c:3815
 msgid "draft folder is not selected."
 msgstr "尚未選擇草稿資料夾"
 
-#: src/prefs_account.c:3796
+#: src/prefs_account.c:3820
 msgid "trash folder is not selected."
 msgstr "尚未選擇回收資料夾"
 
-#: src/prefs_account.c:4116
+#: src/prefs_account.c:4140
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:4134
+#: src/prefs_account.c:4158
 msgctxt "Preferences menu item"
 msgid "Send"
 msgstr "傳送"
 
-#: src/prefs_account.c:4153
+#: src/prefs_account.c:4177
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4214 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "樣版"
 
-#: src/prefs_account.c:4208
+#: src/prefs_account.c:4232
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/prefs_account.c:4328
+#: src/prefs_account.c:4334 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr "代理伺服器"
+
+#: src/prefs_account.c:4352
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs_account.c:4690
+#: src/prefs_account.c:4713
 msgid "Preferences for new account"
 msgstr "新帳號選項"
 
-#: src/prefs_account.c:4692
+#: src/prefs_account.c:4715
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帳號選項"
 
-#: src/prefs_account.c:4804 src/wizard.c:1406
+#: src/prefs_account.c:4827 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "失敗 (錯誤的地址)"
 
-#: src/prefs_account.c:4889
+#: src/prefs_account.c:4912
 msgid "Select signature file"
 msgstr "繼擇簽名檔案"
 
-#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
+#: src/prefs_account.c:4930 src/prefs_account.c:4947 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "選擇認證檔案"
 
-#: src/prefs_account.c:5020
+#: src/prefs_account.c:5043
 msgid "Protocol:"
 msgstr "通訊協定"
 
-#: src/prefs_account.c:5363
+#: src/prefs_account.c:5386
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (未載入外掛程式)"
 
-#: src/prefs_account.c:6138
+#: src/prefs_account.c:6166
 msgid "Authorisation complete"
 msgstr "認證碼"
 
-#: src/prefs_account.c:6139
+#: src/prefs_account.c:6167
 msgid "Your OAuth2 authorisation code has been received by Claws Mail"
 msgstr "你的OAuth2認證碼已被Claws Mail接受"
 
-#: src/prefs_account.c:6142
+#: src/prefs_account.c:6170
 msgid "Authorisation NOT completed"
 msgstr "認證碼"
 
-#: src/prefs_account.c:6143
+#: src/prefs_account.c:6171
 msgid "Your OAuth2 authorisation code was not received by Claws Mail"
 msgstr "你的OAuth2認證碼不被Claws Mail接受"
 
@@ -15602,7 +15505,7 @@ msgstr "套用在 {} 間的過濾動作到選擇的郵件上"
 msgid "for a literal %"
 msgstr "文字 %"
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr "動作"
 
@@ -15631,9 +15534,7 @@ msgstr "入口已被修改"
 msgid ""
 "Opening the filter action dialog will clear current modifications of the "
 "command-line."
-msgstr ""
-"開啟過濾器啟用對話框將會清除目前已經"
-"修改過的命令列"
+msgstr "開啟過濾器啟用對話框將會清除目前已經修改過的命令列"
 
 #: src/prefs_actions.c:1324 src/prefs_filtering.c:1062
 #: src/prefs_filtering.c:1120
@@ -15908,7 +15809,7 @@ msgstr "隱藏"
 msgid "Message flags"
 msgstr "郵件旗標"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "標示"
@@ -15934,7 +15835,7 @@ msgstr "標示為一般郵件"
 msgid "Execute"
 msgstr "執行"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:708
 msgid "Color label"
 msgstr "標籤顏色"
 
@@ -15949,7 +15850,7 @@ msgstr "改寄"
 
 #: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
 #: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
-#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:713 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr "分數"
@@ -16218,8 +16119,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "隱藏行數"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:426
+#: src/prefs_summaries.c:520 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "顯示行數"
 
@@ -16320,9 +16221,7 @@ msgstr "顯示 \"無未讀或新郵件\" 對話框"
 msgid ""
 "Turn this option on if you want this folder to be ignored when searching for "
 "unread or new messages"
-msgstr ""
-"如果希望在搜尋未讀或新郵件時忽略此資料夾"
-"需將此選項關閉"
+msgstr "如果希望在搜尋未讀或新郵件時忽略此資料夾需將此選項關閉"
 
 #: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
@@ -16419,7 +16318,7 @@ msgstr "使用不同的字型進行列印"
 msgid "Message Printing"
 msgstr "列印郵件"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:953
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr "顯示"
@@ -16671,11 +16570,11 @@ msgstr "內文部份"
 msgid "whole message"
 msgstr "全部郵件"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr "已標示"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr "已刪除"
 
@@ -16683,11 +16582,11 @@ msgstr "已刪除"
 msgid "Replied"
 msgstr "已回覆"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr "已轉寄"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:526
 #: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "垃圾郵件"
@@ -16696,7 +16595,7 @@ msgstr "垃圾郵件"
 msgid "Has attachment"
 msgstr "有附加檔額"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr "簽章"
 
@@ -17203,7 +17102,7 @@ msgstr "挑選連結的顏色"
 msgid "Hunk lines"
 msgstr "新的行"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:420
 msgid "Folder list"
 msgstr "資料夾清單"
 
@@ -17679,264 +17578,268 @@ msgstr "為錯字挑選顏色,要使用黑色的底線嗎?"
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr "星期名稱縮寫"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr "星期的完整名稱"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr "月份名稱縮寫"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr "月份的完整名稱"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr "目前地區的最佳日期和時間"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr "年代數字 (年/100)"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr "以十進制數字顯示該月的日期"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "用十進制數字以24時制顯示小時"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "用十進制數字以12時制顯示小時"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr "以十進制數字顯示該年的日期"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr "以十進制數字顯示月份"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr "以十進制數字顯示分"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr "AM 或 PM"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr "以十進制數字顯示秒"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr "以十進制數字顯示該週的日期"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr "目前地區的最佳日期"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr "年份最後兩位數字"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr "以十進制數字顯示年份"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr "時區或名稱或縮寫"
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:291
+#: src/prefs_summaries.c:555
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:267
 msgid "Specifier"
 msgstr "區分符號"
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:309
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:440
 msgid "Display message count next to folder name"
 msgstr "下一個資料夾名稱所顯示的郵件數量"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:450
 msgid "Unread messages"
 msgstr "未讀郵件"
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:451
 msgid "Unread and Total messages"
 msgstr "未讀以及所有郵件"
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:457
 msgid "Open last opened folder at start-up"
 msgstr "啟動時開啟最後一次開啟的資料夾"
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:465
+msgid "Open selected folder at start-up"
+msgstr "啟動時開啟選擇的資料夾"
+
+#: src/prefs_summaries.c:486
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
 msgstr "將資料夾中所有的郵件標示為已讀或未讀時,需經過確認"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:493
 msgid "Abbreviate newsgroup names longer than"
 msgstr "新聞群組名稱超過"
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:506
 msgid "letters"
 msgstr "字元時縮寫"
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:514
 msgid "Message list"
 msgstr "郵件清單"
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:531
 msgid "Lock column headers"
 msgstr "鎖定標頭列"
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:537
 msgid "Displayed in From column"
 msgstr "顯示行數"
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:548
 msgid "Name and Address"
 msgstr "新連絡人"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:574
 msgid "Date format help"
 msgstr "日期格式"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:580
 msgid "Set message selection when entering a folder"
 msgstr "設定進入資料夾信件為選擇狀態"
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:589
 msgid "Open message when selected"
 msgstr "開啟選擇的郵件"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:594
 msgid "When opening a folder"
 msgstr "當開啟一個資料夾"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:596
 msgid "When displaying search results"
 msgstr "當顯示搜尋結果時"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:598
 msgid "When selecting next or previous message using shortcuts"
 msgstr "當選擇下一個或上一個郵件時使用捷徑"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:600
 msgid "When deleting or moving messages"
 msgstr "當刪除或移動郵件"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:602
 msgid "When using directional keys"
 msgstr "當使用方向鍵時"
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:604
 msgid "Mark message as read"
 msgstr "標示為已讀"
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:607
 msgid "when selected, after"
 msgstr "在選擇後過了"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:626
 msgid "only when opened in a new window, or replied to"
 msgstr "只有當開啟了新視窗或回覆"
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:636
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "顯示 \"無未讀或新郵件\" 對話框"
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:646
 msgid "Assume 'Yes'"
 msgstr "假設 'Yes'"
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:647
 msgid "Assume 'No'"
 msgstr "假設 'No'"
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:653
 msgid "Display sender using address book"
 msgstr "以通訊錄顯示寄件者"
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:657
 msgid "Thread using subject in addition to standard headers"
 msgstr "除了標準標頭之外,執行緒將使用主旨"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:661
 msgid "Execute immediately when moving or deleting messages"
 msgstr "當移除或刪除郵件時,立即執行"
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:663
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
 msgstr "當取消了選項,則會延後移動、複製和刪除郵件,直到你選擇 '工具/執行'"
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:668
 msgid "Confirm when marking all messages as read or unread"
 msgstr "將資料夾中所有的郵件標示為已讀或未讀時,需經過確認"
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:671
 msgid "Confirm when changing color labels"
 msgstr "覆寫郵件顏色標籤前需再次確認"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:675
 msgid "Show tooltips"
 msgstr "顯示工具提示"
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:685 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "預設值"
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:687
 msgid "New folders"
 msgstr "新增資料夾"
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:693
 msgid "Sort by"
 msgstr "排序"
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:701 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "數字"
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:704
 msgid "Thread date"
 msgstr "根據串列日期"
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:715
 msgid "Don't sort"
 msgstr "不排序"
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:730
 msgid "Thread view"
 msgstr "串列檢視"
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:733
 msgid "Collapse all threads"
 msgstr "關閉所有串列"
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:739
 msgid "Hide read messages"
 msgstr "隱藏讀取郵件"
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:954
 msgid "Summaries"
 msgstr "摘要"
 
@@ -18107,7 +18010,7 @@ msgstr "現有的樣版"
 msgid "Template"
 msgstr "樣版"
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr "預設內部主題"
 
@@ -18115,21 +18018,16 @@ msgstr "預設內部主題"
 msgid "Themes"
 msgstr "佈景主題"
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr "移除系統佈景主題 '%s'"
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "移除佈景主題 '%s'"
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "你確認要移除這個佈景主題嗎?"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18138,24 +18036,24 @@ msgstr ""
 " 檔案 %s 失敗\n"
 "當移除佈景主題時"
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "移除佈景主題路徑失敗"
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "佈景主題移除成功"
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "選擇佈景主題資料夾"
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "安裝佈景主題 '%s'"
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18163,15 +18061,11 @@ msgstr ""
 "此資料夾似乎不是一個佈景主題資料夾\n"
 "仍然要安裝嗎?"
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr "你希望為所有的使用者安裝佈景主題嗎?"
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr "佈景主題已經存在"
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18183,25 +18077,25 @@ msgstr ""
 "\n"
 "你希望覆蓋它嗎?"
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "無法在 %s 內刪除舊佈景主題"
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "無法建立目的路徑 %s"
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr "佈景主題已經成功安裝"
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr "佈景主題安裝失敗"
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18210,78 +18104,78 @@ msgstr ""
 "檔案 %s 失敗\n"
 "當安裝佈景主題時"
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr "內鍵的佈景主題有 %d  圖示"
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d 個有效的佈景主題 (%d 個使用者的, %d 個系統的, 1 個內鍵的)"
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "內鍵的佈景主題有 %d  圖示"
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr "這個佈景主題沒有有效的資訊檔案"
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr "錯誤:無法取得佈景主題狀態"
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d 個檔案 (%d 個圖示), 大小: %s"
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr "選擇器"
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr "安裝..."
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr "更多..."
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr "資訊"
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr "作者:"
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr "URL:"
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr "預覽"
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr "顯示日誌(_V)"
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr "SVG 渲染"
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr "啟用alpha頻道"
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr "強制比例"
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr "每英吋的點數(PPI)"
 
@@ -18430,7 +18324,7 @@ msgstr "接收的金鑰尚未定義"
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64編碼錯誤]\n"
 
-#: src/procmime.c:2836
+#: src/procmime.c:2840
 msgid "Could not decode part"
 msgstr "無法解析部份的訊息"
 
@@ -18866,22 +18760,6 @@ msgstr ""
 "在傳送郵件時發生錯誤:\n"
 "%s"
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr "設定郵件箱"
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-"首先,你必需設定郵件箱的位置\n"
-"如果你已經有 MH 格式的郵件箱,\n"
-"你可以使用現有的\n"
-"如果你不確定,選擇確定鍵"
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "郵件的來源"
@@ -19156,91 +19034,91 @@ msgstr "寄件者: %s,  以 %s"
 msgid "To: %s, on %s"
 msgstr "收件者: %s, 以 %s"
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr "你不是文章的作者"
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "你確定要刪除 %d 封選擇的郵件嗎?"
 msgstr[1] "你確定要刪除 %d 封選擇的郵件嗎?"
 
-#: src/summaryview.c:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "刪除郵件"
 msgstr[1] "刪除郵件"
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr "目的資料夾和目前的相同"
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "選擇路徑將選定的郵件移至該位置"
 msgstr[1] "選擇路徑將選定的郵件移至該位置"
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr "要複製的目的資料夾和目前的相同"
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "選擇路徑,將所有選定複製到該位置"
 msgstr[1] "選擇路徑,將所有選定複製到該位置"
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr "擴展或覆寫"
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr "擴展或覆寫已存在的檔案?"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr "擴展(_A)"
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "無法儲存檔案 '%s'"
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "你想要列印%d封件,一封一封的印,你確定要繼續嗎?"
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr "建立串列..."
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr "略過這些規則"
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "不管帳號是屬於誰的,全部套用這些規則"
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr "如果這些規則已經套用在目前的帳號,就套用吧!"
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr "過濾"
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19248,71 +19126,71 @@ msgstr ""
 "有一些過濾規則屬於一個特定帳號\n"
 "請選擇要使用這些規則做什麼:"
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr "過濾..."
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr "處理配置"
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "你確定要重置所有已選擇郵件的顏色標籤嗎?"
 
-#: src/summaryview.c:6089
+#: src/summaryview.c:6090
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "你確定要將顏色標籤套用到所有已選擇的郵件上嗎?"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "重置顏色標籤"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "設定顏色標籤"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr "忽略串列"
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr "關注串列"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr "已回覆但是也轉發了 - 點選以檢視回覆"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr "已回覆 - 點選以檢視回覆"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr "將被移動"
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr "將被複製"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr "已簽名,有附件"
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr "已加密,有附件"
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr "已加密"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr "有附件"
 
-#: src/summaryview.c:8302
+#: src/summaryview.c:8303
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19321,11 +19199,11 @@ msgstr ""
 "正規表示式 (regexp) 發生錯誤:\n"
 "%s"
 
-#: src/summaryview.c:8405
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "回到資料夾清單 (你有未讀郵件)"
 
-#: src/summaryview.c:8410
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr "回到資料夾清單"
 
@@ -20172,155 +20050,4 @@ msgstr ""
 "Claws Mail 已經準備好了\n"
 "點擊儲存後開始"
 
-#~ msgid "Move Email Addresses to or from Group with arrow buttons"
-#~ msgstr "用箭號鈕將郵件地址移往或移出群組"
-
-#~ msgid "Tag is not set."
-#~ msgstr "沒有設定標籤"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Apply tags"
-#~ msgstr "指定標籤"
-
-#~ msgid "Please select tags to apply/remove. Changes are immediate."
-#~ msgstr "請選擇標籤以指定或移除,修改將立即生效。"
-
-#~ msgid ""
-#~ "rule is account-based [id=%d, name='%s'], current account [id=%d, "
-#~ "name='%s']\n"
-#~ msgstr ""
-#~ "這是一個以帳號為基準的規則  [id=%d, name='%s'], 目前帳號為 [id=%d, "
-#~ "name='%s']\n"
-
-#~ msgctxt "IPv6"
-#~ msgid ""
-#~ "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-#~ msgstr "新增支援 IPv6 位址,這是新的網際網路位址協定\n"
-
-#~ msgid "SSL/TLS error"
-#~ msgstr " SSL 錯誤"
-
-#~ msgid "g_thread is not supported by glib.\n"
-#~ msgstr "glib 沒有支援 gthread(_t)\n"
-
-#~ msgid "Skip"
-#~ msgstr "跳過"
-
-#~ msgid "Skip all"
-#~ msgstr "跳過全部"
-
-#~ msgid "Attach warner"
-#~ msgstr "附加檔案警告器"
-
-#~ msgid "Warn when"
-#~ msgstr "發出警告,當"
-
-#~ msgid "Search the Web"
-#~ msgstr "搜尋瀏覽器"
-
-#~ msgid "UIDL"
-#~ msgstr "UIDL"
-
-#~ msgid ""
-#~ "All folders and messages under '%s' will be deleted.\n"
-#~ "Do you really want to delete?"
-#~ msgstr ""
-#~ "在 '%s' 下的所有資料夾和郵件將會被刪除\n"
-#~ "你確定要刪除嗎?"
-
-#~ msgid "The Notification plugin needs threading support."
-#~ msgstr "這個通知外掛程式需要執行緒的支援"
-
-#~ msgid "Incorrect part"
-#~ msgstr "不正確的區塊"
-
-#~ msgid "Not a text part"
-#~ msgstr "不是一個文件區塊"
-
-#~ msgid "Couldn't convert text data to any sane charset."
-#~ msgstr "無法將文字資料轉換至其它合理的字元"
-
-#~ msgid "Signature boundary not found."
-#~ msgstr "找不到簽名的邊界"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text"
-#~ msgstr "為第一層文字挑選顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text"
-#~ msgstr "為第二層文字挑選顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text"
-#~ msgstr "為第三層文字挑選顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 1st level text background"
-#~ msgstr "為第一層文字背景挑選顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 2nd level text background"
-#~ msgstr "為第二層文字背景挑選顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for 3rd level text background"
-#~ msgstr "為第三層文字背景挑選顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for links"
-#~ msgstr "挑選連結的顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for signatures"
-#~ msgstr "挑選簽名的顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for folder"
-#~ msgstr "挑選資料夾的顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for inserted lines"
-#~ msgstr "挑選連結的顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for removed lines"
-#~ msgstr "挑選連結的顏色"
-
-#~ msgctxt "Dialog title"
-#~ msgid "Pick color for hunk lines"
-#~ msgstr "挑選連結的顏色"
-
-#~ msgid "Select preset:"
-#~ msgstr "選擇預設:"
-
-#~ msgid ""
-#~ "You can also modify each menu shortcut by pressing\n"
-#~ "any key(s) when focusing the mouse pointer on the item."
-#~ msgstr ""
-#~ "你可以透過把滑鼠焦點放在項目上時,按下任何按鍵,\n"
-#~ "來修改每一個功能項目的快捷鍵"
-
-#~ msgid "Enable customisable keyboard shortcuts"
-#~ msgstr "啟用使用者自訂的快捷鍵"
-
-#~ 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"
-#~ "Uncheck this option if you want to lock all existing keyboard shortcuts."
-#~ msgstr ""
-#~ "如果勾選,你可以透過將焦點放在功能項目並按下複合鍵,以改變絕大部份功能項目"
-#~ "的快捷鍵設定\n"
-#~ "若你希望保持所有已存在的快捷鍵,請取消勾選。"
-
-#~ msgid "A_dd"
-#~ msgstr "加入(_d)"
-
-#~ msgid "Available URLs:"
-#~ msgstr "有效的 URLs:"
-
-#~ msgid "Please select the URL to open."
-#~ msgstr "請選擇一個要開啟的 URL"
 
-#~ msgid "Use secure authentication (APOP)"
-#~ msgstr "使用安全認證 (APOP)"

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list