[Commits] [SCM] claws branch, master, updated. 4.1.0-86-g5d798106f

paul at claws-mail.org paul at claws-mail.org
Wed Oct 19 15:25:30 UTC 2022


The branch, master has been updated
       via  5d798106f43254befbf3231bd0180ceaf51c32d3 (commit)
      from  2ae8be2b8708e93cab3cc834c82af6fb135762e5 (commit)

Summary of changes:
 po/ca.po    | 2356 ++++++++--------
 po/cs.po    | 2420 ++++++++--------
 po/nl.po    | 7648 +++++++++++++++++++++++++-------------------------
 po/pl.po    | 3552 +++++++++++------------
 po/pt_BR.po | 2337 ++++++++--------
 po/ru.po    | 2241 +++++++--------
 po/sk.po    | 2400 ++++++++--------
 po/sv.po    | 8977 +++++++++++++++++++++++++++++++----------------------------
 po/tr.po    | 2264 +++++++--------
 po/zh_TW.po | 8669 ++++++++++++++++++++++++++++++---------------------------
 10 files changed, 22513 insertions(+), 20351 deletions(-)


- Log -----------------------------------------------------------------
commit 5d798106f43254befbf3231bd0180ceaf51c32d3
Author: Paul <paul at claws-mail.org>
Date:   Wed Oct 19 16:25:22 2022 +0100

    update translations

diff --git a/po/ca.po b/po/ca.po
index 4af5af6ea..656b9fbf9 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 i abril 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.
 # 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-03-27 09:41+0100\n"
-"PO-Revision-Date: 2022-03-28 13:39+0200\n"
+"POT-Creation-Date: 2022-10-11 10:26+0100\n"
+"PO-Revision-Date: 2022-10-13 11:07+0200\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 3.0.1\n"
+"X-Generator: Poedit 2.4.2\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-SearchPath-0: .\n"
 
@@ -64,7 +64,7 @@ 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/mainwindow.c:518 src/messageview.c:213
+#: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Edita"
@@ -93,7 +93,7 @@ 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:552
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copia"
@@ -141,19 +141,20 @@ msgstr " E_stableix com a compte predeterminat."
 #: 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/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:926 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:841 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: 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/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/prefs_actions.c:920 src/prefs_actions.c:946 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/summary_search.c:495
-#: src/summary_search.c:785
+#: 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/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "Tan_ca"
 
@@ -186,24 +187,24 @@ msgstr "Suprimeix el compte"
 #: 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:10736
-#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
-#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
-#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: 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/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/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1193 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:890 src/main.c:2286 src/mainwindow.c:4009
-#: src/mainwindow.c:4212 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:1818
-#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
-#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
+#: 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/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
@@ -214,7 +215,7 @@ msgstr "Suprimeix el compte"
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
 #: src/plugins/keyword_warner/keyword_warner.c:196
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
 #: src/plugins/managesieve/sieve_editor.c:435
 #: src/plugins/managesieve/sieve_editor.c:632
@@ -226,21 +227,20 @@ msgstr "Suprimeix el compte"
 #: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2030
 #: 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_actions.c:1315
-#: src/prefs_customheader.c:177 src/prefs_customheader.c:693
-#: 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_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:294 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/toolbar.c:3108
-#: src/wizard.c:1833
+#: 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_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/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -248,11 +248,11 @@ msgstr "_Cancel·la"
 #: 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/plugins/att_remover/att_remover.c:429
-#: src/plugins/mailmbox/plugin_gtk.c:335
+#: 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:2032 src/prefs_actions.c:1105
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "S_uprimeix"
@@ -271,17 +271,17 @@ msgstr "\"Rep missatges\" recupera els missatges des dels comptes seleccionats"
 #: 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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1860
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: 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
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -337,13 +337,13 @@ msgstr ""
 "%s"
 
 #: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9751 src/ldaputil.c:334
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1829
-#: src/plugins/vcalendar/vcal_folder.c:1847
-#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
+#: 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
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -491,13 +491,13 @@ msgstr ""
 "Realment voleu reemplaçar tots els noms d'atribut\n"
 "pels valors per defecte?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:1673 src/main.c:412
-#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -509,13 +509,14 @@ msgstr ""
 msgid "_No"
 msgstr "_No"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -550,7 +551,7 @@ msgid "New attribute name:"
 msgstr "Nom d'atribut nou:"
 
 #: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
 #: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
@@ -563,14 +564,13 @@ 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/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: 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/mimeview.c:1819 src/password_gtk.c:213
-#: src/plugins/archive/archiver_gtk.c:575
+#: 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
@@ -633,7 +633,7 @@ msgid "Duplicate email addresses"
 msgstr "Adreces de correu duplicades"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adreça"
@@ -667,7 +667,7 @@ msgid "Contact"
 msgstr "Contacte"
 
 #: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1303 src/editgroup.c:290
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Observacions"
 
@@ -684,7 +684,7 @@ 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/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: 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"
@@ -693,7 +693,7 @@ msgstr "Adreça de correu"
 msgid "_Book"
 msgstr "Lli_breta"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "E_ines"
@@ -796,7 +796,7 @@ 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/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: 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
@@ -869,15 +869,15 @@ msgstr "S'ha esgotat el temps d'espera fent l'operació LDAP."
 
 #: src/addressbook.c:531
 msgid "Error in LDAP search criteria"
-msgstr "Error als criteris de cerca LDAP."
+msgstr "Error als criteris de cerca d'LDAP."
 
 #: src/addressbook.c:532
 msgid "No LDAP entries found for search criteria"
-msgstr "No s'han trobat entrades LDAP per al criteri de cerca."
+msgstr "No s'han trobat entrades d'LDAP per al criteri de cerca."
 
 #: src/addressbook.c:533
 msgid "LDAP search terminated on request"
-msgstr "S'ha sol·licitat concloure la cerca LDAP."
+msgstr "S'ha sol·licitat concloure la cerca d'LDAP."
 
 #: src/addressbook.c:534
 msgid "Error starting STARTTLS connection"
@@ -889,7 +889,7 @@ msgstr "Falta el nom distingit (dn)."
 
 #: src/addressbook.c:536
 msgid "Missing required information"
-msgstr "Falta informació requerida."
+msgstr "Falta informació necessària."
 
 #: src/addressbook.c:537
 msgid "Another contact exists with that key"
@@ -954,7 +954,7 @@ msgstr ""
 "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:334 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Suprimeix la carpeta"
 
@@ -1066,7 +1066,7 @@ msgid "Person"
 msgstr "Persona"
 
 #: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1191,18 +1191,18 @@ msgstr "Actualització d'adreces"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Actualització fallida. Canvis no escrits al directori."
 
-#: src/alertpanel.c:154 src/compose.c:9825
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Anunci"
 
 #: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: 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
 msgid "Warning"
 msgstr "Avís"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Error"
@@ -1323,63 +1323,63 @@ 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:1251
+#: src/common/session.c:201 src/imap.c:1261
 msgid "TLS handshake failed\n"
 msgstr "Negociació TLS fallida\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "No hi ha cap mètode disponible per a SMTP AUTH\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "El mètode SMTP AUTH seleccionat no està disponible\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "resposta SMTP incorrecta\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "hi ha hagut un error a la sessió SMTP\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "hi ha hagut un error d'autenticació\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 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:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "no s'ha pogut iniciar la sessió STARTTLS\n"
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Temps d'espera excedit per a E/S del sòcol .\n"
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "La connexió ha excedit el temps d'espera.\n"
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: connexió fallida (%s).\n"
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: amfitrió desconegut.\n"
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: la cerca de l'amfitrió ha fallat (%s).\n"
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escriu a fd%d: %s\n"
@@ -1719,7 +1719,7 @@ msgstr ""
 msgid "_Add..."
 msgstr "_Afegeix..."
 
-#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: 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/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
@@ -1732,7 +1732,7 @@ msgstr "Sup_rimeix"
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Missatge"
 
@@ -1744,7 +1744,7 @@ msgstr "_Ortografia"
 msgid "_Options"
 msgstr "_Opcions"
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "A_juda"
 
@@ -1804,7 +1804,7 @@ msgstr "A_justa"
 msgid "_Unwrapped"
 msgstr "Desaj_ustat"
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Seleccion_a-ho tot"
@@ -1909,47 +1909,47 @@ msgstr "_Sistema de privacitat"
 msgid "_Priority"
 msgstr "_Prioritat"
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Codificació d_e caràcters"
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Europeu occidental"
 
-#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Bàltic"
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Àrab"
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonès"
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Xinès"
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Coreà"
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tailandès"
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "Llibret_a d'adreces"
 
@@ -1957,11 +1957,11 @@ msgstr "Llibret_a d'adreces"
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Accio_ns"
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "Qu_ant a"
 
@@ -1997,12 +1997,12 @@ msgstr "Mostra el gestor de _regles"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Tothom"
 
-#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Remitent"
@@ -2027,27 +2027,27 @@ msgstr "Bai_xa"
 msgid "_Lowest"
 msgstr "Més _baixa"
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automàtic"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 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:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 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:896 src/messageview.c:365
+#: src/compose.c:764 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:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
@@ -2174,7 +2174,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "N'esteu segur?"
 
-#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Insereix"
 
@@ -2235,7 +2235,7 @@ 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/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Envia"
 
@@ -2402,7 +2402,7 @@ msgstr ""
 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:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Cancel·la l'enviament"
 
@@ -2431,9 +2431,11 @@ msgstr "Useu <tab> per a l'autocompleció des de la llibreta d'adreces"
 msgid "Mime type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:468
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Mida"
 
@@ -2563,42 +2565,52 @@ msgstr ""
 #: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"No s'ha pogut generar l'ordre següent:\n"
+"No s'ha pogut generar l'ordre de l'editor extern següent:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9750
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "L'editor extern s'ha aturat amb un error: %s"
 
-#: src/compose.c:9822
+#: src/compose.c:9828
+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
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %"
+"%s"
 msgstr ""
 "L'editor extern encara està actiu.\n"
 "Voleu forçar l'acabament del procés?\n"
-"Identificador del procés: %"
+"%s"
 
-#: src/compose.c:10229 src/messageview.c:1094
+#: src/compose.c:10245 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:10432
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "No s'ha pogut desar l'esborrany."
 
-#: src/compose.c:10436
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "No s'ha pogut desar l'esborrany"
 
-#: src/compose.c:10437
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2606,24 +2618,24 @@ msgstr ""
 "No s'ha pogut desar l'esborrany.\n"
 "Voleu cancel·lar la sortida o descartar aquest missatge?"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "_Cancel·la la sortida"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "_Descarta el missatge"
 
-#: src/compose.c:10627 src/compose.c:10641
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Selecciona un fitxer"
 
-#: src/compose.c:10655
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir el ftxer \"%s\"."
 
-#: src/compose.c:10657
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2632,50 +2644,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:10734
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Descarta el missatge"
 
-#: src/compose.c:10735
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
 
-#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Descarta"
 
-#: src/compose.c:10736 src/compose.c:10741
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "De_sa a la carpeta d'esborranys"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Desa els canvis"
 
-#: src/compose.c:10740
+#: src/compose.c:10759
 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:10741
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "No ho _desis"
 
-#: src/compose.c:10812
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voleu aplicar la plantilla \"%s\"?"
 
-#: src/compose.c:10814
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Aplica la plantilla"
 
-#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10834 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:10892
+#: src/compose.c:10911
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2684,7 +2696,7 @@ msgstr ""
 "La mida del text enganxat supera el límit (%dKiB) per enganxar.\n"
 "Adjunteu-lo com a fitxer."
 
-#: src/compose.c:11708
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2699,20 +2711,20 @@ msgstr[1] ""
 "Voleu inserir el contingut dels %d fitxers dins el cos del missatge o "
 "adjuntar-los al correu?"
 
-#: src/compose.c:11714
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Inserir o adjuntar?"
 
-#: src/compose.c:11715
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "_Adjunta-ho"
 
-#: src/compose.c:11930
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de format de la cita a la línia %d."
 
-#: src/compose.c:12226
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2743,7 +2755,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Registre de depuració"
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
 #: src/uri_opener.c:226
 msgid "Close"
 msgstr "Tanca"
@@ -2931,7 +2943,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:2443
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Fitxer"
 
@@ -2939,54 +2951,48 @@ msgstr "Fitxer"
 msgid "Add New Addressbook"
 msgstr "Afegeix una llibreta d'adreces nova"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Heu de proporcionar un nom de grup."
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
+#: src/editgroup.c:292
+msgid "Edit group data"
 msgstr "Edita les dades del grup"
 
-#: src/editgroup.c:323 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Nom de grup"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Adreces al grup"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Adreces disponibles"
 
-#: src/editgroup.c:452
-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."
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Adreces al grup"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
+#: src/editgroup.c:494
+msgid "Edit group details"
 msgstr "Edita els detalls del grup"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "Afegeix un grup nou"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Edita la carpeta"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Nom nou de la carpeta:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Carpeta nova"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Nom de la carpeta nova:"
@@ -3015,13 +3021,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:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
 #: 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:3197
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3083,7 +3089,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4227
 msgid "TLS"
 msgstr "TLS"
 
@@ -3249,8 +3255,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:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Mostra la contrasenya"
@@ -3274,7 +3280,7 @@ 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:4044
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Bàsiques"
 
@@ -3363,11 +3369,11 @@ msgstr "Afegeix un nova entrada vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "És impossible esstablir el certificat del client.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "no s'ha pogut obtenir l'interval de xover\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "no s'ha pogut obtenir l'interval d'xhdr\n"
 
@@ -3432,8 +3438,8 @@ 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:1178 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: 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
 msgid "None"
 msgstr "Cap"
@@ -3444,7 +3450,7 @@ msgstr "Cap"
 msgid "Default"
 msgstr "Per defecte"
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Complet"
@@ -3683,7 +3689,7 @@ msgstr "Exporta la llibreta d'adreces a un fitxer LDIF"
 msgid "Distinguished Name"
 msgstr "Nom distingit"
 
-#: src/export.c:112 src/summaryview.c:8485
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Exporta a fitxer de bústia"
 
@@ -3769,11 +3775,19 @@ msgstr ""
 "El fitxer %s està buit o és corrupte! Voleu usar el fitxer de la còpia de "
 "seguretat de %s?"
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr "la regla no està basada en el compte\n"
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"la regla es basa en el compte; coincideix amb el compte usat actualment per "
+"recuperar missatges\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3782,13 +3796,13 @@ msgstr ""
 "la regla està subjecta al compte [id=%d, name='%s']; coincideix amb el "
 "compte usat actualment per recuperar missatges\n"
 
-#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
-#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
-#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "NO_EXISTEIX"
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
@@ -3796,7 +3810,7 @@ msgstr ""
 "la regla està subjecta al compte; no coincideix amb el compte usat "
 "actualment per recuperar missatges\n"
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
@@ -3805,114 +3819,125 @@ msgstr ""
 "la regla està subjecta al compte [id=%d, name='%s']; no coincideix amb el "
 "compte usat actualment per recuperar missatges [id=%d, name='%s']\n"
 
-#: src/filtering.c:646
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
 "la regla no es basa en el compte; tanmateix, totes les regles s'apliquen a "
 "petició de l'usuari\n"
 
-#: src/filtering.c:652
+#: src/filtering.c:665
+msgid ""
+"rule is account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"la regla es basa en el compte; tanmateix, totes les regles s'apliquen a "
+"petició de l'usuari\n"
+
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
-"la regla està subjecta al compte [id=%d, name='%s']; totes les regles "
+"la regla es basa en el compte [id=%d, nom=%s]; tanmateix, totes les regles "
 "s'apliquen a petició de l'usuari\n"
 
-#: src/filtering.c:670
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "la regla està subjecta al compte; s'omet a petició de l'usuari\n"
+
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "la regla està subjecta al compte [id=%d, name='%s']; s'omet a petició de "
 "l'usuari\n"
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
-msgstr "la regla està subjecta al compte; s'omet a petició de l'usuari\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "la regla està basada en el compte; coincideix amb el compte actual\n"
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], 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"
+"la regla es basa en el compte [id=%d, nom=%s]; coincideix amb el compte "
+"actual [id=%d, nom=%s]\n"
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr "la regla està subjecta al compte; no coincideix amb el compte actual\n"
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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']; compte actual [id=%d, "
-"name='%s']\n"
+"la regla està subjecta al compte [id=%d, name='%s']; no coincideix amb el "
+"compte actual [id=%d, name='%s']\n"
 
-#: src/filtering.c:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "aplicant l'acció [ %s ]\n"
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "no s'ha pogut aplicar l'acció\n"
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "sense processament addicional després de l'acció [%s]\n"
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "processant la regla \"%s\" [ %s ]\n"
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "processant la regla <sense nom> [ %s ]\n"
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "inhabilitada la regla \"%s\" [ %s ]\n"
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regla inhabilitada <sense nom> [ %s ]\n"
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "indeterminat"
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "incorporació"
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr "manualment"
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "processament de carpetes"
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "preprocessant"
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "postprocessant"
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3929,11 +3954,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr "."
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -4015,17 +4040,17 @@ 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:433
+#: 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:2104
+#: src/plugins/vcalendar/vcal_folder.c:2102
 #, 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:445 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2111
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2109
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta '%s' ja existeix."
@@ -4057,7 +4082,7 @@ msgstr "Marca tots els no llegits recursi_vament"
 msgid "R_un processing rules"
 msgstr "Exec_uta regles de processament"
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Cerca a la carpeta..."
 
@@ -4110,7 +4135,7 @@ msgstr "Marca-ho tot com a llegit"
 
 #: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta i les seves "
@@ -4127,7 +4152,7 @@ msgstr "Marca'ls tots com a no llegits"
 
 #: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
 "Realment voleu marcar tots els missatges d'aquesta carpeta i de les "
@@ -4138,12 +4163,12 @@ 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:4693
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "S'explora la carpeta %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Explorant la carpeta %s..."
@@ -4190,7 +4215,7 @@ msgstr "Obrint la carpeta %s..."
 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Buida la paperera"
 
@@ -4202,7 +4227,7 @@ msgstr "Voleu suprimir tots els missatges de la paperera?"
 msgid "_Empty trash"
 msgstr "Buida la pap_erera"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 
@@ -4317,7 +4342,7 @@ msgstr "Nom de grup"
 msgid "Messages"
 msgstr "Missatges"
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Tipus"
 
@@ -4343,11 +4368,11 @@ msgstr "desconegut"
 msgid "Can't retrieve newsgroup list."
 msgstr "No es pot obtenir la llista de grups."
 
-#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Fet."
 
-#: src/grouplistdialog.c:503
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grups de notícies rebuts (%s llegits)"
@@ -4376,7 +4401,7 @@ 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:862
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4465,48 +4490,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "Afegeix suport per a connexions encriptades a servidors.\n"
 
 #: src/gtk/about.c:463
-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"
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "Permet conversions entre diferents conjunts de caràcters.\n"
 
-#: src/gtk/about.c:484
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "Afegeix suport per a adreces IPv6.\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "Afegeix suport per a llibretes d'adreces de PamlOS.\n"
 
-#: src/gtk/about.c:494
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "Afegeix suport per a llibretes d'adreces compartides amb LDAP.\n"
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "Afegeix suport per a servidors IMAP.\n"
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "Afegeix suport per a temes SVG.\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "Afegeix suport per a la gestió de sessions.\n"
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "Afegeix suport per a la detecció de canvis de connexions de xarxa.\n"
 
-#: src/gtk/about.c:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "Afegeix suport per a temes SVG.\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "Afegeix suport per a l'autenticació d'OAuth2\n"
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4517,7 +4545,7 @@ msgstr ""
 "la Free Software Foundation; o bé la versió 3 o (segons la vostra opció) "
 "qualsevol versió posterior."
 
-#: src/gtk/about.c:574
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4529,7 +4557,7 @@ msgstr ""
 "ADEQUACIÓ PER A CAP PROPÒSIT EN PARTICULAR. Vegeu la Llicència Pública "
 "General de GNU per obtenir-ne més detalls. "
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4537,73 +4565,73 @@ 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:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Estadístiques de la sessió\n"
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciat: %s\n"
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Trànsit d'entrada\n"
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Missatges rebuts: %d\n"
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Trànsit de sortida\n"
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Missatges nous / redireccionats: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Missatges resposts: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Missatges reenviats: %d\n"
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de missatges sortints: %d\n"
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "Quant al Claws Mail"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Autors"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "_Característiques"
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Llicència"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "Notes de la ve_rsió"
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "E_stadístiques"
 
@@ -5082,7 +5110,7 @@ msgstr "Procedència"
 msgid "Precedence:"
 msgstr "Procedència:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Organizació"
 
@@ -5295,7 +5323,7 @@ msgid "Folder contains marked messages"
 msgstr "La carpeta conté missatges marcats"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+msgid "IMAP folder which contains subfolders only"
 msgstr "Carpeta IMAP que conté només subcarpetes"
 
 #: src/gtk/icon_legend.c:92
@@ -5465,15 +5493,15 @@ msgstr "_Aplica"
 msgid "Page Index"
 msgstr "Pàgina d'índex"
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "Ama_ga"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
 #: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
-#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Compte"
@@ -5935,8 +5963,7 @@ msgstr "(Sense assumpte)"
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Nom del fitxer:"
@@ -5949,195 +5976,195 @@ msgstr "Mida del fitxer:"
 msgid "Load Image"
 msgstr "Carrega la imatge"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "Connexió IMAP trencada\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Error d'IMAP a %s:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "autenticat"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "no autenticat"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "mal estat"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "error de flux"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "error d'anàlisi (molt probablement per incompatibilitat d'RFC del servidor)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "connexió rebutjada"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "error de memòria"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "error fatal"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "error de protocol (molt probablement per incompatibilitat d'RFC del servidor)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "connexió no acceptada"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "error d'ADDICIÓ"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "error de NO OP"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "error de SORTIDA"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "error de CAPACITAT"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "error de COMPROVACIÓ"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "error de TANCAMENT"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "error de SUPRESSIÓ"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "error de CÒPIA"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "error de CÒPIA D'UID"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "error de CREACIÓ"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "error de SUPRESSIÓ"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "error d'EXAMINAR"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "error d'OBTENCIÓ"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "error d'OBTENCIÓ D'UID"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "error de LLISTAT"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "error d'ENTRADA"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "error d'LSUB"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "error de CANVI DE NOM"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "error de CERCA"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "error de CERCA D'UID"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "error de SELECCIÓ"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "error d'ESTAT"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "error d'EMMAGATZEMATGE"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "error d'EMMAGATZEMATGE D'UID"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "error de SUBSCRIPCIÓ"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "error de NO-SUBSCRIPCIÓ"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "error d'STARTTLS"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "error d'INVAL"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "error d'EXTENSIÓ"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "error de SASL"
 
-#: src/imap.c:751
+#: src/imap.c:753
 msgid "TLS error"
 msgstr "Error de TLS"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Error desconegut [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6149,7 +6176,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:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6161,7 +6188,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:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6173,7 +6200,7 @@ 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:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6185,7 +6212,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:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6197,7 +6224,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:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -6207,36 +6234,36 @@ msgstr ""
 "\n"
 "Error d'OAuth2. Comproveu i corregiu les preferències del compte d'OAuth2."
 
-#: src/imap.c:1004
+#: src/imap.c:1014
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Ha fallat la connexió amb %s: entrada refusada.%s"
 
-#: src/imap.c:1008
+#: src/imap.c:1018
 #, 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:1026
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "La connexió amb %s fa fallat"
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1043 src/imap.c:1046
 #, 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:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 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:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Connexió no segura"
 
-#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 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"
@@ -6250,108 +6277,108 @@ msgstr ""
 "Voleu continuar connectant a aquest servidor? La comunicació pot no ser "
 "segura."
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Con_tinua connectant"
 
-#: src/imap.c:1192
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Compte: \"%s\": connectant al servidor IMAP: %s:%d ..."
 
-#: src/imap.c:1257
+#: src/imap.c:1267
 #, 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:1260
+#: src/imap.c:1270
 #, 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:1292 src/imap.c:4164
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "No es pot iniciar la sessió STARTTLS.\n"
 
-#: src/imap.c:1364
+#: src/imap.c:1374
 #, 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:1367
+#: src/imap.c:1377
 #, 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:1795
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 
-#: src/imap.c:2526
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "La cerca ha fallat a causa d'un error del servidor."
 
-#: src/imap.c:2610
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els indicadors suprimits\n"
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "no es pot suprimir\n"
 
-#: src/imap.c:2992
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Buscant carpetes no subscrites a %s..."
 
-#: src/imap.c:2995
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Buscant subcarpetes de %s..."
 
-#: src/imap.c:3286
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 
-#: src/imap.c:3299
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "no es pot crear la bústia\n"
 
-#: src/imap.c:3429
+#: src/imap.c:3439
 #, 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:3542
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "no es pot suprimir la bústia\n"
 
-#: src/imap.c:3821
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST ha fallat\n"
 
-#: src/imap.c:3906
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Marcant missatges..."
 
-#: src/imap.c:4009
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 
-#: src/imap.c:4161
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "El servidor requereix STARTTLS per accedir-hi.\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "No es poden refrescar les capacitats.\n"
 
-#: src/imap.c:4176
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6360,20 +6387,20 @@ 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:4184
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Les entrades al servidor estan inhabilitades.\n"
 
-#: src/imap.c:4407
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Obtenint el missatge..."
 
-#: src/imap.c:5108
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els indicadors suprimits: %d\n"
 
-#: src/imap.c:6143
+#: src/imap.c:6153
 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 +6451,7 @@ msgstr "S_ubscripcions"
 msgid "_Subscribe..."
 msgstr "_Subscriviu-vos-hi..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "Dona-te'n de bai_xa..."
 
@@ -6456,21 +6483,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:422 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 #, 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:423
+#: 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:2097
+#: src/plugins/vcalendar/vcal_folder.c:2095
 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:453 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2117
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2115
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6478,32 +6505,33 @@ msgstr ""
 "No s'ha pogut canviar el nom de la carpeta.\n"
 "El nom nou no està permès."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Seleccioneu una carpeta per desplaçar-hi la carpeta \"%s\""
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 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/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
+#: src/plugins/rssyl/rssyl_cb_menu.c:190
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"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"
+"Totes les carpetes i missatges de %s se suprimiran permanentment.\n"
+"La recuperació no serà possible.\n"
 "\n"
-"Voleu suprimir-ho definitivament?"
+"Realment voleu suprimir-ho?"
 
-#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: 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:2050
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No es pot suprimir la carpeta \"%s\"."
@@ -6530,7 +6558,7 @@ msgstr "_Cerca"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Trieu una subcarpeta de %s per subscriure-us-hi: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Subscriviu-vos-hi"
 
@@ -6769,142 +6797,142 @@ msgstr "Seleccioneu un fitxer Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importa el fitxer Pine a la llibreta d'adreces"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "El Claws Mail necessita accés a la xarxa per obtenir els missatges."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s ha fallat\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Obtenint missatges nous"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Recuperant"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Fet (%d missatge (%s) rebut)"
 msgstr[1] "Fet (%d missatges (%s) rebuts)"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Fet (no hi ha missatges nous)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Connexió fallida"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Auth fallida"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: 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
 msgid "Locked"
 msgstr "Bloquejat"
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Temps d'espera esgotat"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Acabat (%d missatge nou)"
 msgstr[1] "Acabat (%d missatges nous)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Acabat (no hi ha missatges nous)"
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recuperant missatges nous"
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Compte \"%s\": connectant al servidor POP3: %s:%d..."
 
-#: src/inc.c:930
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d"
 
-#: src/inc.c:934
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d\n"
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autenticant..."
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Obtenint missatges de %s (%s)..."
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtenint el nombre de missatges nous (STAT)..."
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtenint el nombre de missatges nous (LAST)..."
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtenint el nombre de missatges nous (UIDL)..."
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtenint la mida dels missatges (LIST)..."
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Sortint"
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperant el missatge (%d / %d) (%s / %s)"
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recuperant (%d missatge (%s) rebut)"
 msgstr[1] "Recuperant (%d missatge(s) (%s) rebut(s))"
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "La connexió amb %s:%d ha fallat."
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "S'ha produït un error mentre es processava el correu."
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6913,37 +6941,37 @@ msgstr ""
 "S'ha produït un error mentre es processava el correu:\n"
 "%s"
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "No hi ha espai lliure al disc."
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "No es pot escriure el fitxer."
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Error de sòcol"
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de sòcol connectant amb %s:%d."
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Connexió tancada per la màquina remota."
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Connexió amb %s:%d tancada per la màquina remota."
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "La bústia està bloquejada."
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6952,11 +6980,11 @@ msgstr ""
 "La bústia està bloquejada:\n"
 "%s"
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autenticació fallida."
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6965,7 +6993,7 @@ msgstr ""
 "L'autenticació ha fallat:\n"
 "%s"
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6973,46 +7001,46 @@ msgstr ""
 "Sessió caducada. Podeu recuperar-la incrementant el temps d'espera de la "
 "sessió a Preferències/Altres/Miscel·lània."
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La connexió amb %s:%d ha excedit el límit de temps."
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Incorporació cancel·lada\n"
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: 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:1834
+#: 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
 msgid "seconds"
 msgstr "segons"
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: src/inc.c:1661
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sTreballeu fora de línia. Ho voleu substituir per %d %s?"
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEsteu treballant sense connexió. Ho anul·lo?"
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "Només _una vegada"
 
@@ -7438,834 +7466,834 @@ msgstr "NetworkManager: la xarxa està connectada.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la xarxa està desconnectada.\n"
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Fitxer"
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "M_ostra"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "_Configuració"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "_Afegeix una bústia"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Canvia l'ordre de les bústies de correu..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "_Importa un fitxer de bústia..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "_Exporta a un fitxer de bústia..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "_Exporta la selecció a un fitxer de bústia..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "Buida _totes les papereres"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "De_sa el missatge com a..."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "De_sa'n la secció com a..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Configuració de la pàgina..."
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "Im_primeix..."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "Sincronitza les carpetes"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "_Surt"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Selecciona un _fil"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Cerca al missatge actual..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "_Cerca ràpida"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "Mostra o _amaga"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "_Barra d'eines"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Estableix les _columnes visibles"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "A la _llista de carpetes..."
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "A la llista de _missatges..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "_Disposició"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "Cla_ssifica"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "Atrau _per assumpte"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "E_xpandeix tots els fils"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "Replega tots els fi_ls"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Ves a"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Missatge anterior"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "Missatge següe_nt"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Missatge sense llegir ante_rior"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Missatge sense llegir següent"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Missatge no_u anterior "
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Missatge nou segü_ent"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Missatge _marcat anterior"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Missatge m_arcat següent"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Missatge e_tiquetat anterior"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Missatge eti_quetat següent"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:594
 msgid "Previously opened message"
 msgstr "Missatge obert anterior"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Missatge obert següent "
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Missatge pare"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Directori sense llegir següent"
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "Car_peta..."
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Secció següent"
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Secció anterior"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Missatge"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Línia anterior"
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Línia següent"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Pàgina anterior"
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Pàgina següent"
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Descodifica"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "Obre en una finestra _nova"
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Fon_t del missatge"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Secció del missatge"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Mostra-ho com a text"
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Obre"
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Obre amb..."
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Cites"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "Act_ualitza el resum"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "_Rep"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Obtén del compte a_ctual"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Obtén de _tots els comptes"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "Cancel·la la re_cepció"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "Envia els mi_ssatges de la cua"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "Escriu u_n missatge de correu"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "Escriu un missatge de notícies"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:665 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Respon"
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Respon _a"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "L_lista de correu"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "Reenvia i respon"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "Reen_via"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Reen_via com a adjunt"
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
 #: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Redirigei_x"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "L_lista de correu"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Publicació"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Dona-te'n de baixa"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "Mostra el fitxer"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "Contacta amb el propietari"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "Des_plaça..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Desplaça a la _paperera"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "S_uprimeix..."
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Desplaça el fil a la _paperera"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "S_uprimeix el fil"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Cancel·la una notícia"
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "_Marca"
 
 # RML To be consistent with previous one.
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "_Desmarca"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Marca com a lle_git"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Marca com a no ll_egit"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Marca-ho tot com a llegit a la carpeta"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Marca-ho tot com a no llegit a la carpeta"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignora el fil"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Deixa d'ignorar el fil"
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Revisa el fil"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Deixa de revisar el fil"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Marca com a correu bro_ssa"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Marca com a bo"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Bloqueja"
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Desbloqueja"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Eti_queta de color"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "Eti_quetes"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "Re_edita"
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Comprova'n la signatura"
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Afegeix el remitent a la _llibreta d'adreces"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "Rec_opila adreces"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "De la carpeta ac_tual..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "dels _missatges seleccionats..."
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "_Filtra tots els missatges de la carpeta"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "_Filtra els missatges _seleccionats"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "Executa regles de pr_ocessament"
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "_Crea una regla de filtratge"
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automàticament"
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Per _des de"
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Per _per a"
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Per a_ssumpte"
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Per remitent"
 
-#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Crea una regla de processament"
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Llista _URL..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprova si hi ha missatg_es nous a totes les carpetes"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Suprimeix els missatges d_uplicats"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "A la carpeta seleccionada"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "A totes les carpetes"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "E_xecuta"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "S_uprimeix"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr "Cer_tificats de TLS"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Filtratge de re_gistre"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Registre de _xarxa"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Reg_istre de depuració"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "Obli_da totes les contrasenyes de sessió"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr "Oblida la contrasenya _principal"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "_Canvia el compte actual"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "_Preferències del compte actual..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "Crea un compte _nou..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "Edita els comptes..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "P_referències..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "Prepr_ocessament..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "Postpro_cessament..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Filtratge..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "Plan_tilles..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Accions..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "Etiquete_s..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "Co_nnectors..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "PMF pr_oporcionades en línia pels usuaris"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "Text de _la icona"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Estableix com a client per defecte"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "_Mode sense connexió"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Barra de _menú"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "Vista de _missatge"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "_Barra d'estat"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Capçaleres de columna"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "Vista pe_r fil"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Amaga els fils llegits"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "Ama_ga els missatges llegits"
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Amaga els missatges suprimits"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "Pantalla c_ompleta"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Mostra totes les ca_pçaleres"
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Reple_ga-ho tot"
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Replega des del nivell _2"
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Replega des del nivell _3"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Te_xt sota les icones"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Text del costat de les icones"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Només _icones"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Només _text"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "E_stàndard"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "_Tres columnes"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "Missat_ge ample"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "_Llista de missatges ampla"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "Pantalla pet_ita"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "Per _número"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "Per m_ida"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "Per _data"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Per data del fil"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Per ass_umpte"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "Per etiqueta de _color"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Per etiqueta"
 
 # RML To be consistent with previous one.
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "Per _marca"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "Per e_stat"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "Per adjun_t"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Per puntuació"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Per bloquejat"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "N_o classifiquis"
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Ascendent"
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Descendent"
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "Detecta _automàticament"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6489
 msgid "Modify tags..."
 msgstr "Modifica les etiquetes..."
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "S'ha(n) produït algun(s) error(s). Cliqueu aquí per veure'n el registre."
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Esteu connectat. Cliqueu a la icona per desconnectar-vos"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "Esteu desconnectat. Cliqueu a la icona per connectar-vos"
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Selecciona un compte"
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Registre de xarxa"
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Filtratge / processament del registre de depuració"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr ""
 "registre de filtratge habilitat\n"
 "\n"
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "registre de filtratge inhabilitat\n"
 
-#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
-#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
+#: 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
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "cap"
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Voleu suprimir tots els missatges de la paperera?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "No en surtis"
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Afegeix una bústia"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8279,18 +8307,18 @@ msgstr ""
 "Si s'especifica la ubicació d'una bústia de correu que ja existeix,\n"
 "s'escanejarà automàticament."
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La bústia '%s' ja existeix."
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Bústia de correu"
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8300,58 +8328,58 @@ msgstr ""
 "Pot ser que ja existeixin els fitxers o que no tingueu els permisos per "
 "escriure-hi."
 
-#: src/mainwindow.c:3389
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Cap correu permès"
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "La importació de bústia ha fallat."
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "L'exportació a bústia ha fallat."
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Surt"
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Voleu sortir del Claws Mail?"
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "_Surt"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Sincronització de carpetes"
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voleu sincronitzar les carpetes ara?"
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Sincronitza"
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Suprimint missatges duplicats..."
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4703
 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:4711
+#: src/mainwindow.c:4709
 #, 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:4715
+#: src/mainwindow.c:4713
 #, 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"
@@ -8360,62 +8388,62 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han marcat %d missatges duplicats per suprimir a la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Suprimint missatges duplicats a totes les carpetes..."
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4757
 #, 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:4764
+#: src/mainwindow.c:4762
 #, 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:4926 src/messageview.c:2647
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Seleccioneu una carpeta per anar-hi"
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Regles de processament per aplicar abans de les regles de les carpetes"
 
-#: src/mainwindow.c:5037
+#: src/mainwindow.c:5035
 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:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Configuració del filtratge"
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5156
 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:5249
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "El Claws Mail s'ha registrat com a client per defecte."
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5249
 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:5265 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Explorant la carpeta %s%c%s..."
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8739,7 +8767,7 @@ msgstr ""
 "  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:7290
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
 
@@ -8779,7 +8807,7 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Suprimeix la bústia"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Obre"
 
@@ -8864,9 +8892,9 @@ msgstr "Comprovant signatura..."
 msgid "Go back to email"
 msgstr "Torna al correu"
 
-#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
-#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
-#: src/plugins/fancy/fancy_viewer.c:538
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No s'ha pogut desar la secció del missatge multisecció: %s"
@@ -8876,68 +8904,68 @@ msgstr "No s'ha pogut desar la secció del missatge multisecció: %s"
 msgid "Overwrite existing file '%s'?"
 msgstr "Se sobreescriu el fitxer existent \"%s\"?"
 
-#: src/mimeview.c:1839
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"An error has occurred while saving message part %d. Do you want to cancel "
+"saving or ignore error and continue?"
 msgstr ""
-"Hi ha hagut un error mentre es desava la part del missatge #%d. Voleu "
+"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:1842
-msgid "Error saving all message parts"
-msgstr "Error desant totes les parts del missatge"
-
 #: src/mimeview.c:1843
-msgid "Skip"
-msgstr "Omet"
+msgid "Error saving message part"
+msgstr "Error desant la part del missatge"
 
-#: src/mimeview.c:1843
-msgid "Skip all"
-msgstr "Omet-ho tot"
+#: src/mimeview.c:1844
+msgid "Ignore"
+msgstr "Ignora"
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "Ignora-ho tot"
+
+#: src/mimeview.c:1856
 #, 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:1861
+#: src/mimeview.c:1868
 #, 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:1866
+#: src/mimeview.c:1873
 #, 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:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1910 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:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "\"%s\" no és un directori."
 
-#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
 #: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Desa com a"
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Obre amb"
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8946,7 +8974,7 @@ msgstr ""
 "Teclegeu l'ordre per obrir el fitxer:\n"
 "(\"%s\" es substituirà pel nom del fitxer)"
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8957,11 +8985,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Voleu executar un binari que no és de confiança?"
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8973,20 +9001,20 @@ msgstr ""
 "\n"
 "Voleu executar aquest fitxer?"
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Executa el binari"
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Mida:"
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9099,80 +9127,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:239
+#: src/oauth2.c:241
 msgid "OAuth2 missing authorization code\n"
 msgstr "Falta el codi d'autorització OAuth2.\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "Error de connexió d'OAuth2\n"
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:257 src/oauth2.c:397
 msgid "OAuth2 TLS connection error\n"
 msgstr "Error de connexió de TLS OAuth2\n"
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "S'ha obtingut el testimoni d'accés d'OAuth2.\n"
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "No s'ha obtingut el testimoni d'accés d'OAuth2.\n"
 
-#: src/oauth2.c:355
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "S'ha obtingut el testimoni d'actualització d'OAuth2\n"
 
-#: src/oauth2.c:357
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "No s'ha obtingut el testimoni d'actualització d'OAuth2\n"
 
-#: src/oauth2.c:489
+#: src/oauth2.c:479
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr ""
 "S'ha proporcionat un testimoni d'actualització de substitució d'OAuth2.\n"
 
-#: src/oauth2.c:491
+#: src/oauth2.c:481
 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:522
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "Error d'escriptura del sòcol d'OAuth2\n"
 
-#: src/oauth2.c:544
+#: src/oauth2.c:534
 msgid "OAuth2 socket timeout error\n"
 msgstr "Error de temps d'espera del sòcol d'OAuth2\n"
 
-#: src/oauth2.c:638
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "El testimoni d'accés d'OAuth2 encara està actualitzat.\n"
 
-#: src/oauth2.c:645
+#: src/oauth2.c:635
 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:649
+#: src/oauth2.c:639
 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:666
+#: src/oauth2.c:656
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "Accés d'OAuth2 i testimoni d'actualització actualitzats\n"
 
-#: src/oauth2.c:698
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 original: %s\n"
 
-#: src/oauth2.c:699
+#: src/oauth2.c:689
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 codificat: %s\n"
 
-#: src/oauth2.c:700
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9675,7 +9703,7 @@ msgstr "Nom i ubicació de l'arxiu"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Seleccionar"
 
@@ -9851,6 +9879,10 @@ msgstr "Canvia'n el nom"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Trieu aquesta opció per suprimir els missatges després d'arxivar-los."
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Nom del fitxer"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Suprimeix els adjunts"
@@ -10161,7 +10193,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:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
 msgid "KiB"
 msgstr "KiB"
 
@@ -10691,14 +10723,14 @@ msgid "Render embedded objects using plugins"
 msgstr "Representa els objectes encastats usant connectors."
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
+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
 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:4254
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
 #: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Servidor intermediari"
@@ -10741,7 +10773,7 @@ msgid "When clicking on a link, by default"
 msgstr "En fer clic en un enllaç, per defecte"
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
+msgid "Open in External Browser"
 msgstr "Obre-ho al navegador extern"
 
 #: src/plugins/fancy/fancy_prefs.c:300
@@ -10751,7 +10783,7 @@ msgstr "El CSS en aquest fitxer s'aplicarà a totes les seccions d'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:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Na_vega"
@@ -10760,86 +10792,86 @@ msgstr "Na_vega"
 msgid "Select stylesheet"
 msgstr "Selecciona el full d'estil."
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "La càrrega de contingut remot està inhabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Carrega les imatges."
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Habilita el contingut remot."
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Habilita Javascript."
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Habilita els connectors."
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Habilita el Java."
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Obre els enllaços amb un navegador extern."
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ha ocorregut un error: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:853
 #, 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:874
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Obre al visualitzador"
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Obre al navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Obre imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Copia l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Descarrega l'enllaç"
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Desa la imatge com a"
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Copia la imatge"
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Importa un canal"
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Elegant"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Visualitzador atractiu d'HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -11075,7 +11107,7 @@ 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:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Autenticació"
 
@@ -11298,8 +11330,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:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "hores"
 
@@ -11491,15 +11523,6 @@ msgstr ""
 "Si s'especifica la bústia existent,\n"
 "s'explorarà automàticament."
 
-#: src/plugins/mailmbox/plugin_gtk.c:332
-#, 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?"
-
 #: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr ""
@@ -11700,7 +11723,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Habilita el Sedàs"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Informació del servidor"
 
@@ -11752,27 +11775,27 @@ 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:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 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/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:134
+#: 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
 msgid "Password"
 msgstr "Contrasenya"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: 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
 msgid "Automatic"
 msgstr "Automàtic"
@@ -11789,20 +11812,20 @@ msgstr "No s'ha especificat el servidor de Sedàs."
 msgid "Sieve"
 msgstr "Sedàs"
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "Missatge nou"
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Ha fallat el registre del ganxo per a correu nou."
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "No s'ha pogut obrir el fitxer de registre %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11819,7 +11842,7 @@ msgstr ""
 "\n"
 "El registre actual és %s."
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Fitxer de registre"
 
@@ -12086,7 +12109,7 @@ msgid "Show banner"
 msgstr "Mostra la pancarta"
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Mai"
@@ -12430,68 +12453,68 @@ msgstr "de %d"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "La representació de PDF ha fallat per un motiu desconegut."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Índex del document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "Primera pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Pàgina anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Pàgina següent"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Última pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Augmenta"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Disminueix"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Ajusta la pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Ajusta l'amplada de la pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Imprimeix el document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Informació del document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Número de pàgina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Factor d'augment"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12504,13 +12527,13 @@ msgstr ""
 "\n"
 "Les opinions són benvingudes a iwkse at claws-mail.org."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "Visualitzador de PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12702,8 +12725,8 @@ 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:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
+#: src/prefs_account.c:2162 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuts"
 
@@ -12768,65 +12791,65 @@ msgstr "GPG"
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr ""
 "No coincideix exactament per a \"%s\"; si us plau, seleccioneu la clau."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recopilant info per a \"%s\" ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Sense establir"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Final"
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Seleccioneu claus"
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "ID de clau"
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Confia-hi"
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Altres"
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "_No ho encriptis"
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Afegeix una clau"
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Introduïu un altre usuari o clau ID:"
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Encriptat a %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -13311,8 +13334,8 @@ msgstr "Mostra la consola de Python"
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Navega"
@@ -13511,19 +13534,6 @@ msgstr "Introduïu l'URL dels canals de notícies a què us voleu subscriure:"
 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:190
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be permanently deleted.\n"
-"Recovery will not be possible.\n"
-"\n"
-"Do you really want to delete?"
-msgstr ""
-"Totes les carpetes i missatges de %s se suprimiran permanentment.\n"
-"La recuperació no serà possible.\n"
-"\n"
-"Realment voleu suprimir-ho?"
-
 #: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
@@ -13660,7 +13670,7 @@ msgstr "Obtén els comentaris d'articles de menys de "
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dies"
 
@@ -13807,7 +13817,7 @@ 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:1628
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Cal autorització)"
 
@@ -13816,7 +13826,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Prohibit)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (No trobat)"
 
@@ -14516,63 +14526,63 @@ msgstr "Assitents:"
 msgid "Action:"
 msgstr "Acció:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "Reunió _nova..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exporta el calendari..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "_Subscriviu-vos a Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "Can_via'n el nom..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Actualitza les subscri_pcions"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "Vista de _llista"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Vista setmanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "Vista _mensual"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Reunions"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "al passat"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "avui"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "demà"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "aquesta setmana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "més tard"
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14581,21 +14591,21 @@ msgstr ""
 "\n"
 "Aquests són els esdeveniments previstos %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, 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:1631
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (No autoritzat)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Error %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14608,7 +14618,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14619,48 +14629,48 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "No s'ha pogut crear el directori %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1918
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1929
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Actualitzant el calendari per a %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "Subscripció nova"
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1939
 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:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Subscriviu-vos a Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Introduïu l'URL de Webcal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "No s'ha pogut processar l'URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Realment voleu donar-vos-en de baixa?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Suprimeix la subscripció"
 
@@ -15136,95 +15146,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:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "Error del protocol POP\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL no vàlida: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: se suprimeix el missatge caducat %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, 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:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "la bústia està bloquejada\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Excedit el temps d'espera de la sessió\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "ordre no suportada\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "hi ha hagut un error a la sessió POP\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "ordre TOP no suportada\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "Notícies (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Fitxer de bústia local"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Cap (només SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Nom del compte"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Estableix com a predeterminat"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Informació personal"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "Adreça de correu"
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Configura automàticament"
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15232,81 +15242,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:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Aquest servidor requereix autenticació."
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Autentica en connectar."
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Servidor de notícies"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Servidor de recepció"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Bústia local"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Usa una ordre de correu enlloc del servidor SMTP."
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "ordre per enviar els correus"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Bústia d'entrada per defecte"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Els missatges sense filtrar es desaran en aquesta carpeta."
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "Autentiqueu-vos abans de la connexió POP"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "_Selecciona"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Suprimeix els missatges del servidor quan s'hagin rebut."
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Suprimeix després de"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dies i 0 hores: suprimeix immediatament"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Límit de la mida de recepció"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15314,94 +15324,94 @@ 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:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Nombre màxim d'articles per descarregar"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "sense límit si s'especifica 0"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Text pla"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(normalment buït)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Mostra només les carpetes subscrites."
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mode d'ample de banda eficient (evita recuperar etiquetes remotes)"
 
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:1831
 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:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificació automàtica"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Usa els paràmetres globals"
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Comprova si hi ha missatges nous cada"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "Filtra els missatges durant la recepció."
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permet filtrar usant connectors durant la recepció."
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 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:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:1996 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:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Genera Missatge-ID"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "Envia l'adreça de correu dins l'ID del missatge"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Afegeix un capçalera d'agent d'usuari"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Afegeix capçaleres d'usuari"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticació SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15409,219 +15419,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:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Autentica amb POP abans d'enviar."
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "Esgotament del temps d'espera de l'autenticació de POP"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Autorització"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Seleccioneu el proveïdor de serveis de correu electrònic d'OAuth2"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "ID del client"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "Secrets del client"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Obteniu el codi d’autorització"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
 msgstr "Obre el navegador per defecte amb la sol·licitud"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Copia l'enllaç"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Codi d'autorització"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2361
 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:2331
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Autorització completa"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Autoritza"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Signatura"
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "Insereix la signatura automàticament."
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Separador de signatura"
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Sortida de l'ordre"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Estableix les adreces següents automàticament."
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "Diccionaris de correcció ortogràfica"
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Diccionari per defecte"
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Diccionari alternatiu per defecte"
 
-#: src/prefs_account.c:2643 src/prefs_account.c:4116
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
 #: 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:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Respon"
 
-#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2711 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:2720
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Sistema de privacitat per defecte"
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Sempre missatges signats"
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Sempre missatges encriptats"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2791
 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:2756
+#: src/prefs_account.c:2794
 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:2759
+#: src/prefs_account.c:2797
 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:2761
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Desa els missatges encriptats enviats com a text clar."
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
 msgid "Don't use TLS"
 msgstr "No usis TLS"
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usa l'ordre d'STARTTLS per obrir la sessió encriptada"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Envia (SMTP)"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3003
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "No usis TLS (però usa STARTTLS si cal)"
 
-#: src/prefs_account.c:2976
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Certificats del client"
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Certificat per a la recepció"
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificat de client com a fitxer PKCS12 o PEM"
 
-#: src/prefs_account.c:3012
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Certificat per enviar"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Automatically accept valid TLS certificates"
 msgstr "Accepta automàticament els certificats de TLS vàlids."
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3093
 msgid "Use non-blocking TLS"
 msgstr "Usa TLS sense bloqueig"
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3105
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Desactiveu això si teniu problemes de connexió de TLS."
 
-#: src/prefs_account.c:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Usa un servidor intermediari"
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3206
 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:3170
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Usa els paràmetres globals del servidor intermediari."
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Usa autenticació."
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Usa el servidor intermediari per a l'enviament."
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15630,27 +15640,27 @@ msgstr ""
 "servidor de sortida configurat, ignorant qualsevol servidor intermediari "
 "configurat."
 
-#: src/prefs_account.c:3354
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "Port POP"
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "Port IMAP"
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Nom del domini"
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15658,156 +15668,177 @@ msgstr ""
 "El nom del domini s'usarà al Message-ID generat i en connectar a servidors "
 "SMTP."
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Usa una ordre per comunicar-se amb el servidor"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marca els missatges creuats com a llegits i acoloreix-los:"
 
-#: src/prefs_account.c:3456
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Posa els missatges enviats a"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Posa els missatges de la cua a"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Posa els esborranys a"
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Posa els missatges suprimits a"
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "No s'ha especificat el nom del compte."
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "No s'ha especificat l'adreça de correu."
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "No s'ha especificat el servidor SMTP."
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "No s'ha especificat l'usuari."
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "No s'ha especificat el servidor POP."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "La bústia d'entrada per defecte no existeix."
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "No s'ha especificat el servidor IMAP."
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "No s'ha especificat el servidor NNTP."
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3616
 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:3584
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "no s'ha especificat l'ordre de correu."
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3632
 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:3601
+#: src/prefs_account.c:3639
 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:3636
+#: src/prefs_account.c:3676
 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:3641
+#: src/prefs_account.c:3681
 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:3733
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "no se n'ha especificat el domini."
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "no s'ha seleccionat la capeta d'enviats."
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de cua."
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "no s'ha seleccionat la carpeta d'esborranys."
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de paperera."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Rep"
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Envia"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantilles"
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Privacitat"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Preferències per a un compte nou"
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferències del compte"
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Ha fallat (adreça incorrecta)"
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Selecciona un fitxer de signatura"
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Selecciona un fitxer de certificat"
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (mòdul no carregat)"
 
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Autorització completada"
+
+#: src/prefs_account.c:6139
+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
+msgid "Authorisation NOT completed"
+msgstr "Autorització NO completada"
+
+#: src/prefs_account.c:6143
+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."
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Configuració d'accions"
@@ -15942,10 +15973,9 @@ msgid "The entry was not saved. Close anyway?"
 msgstr "L'entrada no s'ha desat. Voleu tancar-ho tanmateix?"
 
 #: 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:2168 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Continua editant"
 
@@ -16147,7 +16177,7 @@ msgid "Warn when inserting a file larger than"
 msgstr "Avisa quan s'insereixi un fitxer més gran de"
 
 #: src/prefs_compose_writing.c:205
-msgid "KiB into message body "
+msgid "KiB into message body"
 msgstr "KiB al cos del missatge"
 
 #: src/prefs_compose_writing.c:211
@@ -16205,63 +16235,67 @@ msgid "Header name is not set."
 msgstr "No s'ha establert el nom de la capçalera."
 
 #: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Els dos punts (:) no es permeten en una capçalera personalitzada."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Aquest nom de capçalera no està permès com a capçalera d'usuari."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Trieu un fitxer PNG"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Trieu un fitxer XBM"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Trieu un fitxer de text"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Aquest fitxer no és una imatge"
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "La imatge triada no és de la mida correcta (48x48)."
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "La imatge és massa grossa. Ha de ser d'un màxim de 725 bytes."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "La imatge no té el format correcte (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "La imatge no té el format correcte (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "No s'ha pogut usar \"compface\". Assegureu-vos que és al vostre $PATH."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Error de Compface: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Aquest fitxer conté salts de línia."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Suprimeix la capçalera"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Realment voleu suprimir aquesta capçalera?"
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Capçaleres d'usuari actuals"
 
@@ -17608,17 +17642,17 @@ msgstr "Permet color al fons del missatge."
 #: src/prefs_msg_colors.c:247
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 1st level text background"
-msgstr "Trieu el color per al fons del text de primer nivell."
+msgstr "Trieu el color per al fons del text de 1r nivell."
 
 #: src/prefs_msg_colors.c:261
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 2nd level text background"
-msgstr "Trieu el color per al fons del text de segon nivell."
+msgstr "Trieu el color per al fons del text de 2n nivell."
 
 #: src/prefs_msg_colors.c:275
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 3rd level text background"
-msgstr "Trieu el color per al fons del text de tercer nivell."
+msgstr "Trieu el color per al fons del text de 3r nivell."
 
 #: src/prefs_msg_colors.c:288
 msgctxt "Tooltip and Dialog title"
@@ -17729,16 +17763,8 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Trieu la configuració de les dreceres de teclat."
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Selecciona la preconfiguració:"
-
-#: src/prefs_other.c:138
-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 "Select preset keyboard shortcuts:"
+msgstr "Seleccioneu les dreceres de teclat predefinides:"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
@@ -18109,8 +18135,8 @@ msgstr ""
 "Especifiqueu la codificació d'enviament (Content-Transfer-Encoding) usada "
 "quan el cos del missatge contingui caràcters no-ASCII"
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Enviant"
 
@@ -18881,35 +18907,35 @@ msgstr "Ajusta el text a"
 msgid "Wrapping"
 msgstr "Ajustament"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Previsualitza la impressió"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "Primera pàgina"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Última pàgina"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "Ampliació del 100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Augment ajustat"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Augmenta"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Disminueix"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Pàgina %d"
@@ -19290,88 +19316,88 @@ msgstr "Introduïu text per reemplaçar \"%s\""
 msgid "Enter variable"
 msgstr "Insereix una variable"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviant el missatge usant l'ordre %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "No s'ha pogut executar l'ordre: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "S'ha produït un error executant l'ordre: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Connectant"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Fent POP abans de SMTP..."
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP abans de SMTP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Compte \"%s\": connectant al servidor SMTP: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "Missatge enviat correctament."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "Enviant HELO..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Autenticant"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Enviant el missatge..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "Enviant EHLO..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "Enviant MAIL FROM..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "Enviant RCPT TO..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "Enviant DATA..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Sortint..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviant el missatge (%d / %d bytes)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Enviant el missatge"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "Hi ha hagut un error enviant el missatge."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19835,7 +19861,7 @@ msgstr "Encriptat"
 msgid "Has attachment(s)"
 msgstr "Té adjunt(s)"
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19844,11 +19870,11 @@ msgstr ""
 "Error de l'expressió regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8405
 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:8406
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Torna a la llista de carpetes"
 
@@ -20707,3 +20733,127 @@ 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 8ace742bb..2a2a68c80 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-03-27 09:41+0100\n"
-"PO-Revision-Date: 2022-03-28 14:47+0200\n"
+"POT-Creation-Date: 2022-10-11 10:26+0100\n"
+"PO-Revision-Date: 2022-10-11 19:52+0200\n"
 "Last-Translator: David Vachulka <archdvx at dxsolutions.org>\n"
 "Language-Team: Czech <cs at li.org>\n"
 "Language: cs\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -55,7 +55,7 @@ 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/mainwindow.c:518 src/messageview.c:213
+#: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "Ú_pravy"
@@ -84,7 +84,7 @@ 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:552
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovat"
@@ -132,19 +132,20 @@ msgstr " Nastavit účet jako _výchozí "
 #: 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/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:926 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:841 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: 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/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/prefs_actions.c:920 src/prefs_actions.c:946 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/summary_search.c:495
-#: src/summary_search.c:785
+#: 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/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -178,24 +179,24 @@ msgstr "Odstranit účet"
 #: 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:10736
-#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
-#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
-#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: 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/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/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1193 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:890 src/main.c:2286 src/mainwindow.c:4009
-#: src/mainwindow.c:4212 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:1818
-#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
-#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
+#: 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/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
@@ -206,7 +207,7 @@ msgstr "Odstranit účet"
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
 #: src/plugins/keyword_warner/keyword_warner.c:196
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
 #: src/plugins/managesieve/sieve_editor.c:435
 #: src/plugins/managesieve/sieve_editor.c:632
@@ -218,21 +219,20 @@ msgstr "Odstranit účet"
 #: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2030
 #: 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_actions.c:1315
-#: src/prefs_customheader.c:177 src/prefs_customheader.c:693
-#: 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_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:294 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/toolbar.c:3108
-#: src/wizard.c:1833
+#: 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_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/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Zrušit"
 
@@ -240,11 +240,11 @@ msgstr "_Zrušit"
 #: 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/plugins/att_remover/att_remover.c:429
-#: src/plugins/mailmbox/plugin_gtk.c:335
+#: 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:2032 src/prefs_actions.c:1105
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "_Odstranit"
@@ -265,17 +265,17 @@ msgstr ""
 #: 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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1860
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: 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
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -331,13 +331,13 @@ msgstr ""
 "%s"
 
 #: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9751 src/ldaputil.c:334
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1829
-#: src/plugins/vcalendar/vcal_folder.c:1847
-#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
+#: 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
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
@@ -482,13 +482,13 @@ msgstr ""
 "Opravdu chcete nahradit všechna jména atributů\n"
 "výchozím nastavením?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:1673 src/main.c:412
-#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -500,13 +500,14 @@ msgstr ""
 msgid "_No"
 msgstr "_Ne"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -541,7 +542,7 @@ msgid "New attribute name:"
 msgstr "Název nového atributu:"
 
 #: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
 #: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
@@ -554,14 +555,13 @@ 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/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: 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/mimeview.c:1819 src/password_gtk.c:213
-#: src/plugins/archive/archiver_gtk.c:575
+#: 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
@@ -622,7 +622,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplikovat emailovou adresu(y)"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adresa"
@@ -656,7 +656,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1303 src/editgroup.c:290
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -673,7 +673,7 @@ 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/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: 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"
@@ -682,7 +682,7 @@ msgstr "E-mail"
 msgid "_Book"
 msgstr "_Kniha"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Nástroje"
@@ -785,7 +785,7 @@ 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/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: 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
@@ -942,7 +942,7 @@ msgstr ""
 "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:334 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Odstranit složku"
 
@@ -1054,7 +1054,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Složka"
 
@@ -1178,18 +1178,18 @@ msgstr "Aktualizace adres"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizace selhala. Změny do slovníku nebyly zapsány."
 
-#: src/alertpanel.c:154 src/compose.c:9825
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Poznámka"
 
 #: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: 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
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Chyba"
@@ -1308,63 +1308,63 @@ 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:1251
+#: src/common/session.c:201 src/imap.c:1261
 msgid "TLS handshake failed\n"
 msgstr "TLS vyjednávání selhalo\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "SMTP AUTH je nedostupná\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Vybraná SMTP AUTH je nedostupná\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "špatná SMTP odpověď\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "nastala chyba v SMTP relaci\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "nastala chyba v autentizaci\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 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:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "nelze spustit STARTTLS relaci\n"
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Časový limit pro V/V operace se socketem.\n"
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Časový limit připojení vypršel.\n"
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: spojení selhalo (%s).\n"
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: neznámý hostitel.\n"
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: hledání hostitele selhalo (%s).\n"
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "zápis do fd%d: %s\n"
@@ -1700,7 +1700,7 @@ msgstr ""
 msgid "_Add..."
 msgstr "_Přidat..."
 
-#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: 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/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
@@ -1713,7 +1713,7 @@ msgstr "_Odstranit"
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Zpráva"
 
@@ -1725,7 +1725,7 @@ msgstr "_Pravopis"
 msgid "_Options"
 msgstr "Nastav_ení"
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "Nápo_věda"
 
@@ -1785,7 +1785,7 @@ msgstr "_Zalomené"
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vybrat vš_e"
@@ -1890,47 +1890,47 @@ msgstr "Systém _zabezpečení"
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Kniha adres"
 
@@ -1938,11 +1938,11 @@ msgstr "_Kniha adres"
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_O programu"
 
@@ -1978,12 +1978,12 @@ msgstr "Zobrazit _pravítko"
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Odesílateli"
@@ -2008,27 +2008,27 @@ msgstr "Ní_zká"
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 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:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 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:896 src/messageview.c:365
+#: src/compose.c:764 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:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
@@ -2153,7 +2153,7 @@ msgstr "Chystáte se vložit soubor %s do těla zprávy. Jste si tím jistý?"
 msgid "Are you sure?"
 msgstr "Jste si jistý?"
 
-#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Vložit"
 
@@ -2213,7 +2213,7 @@ 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/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Odeslat"
 
@@ -2377,7 +2377,7 @@ msgstr "Vybraný účet není NNTP: Odeslání není možné."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Příloha %s už neexistuje. Ignorovat?"
 
-#: src/compose.c:6430 src/mainwindow.c:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
@@ -2406,9 +2406,11 @@ msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:468
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Délka"
 
@@ -2537,42 +2539,52 @@ msgstr "Komunikace pomocí socketu s externím editorem není ve Windows možná
 #: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Nepodařilo se vytvořit následující příkaz:\n"
+"Nelze vytvořit následující příkaz externího editoru:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9750
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Externí editor ukončen s chybou: %s"
 
-#: src/compose.c:9822
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr "id procesu: %"
+
+#: src/compose.c:9830
+#, c-format
+msgid "process id: %d"
+msgstr "id procesu: %d"
+
+#: src/compose.c:9835
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %"
+"%s"
 msgstr ""
 "Externí editor stále pracuje.\n"
 "Mám přerušit proces?\n"
-"číslo procesu: %d"
+"%s"
 
-#: src/compose.c:10229 src/messageview.c:1094
+#: src/compose.c:10245 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:10432
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10436
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10437
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2580,24 +2592,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10627 src/compose.c:10641
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10655
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10657
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2606,50 +2618,50 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10734
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10735
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10736 src/compose.c:10741
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10740
+#: src/compose.c:10759
 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:10741
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10812
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10814
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10834 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:10892
+#: src/compose.c:10911
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2658,7 +2670,7 @@ 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:11708
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2676,20 +2688,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:11714
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11715
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11930
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:12226
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2720,7 +2732,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug log"
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
 #: src/uri_opener.c:226
 msgid "Close"
 msgstr "Zavřít"
@@ -2907,7 +2919,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:2443
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Soubor"
 
@@ -2915,52 +2927,48 @@ msgstr "Soubor"
 msgid "Add New Addressbook"
 msgstr "Přidat novou knihu adres"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Musí být zadáno jméno skupiny."
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
+#: src/editgroup.c:292
+msgid "Edit group data"
 msgstr "Upravit data o skupině"
 
-#: src/editgroup.c:323 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Jméno skupiny"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Adresy ve skupině"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:452
-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"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Adresy ve skupině"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
+#: src/editgroup.c:494
+msgid "Edit group details"
 msgstr "Upravit detaily o skupině"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "Přidat novou skupinu"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Upravit složku"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
@@ -2989,13 +2997,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:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
 #: 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:3197
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3047,15 +3055,15 @@ msgid ""
 "used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"Název počítače, na kterém je provozován server. Například \"ldap.mydomain.com"
-"\". Může být použita také IP adresa. Pokud server běží na stejném počítači "
-"jako Claws Mail, můžete použít \"localhost\"."
+"Název počítače, na kterém je provozován server. Například \"ldap.mydomain."
+"com\". Může být použita také IP adresa. Pokud server běží na stejném "
+"počítači jako Claws Mail, můžete použít \"localhost\"."
 
 #: src/editldap.c:467
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4227
 msgid "TLS"
 msgstr "TLS"
 
@@ -3183,11 +3191,11 @@ msgstr "Hledat pomocí 'obsahuje'"
 
 #: 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 ""
 "Hledání jmen a adres může být provedeno pomocí podmínky \"začíná na\" nebo "
 "\"obsahuje\". Při zaškrtnutí této volby bude použita podmínka \"obsahuje\", "
@@ -3218,11 +3226,11 @@ msgstr "Připojovací heslo"
 #: src/editldap.c:724
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
-"Heslo, které bude použito pro připojení spolu s údajem \"Přihlašovací jméno"
-"\"."
+"Heslo, které bude použito pro připojení spolu s údajem \"Přihlašovací "
+"jméno\"."
 
-#: src/editldap.c:727 src/prefs_account.c:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Zobrazit heslo"
@@ -3244,7 +3252,7 @@ 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:4044
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Server"
 
@@ -3331,11 +3339,11 @@ msgstr "Přidat nový vCard záznam"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Není možné nastavit klientský certifikát.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "nelze získat xover rozsah\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "nelze získat xhdr rozsah\n"
 
@@ -3400,8 +3408,8 @@ 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:1178 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: 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
 msgid "None"
 msgstr "Žádná"
@@ -3412,7 +3420,7 @@ msgstr "Žádná"
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Úplná"
@@ -3652,7 +3660,7 @@ msgstr "Exportovat knihu adres do LDIF souboru"
 msgid "Distinguished Name"
 msgstr "Rozlišovací jméno (dn)"
 
-#: src/export.c:112 src/summaryview.c:8485
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Exportovat do mbox souboru"
 
@@ -3735,11 +3743,19 @@ msgid ""
 msgstr ""
 "Soubor %s je prázdný nebo poškozen! Chcete použít zazálohovaný soubor z %s?"
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr "pravidlo není založeno na účtu\n"
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"pravidlo je založeno na účtu a odpovídá účtu aktuálně používanému k načítání "
+"zpráv\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3748,13 +3764,13 @@ msgstr ""
 "pravidlo založeno na účtu [id=%d, name='%s'], odpovídající účet používaný "
 "pro získání zpráv\n"
 
-#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
-#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
-#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "NON_EXISTENT"
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
@@ -3762,7 +3778,7 @@ msgstr ""
 "pravidlo založeno na účtu, žádný odpovídající účet není používaný pro "
 "získání zpráv\n"
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
@@ -3771,114 +3787,125 @@ msgstr ""
 "pravidlo založeno na účtu [id=%d, name='%s'], žádný odpovídající účet není "
 "používaný pro získání zpráv [id=%d, name='%s']\n"
 
-#: src/filtering.c:646
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
 "pravidlo není založeno na účtu, všechna pravidla přesto aplikována na "
 "uživatelův požadavek\n"
 
-#: src/filtering.c:652
+#: src/filtering.c:665
+msgid ""
+"rule is account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"pravidlo je založeno na účtu, všechna pravidla přesto aplikována na "
+"uživatelův požadavek\n"
+
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
 "pravidlo založeno na účtu [id=%d, name='%s'], ale všechna pravidla "
 "aplikována na uživatelův požadavek\n"
 
-#: src/filtering.c:670
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "pravidlo založeno na účtu, přeskočena na uživatelův požadavek\n"
+
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "pravidlo založeno na účtu [id=%d, name='%s'], přeskočena na uživatelův "
 "požadavek\n"
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
-msgstr "pravidlo založeno na účtu, přeskočena na uživatelův požadavek\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "pravidlo založeno na účtu, neodpovídající aktuálnímu\n"
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"pravidlo založeno na účtu [id=%d, name='%s'], neodpovídající aktuální účet "
+"pravidlo založeno na účtu [id=%d, name='%s'], neodpovídající aktuálnímu "
 "[id=%d, name='%s']\n"
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr "pravidlo založeno na účtu, neodpovídající aktuální účet\n"
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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 ""
-"pravidlo založeno na účtu [id=%d, name='%s'], aktuální účet [id=%d, "
-"name='%s']\n"
+"pravidlo založeno na účtu [id=%d, name='%s'], neodpovídající aktuální účet "
+"[id=%d, name='%s']\n"
 
-#: src/filtering.c:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "aplikace akce [ %s ]\n"
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "akce nemůže být aplikována\n"
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "žádné další zpracování po akci [ %s ]\n"
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "zpracovávání pravidla '%s' [ %s ]\n"
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "zpracovávání pravidla <unnamed> [ %s ]\n"
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "zakázané pravidlo '%s' [ %s ]\n"
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "zakázané pravidlo <unnamed> [ %s ]\n"
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "nedefinované"
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "začlenění"
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr "manuálně"
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "zpracování složky"
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "před zpracování"
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "následné zpracování"
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3895,11 +3922,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3981,17 +4008,17 @@ 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:433
+#: 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:2104
+#: src/plugins/vcalendar/vcal_folder.c:2102
 #, 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:445 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2111
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2109
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
@@ -4023,7 +4050,7 @@ msgstr "Označit všechny jako nepřečtené rek_urzivně"
 msgid "R_un processing rules"
 msgstr "S_pustit pravidla zpracování"
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
@@ -4076,11 +4103,11 @@ msgstr "Označit všechny jako přečtené"
 
 #: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
-"Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
-"jako přečtené?"
+"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
 msgid "Do you really want to mark all mails in this folder as read?"
@@ -4092,22 +4119,22 @@ msgstr "Označit všechny jako nepřečtené"
 
 #: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
-"Opravdu chcete označit všechny zprávy v této složce a jejích podsložkách "
-"jako nepřečtené?"
+"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
 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:4693
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
@@ -4154,7 +4181,7 @@ msgstr "Otevírám složku %s..."
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
@@ -4166,7 +4193,7 @@ msgstr "Odstranit všechny zprávy v koši?"
 msgid "_Empty trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
@@ -4280,7 +4307,7 @@ msgstr "Název diskusní skupiny"
 msgid "Messages"
 msgstr "Zprávy"
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Typ"
 
@@ -4306,11 +4333,11 @@ msgstr "neznámý"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/grouplistdialog.c:503
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskuzních skupin přijato (%s načteno)"
@@ -4336,7 +4363,7 @@ 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:862
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4425,46 +4452,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "přidává podporu pro šifrované spojení k severům\n"
 
 #: src/gtk/about.c:463
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "přidává podporu IPv6 adres, nového protokolu adresování v Internetu\n"
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "konverze mezi různými znakovými sadami\n"
 
-#: src/gtk/about.c:484
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "přidává podporu IPv6 adres\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "práce s adresáři PalmOS\n"
 
-#: src/gtk/about.c:494
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "práce s adresáři LDAP\n"
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "přidává podporu IMAP a NNTP serverů\n"
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "přidává podporu SVG témat\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "správa X relací\n"
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "doplní podporu pro detekci změn síťových připojení\n"
 
-#: src/gtk/about.c:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "přidává podporu SVG témat\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "přidává podporu pro OAuth2 autentizaci\n"
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4475,7 +4507,7 @@ msgstr ""
 "Foundation a to ve verzi 3, nebo (podle vašeho uvážení) v jakékoliv pozdější "
 "verzi."
 
-#: src/gtk/about.c:574
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4485,7 +4517,7 @@ msgstr ""
 "Tento program je šířen v dobré víře v jeho užitečnost, ale BEZ JAKÉKOLIV "
 "ZÁRUKY. Více detailů naleznete v GNU General Public License."
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4493,73 +4525,73 @@ msgstr ""
 "Kopii GNU General Public License byste měli obdržet společně s tímto "
 "programem. Pokud ne, viz. "
 
-#: src/gtk/about.c:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Statistiky relace\n"
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Spuštěno: %s\n"
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Příchozí provoz\n"
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Přijaté zprávy: %d\n"
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Odchozí provoz\n"
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/přesměrované zprávy: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Zodpovězené zprávy: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Přeposlané zprávy: %d\n"
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Celkem odchozích zpráv: %d\n"
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Informace"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Autoři"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Licence"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "_Poznámky k verzi"
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "_Statistiky"
 
@@ -5036,7 +5068,7 @@ msgstr "Priorita"
 msgid "Precedence:"
 msgstr "Priorita:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Organizace"
 
@@ -5249,7 +5281,7 @@ msgid "Folder contains marked messages"
 msgstr "Složka obsahuje označené zprávy"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+msgid "IMAP folder which contains subfolders only"
 msgstr "IMAP složka obsahující jen podsložky"
 
 #: src/gtk/icon_legend.c:92
@@ -5418,15 +5450,15 @@ msgstr "_Použít"
 msgid "Page Index"
 msgstr "Index stránky"
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Skrýt"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
 #: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
-#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Účet"
@@ -5880,8 +5912,7 @@ msgstr "(Žádný předmět)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Název souboru:"
@@ -5894,193 +5925,193 @@ msgstr "Velikost souboru:"
 msgid "Load Image"
 msgstr "Načíst obrázek"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "Přerušeno IMAP spojení\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP chyba na %s:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "autentizován"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "ne autentizován"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "špatný stav"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "chyba proudu"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "chyba parsování (velmi pravděpodobně non-RFC data ze serveru)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "spojení odmítnuto"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "chyba paměti"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "fatální chyba"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "chyba protokolu(velmi pravděpodobně non-RFC data ze serveru)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "spojení nepřijato"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "APPEND chyba"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "NOOP chyba"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "LOGOUT chyba"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "CAPABILITY chyba"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "CHECK chyba"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "CLOSE chyba"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "EXPUNGE chyba"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "COPY chyba"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "UID COPY chyba"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "CREATE chyba"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "DELETE chyba"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "EXAMINE chyba"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "FETCH chyba"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "UID FETCH chyba"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "LIST chyba"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "LOGIN chyba"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "LSUB chyba"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "RENAME chyba"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "SEARCH chyba"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "UID SEARCH chyba"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "SELECT chyba"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "STATUS chyba"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "STORE chyba"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "UID STORE chyba"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE chyba"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE chyba"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "STARTTLS chyba"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "INVAL chyba"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "EXTENSION chyba"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "SASL chyba"
 
-#: src/imap.c:751
+#: src/imap.c:753
 msgid "TLS error"
 msgstr "TLS chyba"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Neznámá chyba [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6092,7 +6123,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:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6104,7 +6135,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:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6116,7 +6147,7 @@ msgstr ""
 "Přihlášení pomocí SCRAM-SHA-1 pracuje pouze pokud byl libetpan zkompilován s "
 "podporou SASL a je nainstalován zásuvný modul SCRAM SASL."
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6128,7 +6159,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:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6140,7 +6171,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:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -6150,37 +6181,37 @@ msgstr ""
 "\n"
 "OAuth2 chyba. Zkontrolujte a opravte nastavení OAuth2 účtu."
 
-#: src/imap.c:1004
+#: src/imap.c:1014
 #, 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:1008
+#: src/imap.c:1018
 #, 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:1026
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Připojení k %s selhalo"
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1043 src/imap.c:1046
 #, 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:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 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:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 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"
@@ -6193,108 +6224,108 @@ msgstr ""
 "\n"
 "Chcete pokračovat v připojování k serveru? Komunikace nebude zabezpečena."
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 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:1192
+#: src/imap.c:1202
 #, 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:1257
+#: src/imap.c:1267
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemohu se spojit s IMAP serverem: %s:%d"
 
-#: src/imap.c:1260
+#: src/imap.c:1270
 #, 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:1292 src/imap.c:4164
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nelze spustit STARTTLS relaci.\n"
 
-#: src/imap.c:1364
+#: src/imap.c:1374
 #, 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:1367
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodařilo se přihlásit k IMAP serveru %s."
 
-#: src/imap.c:1795
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Přidávám zprávy..."
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: src/imap.c:2526
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "Hledání selhalo kvůli chybě serveru."
 
-#: src/imap.c:2610
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "nelze nastavit příznak odstranění\n"
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:2992
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Vyhledávám odhlášené složky v %s..."
 
-#: src/imap.c:2995
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hledám podsložky %s..."
 
-#: src/imap.c:3286
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit mailbox: selhal příkaz LIST\n"
 
-#: src/imap.c:3299
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit mailbox\n"
 
-#: src/imap.c:3429
+#: src/imap.c:3439
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat mailbox: %s na %s\n"
 
-#: src/imap.c:3542
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "nelze odstranit mailbox\n"
 
-#: src/imap.c:3821
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST selhal\n"
 
-#: src/imap.c:3906
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Označuji zprávy..."
 
-#: src/imap.c:4009
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:4161
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vyžaduje STARTTLS pro přihlášení.\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodařilo se načíst údaje o schopnostech serveru IMAP.\n"
 
-#: src/imap.c:4176
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6303,20 +6334,20 @@ msgstr ""
 "Připojení k %s selhalo: server požaduje STARTTLS, ale Claws Mail je "
 "zkompilován bez podpory STARTTLS.\n"
 
-#: src/imap.c:4184
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Přihlašování k serveru je mimo provoz.\n"
 
-#: src/imap.c:4407
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Stahuji zprávu..."
 
-#: src/imap.c:5108
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nelze nastavit příznak odstranění: %d\n"
 
-#: src/imap.c:6143
+#: src/imap.c:6153
 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"
@@ -6366,7 +6397,7 @@ msgstr "_Odebírání"
 msgid "_Subscribe..."
 msgstr "_Odebírat..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Odhlásit..."
 
@@ -6398,21 +6429,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:422 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 #, 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:423
+#: 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:2097
+#: src/plugins/vcalendar/vcal_folder.c:2095
 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:453 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2117
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2115
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6420,32 +6451,33 @@ msgstr ""
 "Složka nemohla být přejmenována.\n"
 "Nové jméno složky není dovoleno."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Vybrat složku pro přesunutí složky '%s'"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 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/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
+#: src/plugins/rssyl/rssyl_cb_menu.c:190
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"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"
+"Všechny složky a zprávy v '%s' budou nenávratně odstraněny. \n"
+"Obnovení nebude možné.\n"
 "\n"
 "Chcete je opravdu odstranit?"
 
-#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: 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:2050
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
@@ -6472,7 +6504,7 @@ msgstr "_Vyhledat"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Vyberte podsložku ve složce %s, kterou chcete odebírat: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Odebírat"
 
@@ -6707,32 +6739,32 @@ msgstr "Vyberte Pine soubor"
 msgid "Import Pine file into Address Book"
 msgstr "Importovat Pine soubor do knihy adres"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail potřebuje přístup k síti, aby mohl stáhnout zprávy."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s selhal\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6740,28 +6772,28 @@ msgstr[0] "Hotovo (%d zpráva (%s) přijato)"
 msgstr[1] "Hotovo (%d zprávy (%s) přijato)"
 msgstr[2] "Hotovo (%d zpráv (%s) přijato)"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: 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
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6769,66 +6801,66 @@ msgstr[0] "Dokončeno (%d nová zpráva)"
 msgstr[1] "Dokončeno (%d nové zprávy)"
 msgstr[2] "Dokončeno (%d nových zpráv)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (nejsou nové zprávy)"
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na POP3 server: %s:%d..."
 
-#: src/inc.c:930
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d"
 
-#: src/inc.c:934
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Získávám zprávy z %s (%s)..."
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6836,16 +6868,16 @@ msgstr[0] "Hotovo (%d zpráva (%s) přijato)"
 msgstr[1] "Hotovo (%d zprávy (%s) přijato)"
 msgstr[2] "Hotovo (%d zpráv (%s) přijato)"
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Připojení k %s:%d selhalo."
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "Nastala chyba během zpracovávání pošty."
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6854,37 +6886,37 @@ msgstr ""
 "Nastala chyba během zpracovávání pošty:\n"
 "%s"
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba socketu v připojení k %s:%d."
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Připojení bylo ukončeno vzdáleným počítačem."
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Připojení k %s:%d bylo ukončeno vzdáleným počítačem."
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "Schránka je zamknuta."
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6893,11 +6925,11 @@ msgstr ""
 "Schránka je uzamčen:\n"
 "%s"
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6906,7 +6938,7 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6914,48 +6946,48 @@ msgstr ""
 "Čas relace vypršel. Můžete ji obnovit zvýšením hodnoty ve Volby/Ostatní/"
 "Různé."
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Časový limit připojení k %s:%d vypršel."
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: 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:1834
+#: 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
 msgid "seconds"
 msgstr "sekund"
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodin"
 
-#: src/inc.c:1661
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sPracujete v režimu offline. Přepnout pro %d %s?"
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete v režimu offline. Přepnout?"
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "Pouze _jednou"
 
@@ -7379,831 +7411,831 @@ msgstr "NetworkManager: network is online.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "Z_obrazit"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "Nastav_ení"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "_Přidat schránku"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Změnit pořadí schránek..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "_Importovat mbox soubor..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "_Exportovat do mbox souboru..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "Exportovat _vybrané do mbox souboru..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "Vyprázdnit všechny _koše"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "Uložit email j_ako..."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "Uložit část j_ako..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Nastavení stránky..."
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "Synchronizovat složky"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "_Konec"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Vybrat _vlákno"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "_Rychlé vyhledávání"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "Nástrojová lišta"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Zobrazované _sloupce"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "V seznamu _složek..."
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "V seznamu _zpráv..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "Us_pořádání"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "_Seskupit dle předmětu"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Jít na"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Předchozí zpráva"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Další zpráva"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Pře_dchozí nepřečtenou zpráva"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Da_lší nepřečtená zpráva"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Předchozí no_vá zpráva"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "D_alší nová zpráva"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Předchozí _označená zpráva"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Další o_značená zpráva"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Předchozí _obarvená zpráva"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Další o_barvená zpráva"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:594
 msgid "Previously opened message"
 msgstr "Předchozí otevřená zpráva"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Další otevřená zpráva"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Rodičovská zpráva"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Následující nepřečtená _složka"
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "Sl_ožka..."
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Další část"
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Předchozí část"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Rolování zpráv"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Předchozí řádek"
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Další řádek"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Předchozí stránka"
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Další stránka"
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Dekódovat"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "Otevřít v _novém okně"
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Zd_roj zprávy"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Část zprávy"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Zobrazit jako text"
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Otevřít čím..."
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citace"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "_Aktualizace souhrnu"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "Přij_mout"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Přijmout z _aktuálního účtu"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Přijmout ze _všech účtů"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "Přerušit stahování zprá_v"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "_Odeslat pozdržené zprávy"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "_Napsat nový mail"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "_Napsat news zprávu"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:665 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Odpovědět ko_mu"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "Postoupit a odpovědět"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "Pře_dat"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Předat jako pří_lohu"
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
 #: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Pře_směrovat"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "Zobrazit archív"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "Kontaktovat vlastníka"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "Přesunou_t..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Přesuno_ut do koše"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "_Odstranit..."
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Přesunout vlákno do _koše"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "Odstranit _vlákno"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Stornovat news zprávu"
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "Označ_it"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "Odo_značit"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Označit jako _přečtené"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Označit jako _nepřečtené"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Označit všechny přečtené ve složce"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Označit všechny nepřečtené ve složce"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorovat vlákno"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Přestat ignorovat vlákno"
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Sledovat vlákno"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Nesledovat vlákno"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Označit jako _spam"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Označit jako n_e spam"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "O_barvit"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "Zn_ačky"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "Znovu _upravit"
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Zkontrolovat podpis"
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Přidat odesílatele do kni_hy adres"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "S_bírat adresy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Z aktuální _složky..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Z vybraných _zpráv..."
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "Pře_filtrovat všechny zprávy ve složce"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "Přefiltrovat _vybrané zprávy"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustit pravidl_o zpracování složky"
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Podle _Od"
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Podle _Komu"
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Podle _Předmětu"
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Podle od_esílatele"
 
-#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Vytvořit pravidlo zpracování"
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Seznam _URLs..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "_Zjistit nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "_Odstranit duplikáty zpráv"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "Ve vybrané složce"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "Ve všech složkách"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "S_pustit"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "Vy_mazat"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr "TLS cer_tifikáty"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Záznam filtrování"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Záznam o připojení"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Debug _log"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "_Zapomenout všechna hesla relace"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr "Zapomenout _hlavní heslo"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "_Zvolit aktuální účet"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "Upravit a_ktuální účet..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "Vytvořit _nový účet..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "U_pravit účty..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "_Volby..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "Před zpracování..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "Následné zpracování..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Filtrování..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "Ša_blony..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Akce..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "Znač_ky..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ (online)"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "_Význam ikon"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Nastavit jako výchozí klient"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "Offline _mód"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Řádek men_u"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "_Náhled zprávy"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "_Stavový řádek"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Záhlaví sloupců"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Zobrazit všechny _hlavičky"
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Sbalit vše"
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Sbalit od úrovně _2"
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Sbalit od úrovně _3"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Text _vedle ikon"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Jen _ikony"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Jen _text"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "_Standartní"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "_Tři sloupce"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "Široký náhled _zpráv"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "Široký _seznam zpráv"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "Podle čí_sla"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "Podle _velikosti"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "Podle _data"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Podle data vlákna"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Podle _předmětu"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "Podle _barevného označení zprávy"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Podle tag"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "Podle _značky"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "Podle _stavu"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "Podle _přílohy"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Podle skóre"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Podle zamknuto"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Sestupně"
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6489
 msgid "Modify tags..."
 msgstr "Upravit značky..."
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Došlo k chybě (chybám). Klikněte zde pro zobrazení protokolu."
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 "Pracujete v režimu online. Klikněte na ikonu pro přechod do režimu offline"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Pracujete v režimu offline. Klikněte na ikonu pro přechod do režimu online"
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Vybrat účet"
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Síťový protokol"
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "protokolování filtrů zapnuto\n"
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "protokolování filtrů vypnuto\n"
 
-#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
-#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
+#: 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
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Přidat schránku"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8217,18 +8249,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka '%s' již existuje."
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8238,51 +8270,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:3389
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "_Ukončit"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Synchronizovat"
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Žádná duplicitní zpráva ve vybrané složce.\n"
 
-#: src/mainwindow.c:4711
+#: src/mainwindow.c:4709
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8290,7 +8322,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:4715
+#: src/mainwindow.c:4713
 #, 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"
@@ -8298,11 +8330,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:4753
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Vymazávám duplikované zprávy ve všech složkách..."
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8310,47 +8342,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:4764
+#: src/mainwindow.c:4762
 #, 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:4926 src/messageview.c:2647
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Vybrat složku pro přejití"
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 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:5037
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5156
 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:5249
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5249
 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:5265 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s..."
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8670,7 +8702,7 @@ msgstr ""
 "  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:7290
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
@@ -8710,7 +8742,7 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Odstranit schránku"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Otevřít"
 
@@ -8791,9 +8823,9 @@ msgstr "Kontroluji podpis..."
 msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
-#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
-#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
-#: src/plugins/fancy/fancy_viewer.c:538
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
@@ -8803,28 +8835,28 @@ msgstr "Nepodařilo se uložit tuto část zprávy: %s"
 msgid "Overwrite existing file '%s'?"
 msgstr "Přepsat existující soubor '%s'?"
 
-#: src/mimeview.c:1839
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"An error has occurred while saving message part %d. Do you want to cancel "
+"saving or ignore error and continue?"
 msgstr ""
-"Nastala chyba při ukládání části zprávy #%d. Chcete operaci zrušit nebo "
+"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:1842
-msgid "Error saving all message parts"
-msgstr "Chyba při ukládání všech částí zprávy"
-
 #: src/mimeview.c:1843
-msgid "Skip"
-msgstr "Přeskočit"
+msgid "Error saving message part"
+msgstr "Chyba při ukládání části zprávy"
 
-#: src/mimeview.c:1843
-msgid "Skip all"
-msgstr "Vše přeskočit"
+#: src/mimeview.c:1844
+msgid "Ignore"
+msgstr "Ignorovat"
+
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "Ignorovat vše"
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1856
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8832,7 +8864,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:1861
+#: src/mimeview.c:1868
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8840,7 +8872,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:1866
+#: src/mimeview.c:1873
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8848,26 +8880,26 @@ msgstr[0] "%s, %d soubor selhal."
 msgstr[1] "%s, %d soubory selhaly."
 msgstr[2] "%s, %d souborů selhalo."
 
-#: src/mimeview.c:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1910 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:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' není adresář."
 
-#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
 #: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8876,7 +8908,7 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8887,11 +8919,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Spustit nedůvěryhodný binární soubor?"
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8903,20 +8935,20 @@ msgstr ""
 "\n"
 "Chcete ho spustit?"
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Spustit binární soubor"
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9028,77 +9060,77 @@ msgstr "Odhlásit diskusní skupinu"
 msgid "Rename newsgroup folder"
 msgstr "Přejmenovat složku diskuzní skupiny"
 
-#: src/oauth2.c:239
+#: src/oauth2.c:241
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 - chybějící autorizační kód\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 - chyba spojení\n"
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:257 src/oauth2.c:397
 msgid "OAuth2 TLS connection error\n"
 msgstr "Chyba připojení OAuth2 TLS\n"
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2 - přístupový token získán\n"
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2 - přístupový token nebyl získán\n"
 
-#: src/oauth2.c:355
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2 - obnovený token získán\n"
 
-#: src/oauth2.c:357
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2 - obnovený token nebyl získán\n"
 
-#: src/oauth2.c:489
+#: src/oauth2.c:479
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "OAuth2 - obnovený token získán\n"
 
-#: src/oauth2.c:491
+#: src/oauth2.c:481
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "OAuth2 - obnovený token nebyl získán\n"
 
-#: src/oauth2.c:522
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 - chyba při psaní do soketu\n"
 
-#: src/oauth2.c:544
+#: src/oauth2.c:534
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 - chyba soketu, vypršení času\n"
 
-#: src/oauth2.c:638
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 - přístupový stále aktuální\n"
 
-#: src/oauth2.c:645
+#: src/oauth2.c:635
 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:649
+#: src/oauth2.c:639
 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:666
+#: src/oauth2.c:656
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 - přístupový token updatován\n"
 
-#: src/oauth2.c:698
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 originál: %s\n"
 
-#: src/oauth2.c:699
+#: src/oauth2.c:689
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 kódováno: %s\n"
 
-#: src/oauth2.c:700
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9590,7 +9622,7 @@ msgstr "Umístění a jméno archivu"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Vybrat"
 
@@ -9761,6 +9793,10 @@ msgstr "Přejmenovat"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Vyberte tuto možnost pro mazání mailů po archivování"
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Název souboru"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Odebrat přílohy"
@@ -10063,7 +10099,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:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
 msgid "KiB"
 msgstr "KiB"
 
@@ -10575,14 +10611,14 @@ msgid "Render embedded objects using plugins"
 msgstr "Renderovat vložené objekty pomocí zásuvných modulů"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
+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
 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:4254
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
 #: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Proxy"
@@ -10624,7 +10660,7 @@ msgid "When clicking on a link, by default"
 msgstr "Při kliknutí na odkaz"
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
+msgid "Open in External Browser"
 msgstr "Otevřít v externím prohlížeči"
 
 #: src/plugins/fancy/fancy_prefs.c:300
@@ -10634,7 +10670,7 @@ msgstr "CSS z tohoto souboru bude aplikováno na všechny HTML části"
 #: 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:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "_Procházet"
@@ -10643,86 +10679,86 @@ msgstr "_Procházet"
 msgid "Select stylesheet"
 msgstr "Vyberte šablona stylu"
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "Načítání vzdáleného obsahu je zakázáno."
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Načíst obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Odblokovat externí obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Povolit Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Povolit zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Povolit Javu"
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Otevřít odkazy v externím prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:853
 #, 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:874
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Otevřít obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Kopírovat odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Stáhnout odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Uložit obrázek jako"
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Kopírovat obrázek"
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Načíst kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML prohlížeč"
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10953,7 +10989,7 @@ 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:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Autentizace"
 
@@ -11166,8 +11202,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:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "hodin"
 
@@ -11355,15 +11391,6 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/plugins/mailmbox/plugin_gtk.c:332
-#, 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?"
-
 #: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Sieve auth metoda je nedostupná\n"
@@ -11554,7 +11581,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:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Informace o serveru"
 
@@ -11605,27 +11632,27 @@ 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:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 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/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:134
+#: 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
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: 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
 msgid "Automatic"
 msgstr "Automaticky"
@@ -11642,20 +11669,20 @@ msgstr "Nebyl zadán Sieve server."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Nepodařilo se zaregistrovat funkci newmail"
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Nepodařilo se otevřít soubor záznamu %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11672,7 +11699,7 @@ msgstr ""
 "\n"
 "Aktuální log je v %s"
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Soubor záznamu"
 
@@ -11936,7 +11963,7 @@ msgid "Show banner"
 msgstr "Zobrazovat proužek"
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nikdy"
@@ -12282,68 +12309,68 @@ msgstr "z %d"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Renderovaní PDF selhalo z neznámého důvodu."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Index dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "První stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Předchozí stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Následující stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Poslední stránka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Zvětšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Zmenšit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Přizpůsobit stránce"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Přizpůsobit šířce stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Otočit vlevo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Otočit vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Vytisknout dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Informace o dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Číslo stránky"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Faktor zobrazení"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12356,13 +12383,13 @@ msgstr ""
 "\n"
 "Jakákoliv zpětná vazba je vítána: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "Prohlížeč PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12552,8 +12579,8 @@ 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:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
+#: src/prefs_account.c:2162 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut(y)"
 
@@ -12618,64 +12645,64 @@ msgstr "GPG"
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "Nenalezena shoda pro '%s'; prosím vyberte klíč."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Získávám informace pro '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Částečná"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Absolutní"
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Vybrat klíče"
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "ID klíče"
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Důvěřovat"
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Ostatní"
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "_Nešifrovat"
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Přidat klíč"
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Zadejte dalšího uživatele nebo ID klíče:"
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Šifrování %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -13158,8 +13185,8 @@ msgstr "Zobrazit konzoli Pythonu..."
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Procházet"
@@ -13347,19 +13374,6 @@ msgstr "Vložte URL kanálu, který chcete odebírat:"
 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:190
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be permanently deleted.\n"
-"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. \n"
-"Obnovení nebude možné.\n"
-"\n"
-"Chcete je opravdu odstranit?"
-
 #: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
@@ -13493,7 +13507,7 @@ msgstr "Stahovat komentáře staré méně než"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dnech"
 
@@ -13635,7 +13649,7 @@ 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:1628
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadována autorizace)"
 
@@ -13644,7 +13658,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Zakázán)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Nenalezen)"
 
@@ -14332,63 +14346,63 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akce:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nová schůzka..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exportovat kalendář..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "_Přihlásit Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "Pře_jmenovat..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "U_pdatovat přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "Zobrazení jako _seznam"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "Zobrazení po _týdnech"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "Zobrazení po _měsících"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Schůzky"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "zítra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "tento týden"
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "později"
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14397,21 +14411,21 @@ msgstr ""
 "\n"
 "Jsou plánovány tyto události %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, 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:1631
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Neuatorizován)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14424,7 +14438,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14435,46 +14449,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nepodařilo se vytvořit složku %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1918
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1929
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Stahování kalendáře pro %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "nové přihlášení"
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1939
 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:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Přihlásit Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Vložte Webcal URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "Nemohu parsovat URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Skutečně chcete odhlásit?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Smazat odběr"
 
@@ -14946,95 +14960,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:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "Chyba protokolu POP\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpověď: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Vymazávám starou zprávu %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, 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:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "schránka je zamknuta\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Časový limit pro relaci vypršel\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "příkaz není podporován\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "nastala chyba v POP relaci\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "Příkaz TOP není podporován\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "Diskusní skupiny (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Žádný (pouze odesílání SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Název účtu"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Automatická konfigurace"
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15042,81 +15056,81 @@ msgstr ""
 "Varování: tato verze Claws Mail byla zkompilována\n"
 "bez podpory IMAP a News."
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Autentizace při připojení"
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Server diskuzních skupin"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Lokální schránka"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Použít místo SMTP serveru příkaz pro odeslání"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "příkaz pro odeslání pošty"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 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:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "Autentizace před POP připojením"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "Vybrat"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Odstranit zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dnů a 0 hodin: odstranit ihned"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15124,94 +15138,94 @@ 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:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků pro stažení"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "Adresář pro IMAP server"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 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:1798
+#: src/prefs_account.c:1831
 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:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatický příjem pošty"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Použít globální nastavení"
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Přijímat poštu každých"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 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:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:1996 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:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Přidat záhlaví user agent"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15219,215 +15233,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:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Autentizace POP před odesláním"
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "Časový limit pro POP autentizaci"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Autentizace"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Vyberte poskytovatele OAuth2 email služby"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "ID klienta"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "Klientské certifikát"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Získat autorizační kód"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
 msgstr "Otevřít výchozí prohlížeč s požadavkem"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Kopírovat odkaz"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Autorizační kód"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2361
 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:2331
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Dokončit autorizaci"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Autorizovat"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "Automaticky vložit podpis"
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2596 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:2643 src/prefs_account.c:4116
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
 #: 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:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2696 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:2673 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2711 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:2720
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Výchozí systém zabezpečení"
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Zprávy vždy digitálně podepsat"
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Zprávy vždy šifrovat"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr "Odpověď na podepsanou zprávu vždy podepsat"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Odpověď na šifrovanou zprávu vždy šifrovat"
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2797
 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:2761
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Odeslané šifrované zprávy uložit jako čistý text"
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
 msgid "Don't use TLS"
 msgstr "Nepoužívat TLS"
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 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:2961
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3003
 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:2976
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Klientské certifikáty"
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Certifikát pro příjem"
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 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:3012
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Certifikát pro odeslání"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Automatically accept valid TLS certificates"
 msgstr "Automaticky přijímat platné certifikáty TLS"
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3093
 msgid "Use non-blocking TLS"
 msgstr "Použít neblokující TLS"
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3105
 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:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Použít proxy server"
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3206
 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:3170
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Použít globální nastavení proxy"
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Použít autentizaci"
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Použít proxy server pro odeslání"
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15436,27 +15450,27 @@ msgstr ""
 "nakonfigurovanému odchozímu serveru s vynecháním libovolného "
 "nakonfigurovaného proxy serveru."
 
-#: src/prefs_account.c:3354
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Název domény"
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15464,156 +15478,177 @@ msgstr ""
 "Jméno domény bude použito pro generované Message-ID a při připojení SMTP "
 "serverů."
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Příkaz pro komunikaci se serverem"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 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:3456
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Ukládat odložené zprávy do"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Ukládat odstraněné zprávy do"
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "Nebyl zadán POP server."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3599
 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:3567
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "Nebyl zadán IMAP server."
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "nebyl zadán název lokálního schránky."
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "nebyl zadán příkaz pro odeslání."
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "User ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3601
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3636
+#: src/prefs_account.c:3676
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP user ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3641
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3733
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "doména není uvedena."
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "odesílaná není vybrána."
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "fronta není vybrána."
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "koncepty nejsou vybrány."
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "koš není vybrán."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Odeslat"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Selhalo (špatná adresa)"
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
 
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Autorizace je kompletní"
+
+#: src/prefs_account.c:6139
+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
+msgid "Authorisation NOT completed"
+msgstr "Autorizace NENÍ kompletní"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "Váš autorizační kód OAuth2 neobdržel Claws Mail"
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Nastavení akcí"
@@ -15748,10 +15783,9 @@ msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
 
 #: 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:2168 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Pokračovat v úpravách"
 
@@ -15759,6 +15793,9 @@ msgstr "_Pokračovat v úpravách"
 msgid "Actions list not saved"
 msgstr "Seznam akcí neuložen"
 
+#: src/prefs_actions.c:919
+msgid "The actions list has been modified. Close anyway?"
+msgstr "Seznam akcí byl změnen. Chcete přesto zavřít?"
 
 #: src/prefs_actions.c:989
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
@@ -15890,11 +15927,11 @@ msgstr "V %d\\n%f napsáno:\\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\\nZačátek předané zprávy:\\n\\n?d{Datum: %d\\n}?f{Od: %f\\n}?t{Komu: %t"
-"\\n}?c{Kopie: %c\\n}?n{Diskuzní skupina: %n\\n}?s{Předmět: %s\\n}\\n\\n%M"
+"\\n\\nZačátek předané zprávy:\\n\\n?d{Datum: %d\\n}?f{Od: %f\\n}?t{Komu: "
+"%t\\n}?c{Kopie: %c\\n}?n{Diskuzní skupina: %n\\n}?s{Předmět: %s\\n}\\n\\n%M"
 
 #: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
@@ -15945,8 +15982,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "Varovat při vložení souboru většího než"
 
 #: src/prefs_compose_writing.c:205
-msgid "KiB into message body "
-msgstr "KiB v těle zprávy "
+msgid "KiB into message body"
+msgstr "KiB v těle zprávy"
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -16003,65 +16040,69 @@ msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
 #: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Dvojtečka (:) není povolená v uživatelském záhlaví."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Toto záhlaví není povoleno jako uživatelské záhlaví."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Choose a PNG file"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Vyberte xbm soubor"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Vyberte textový soubor"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Tento soubor není obrázek."
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Vybraný obrázek nemá správnou velikost (48x48)."
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Obrázek je příliš velký; maximální velikost je 725 B."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Obrázek nemá správný formát (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Obrázek nemá správný formát (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Nepodařilo se zavolat program `compface`. Ujistěte se, že je v adresáři "
 "uvedeném v proměnné $PATH."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface chyba: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Tento soubor obsahuje znak(y) \"nový řádek\"."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Odstranit záhlaví"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Opravdu chcete odstranit toto záhlaví?"
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Aktuální vlastní záhlaví"
 
@@ -17512,16 +17553,8 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Vyberte klávesové zkratky"
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Vyberte schéma:"
-
-#: src/prefs_other.c:138
-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 "Select preset keyboard shortcuts:"
+msgstr "Vyberte klávesovou zkratku:"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
@@ -17890,8 +17923,8 @@ msgstr ""
 "Určete kódování (Content-Transfer-Encoding), které bude použito, pokud "
 "zpráva obsahuje znaky neobsažené v ASCII"
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Odesílání"
 
@@ -18654,35 +18687,35 @@ msgstr "Zalomit text v"
 msgid "Wrapping"
 msgstr "Zalamování"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Náhled"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "První stránka"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Poslední stránka"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "Zobrazit 100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Přizpůsobit"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Zvětšit"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Zmenšit"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Stránka %d"
@@ -19052,88 +19085,88 @@ msgstr "Vložte text pro nahrazení '%s'"
 msgid "Enter variable"
 msgstr "Zadání proměnných"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Posílám zprávu pomocí příkazu: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemohu provést příkaz: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Nastala chyba během provádění příkazu: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Připojení"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Provádím POP před SMTP..."
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP před SMTP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Účet '%s': Připojuji se na SMTP server: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "Pošta byla úspěšně odeslána."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "Posílám HELO..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Posílám zprávu..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "Posílám EHLO..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "Posílám MAIL FROM..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "Posílám RCPT TO..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "Posílám DATA..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Ukončuji..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Posílám zprávu"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "Nastala chyba při posílání zprávy."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19595,7 +19628,7 @@ msgstr "Šifrovaná zpráva"
 msgid "Has attachment(s)"
 msgstr "Má přílohu/přílohy"
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19604,11 +19637,11 @@ msgstr ""
 "Chyba v regulárním výrazu (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8405
 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:8406
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Přejít zpět na seznam složek"
 
@@ -20461,3 +20494,176 @@ 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/nl.po b/po/nl.po
index 15fc207a2..1e9d674dd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,5 +1,5 @@
 # Dutch translation of Claws Mail.
-# Copyright © 2001 - 2021 The Claws Mail team.
+# Copyright © 2001 - 2022 The Claws Mail team.
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
@@ -7,7 +7,7 @@
 # Claws merge by Alfons Hoogervorst <alfons at proteus.demon.nl>
 # Claws maintenance 2002 by Wilbert Berendsen <wbsoft at xs4all.nl>
 # Claws maintenance 2006-2007 by Tim Dijkstra <tim at famdijkstra.org>
-# Claws maintenance 2008-2021 by Marcel Pol <marcel at timelord.nl>
+# Claws maintenance 2008-2022 by Marcel Pol <marcel at timelord.nl>
 #
 # TODO:
 # Snelkoppelingen nalopen.
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 4.0.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2021-07-03 09:15+0100\n"
-"PO-Revision-Date: 2021-07-09 10:34+0200\n"
+"POT-Creation-Date: 2022-10-11 10:26+0100\n"
+"PO-Revision-Date: 2022-10-14 13:08+0200\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
 "Language-Team: translators at lists.claws-mail.org\n"
 "Language: nl\n"
@@ -54,158 +54,238 @@ msgstr ""
 "in de kolom 'O' geeft aan voor welke accounts dit wordt gedaan. Vetgedrukte "
 "tekst geeft het standaardaccount aan."
 
-#: src/account.c:822
+#: src/account.c:781 src/foldersel.c:348
+msgid "_New"
+msgstr "_Nieuw"
+
+#: src/account.c:787
+msgid "Create a new account"
+msgstr "Nieuw account aanmaken"
+
+#: 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/mainwindow.c:516 src/messageview.c:213
+#: src/plugins/managesieve/sieve_editor.c:82
+msgid "_Edit"
+msgstr "B_ewerken"
+
+#: src/account.c:795
+msgid "Edit preferences for the selected account"
+msgstr "Voorkeuren bewerken voor het geslecteerde account"
+
+#: 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/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
+#: src/prefs_actions.c:746 src/prefs_customheader.c:256
+#: src/prefs_filtering.c:472 src/prefs_filtering.c:1196
+#: src/prefs_filtering.c:1216 src/prefs_template.c:316 src/prefs_template.c:899
+#: src/prefs_template.c:912 src/prefs_toolbar.c:1010 src/ssl_manager.c:211
+#: src/ssl_manager.c:453
+msgid "D_elete"
+msgstr "V_erwijderen"
+
+#: src/account.c:803
+msgid "Delete the selected account from the list"
+msgstr "Verwijder het geselecteerde account van de lijst"
+
+#: 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/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
+msgid "_Copy"
+msgstr "_Kopiëren"
+
+#: src/account.c:811
+msgid "Create a new copy of the selected account"
+msgstr "Nieuwe kopie maken van het geselecteerde account"
+
+#: src/account.c:813 src/editaddress.c:1324 src/gtk/foldersort.c:318
+#: src/prefs_actions.c:401 src/prefs_customheader.c:289
+#: src/prefs_display_header.c:391 src/prefs_filtering_action.c:620
+#: src/prefs_filtering.c:538 src/prefs_folder_column.c:316
+#: src/prefs_matcher.c:831 src/prefs_summary_column.c:330
+#: src/prefs_summary_open.c:295 src/prefs_template.c:374
+#: src/prefs_toolbar.c:1058
+msgid "_Down"
+msgstr "Naar b_eneden"
+
+#: src/account.c:819
+msgid "Move the selected account down"
+msgstr "Verplaats het geselecteerde account naar onderen"
+
+#: src/account.c:821 src/editaddress.c:1323 src/gtk/foldersort.c:312
+#: src/prefs_actions.c:393 src/prefs_customheader.c:283
+#: src/prefs_display_header.c:385 src/prefs_filtering_action.c:615
+#: src/prefs_filtering.c:530 src/prefs_folder_column.c:312
+#: src/prefs_matcher.c:826 src/prefs_summary_column.c:326
+#: src/prefs_summary_open.c:289 src/prefs_template.c:366
+#: src/prefs_toolbar.c:1054
+msgid "_Up"
+msgstr "Naar bo_ven"
+
+#: src/account.c:827
+msgid "Move the selected account up"
+msgstr "Verplaats het geselecteerde account naar boven"
+
+#: src/account.c:834
 msgid " _Set as default account "
 msgstr " _Instellen als standaard account "
 
-#: src/account.c:829 src/action.c:1405 src/addrduplicates.c:843
-#: src/addressadd.c:601 src/addressbook.c:427 src/addressbook.c:1437
-#: src/addressbook.c:3258 src/addressbook.c:3309 src/addressbook.c:4176
-#: src/addressbook.c:4182 src/addressbook.c:4298 src/addrindex.c:1836
-#: src/alertpanel.c:129 src/alertpanel.c:193 src/browseldap.c:301
-#: src/compose.c:631 src/exphtmldlg.c:293 src/expldifdlg.c:323
-#: src/gtk/about.c:912 src/gtk/gtkutils.c:90 src/gtk/icon_legend.c:184
-#: src/gtk/pluginwindow.c:391 src/gtk/prefswindow.c:509
-#: src/gtk/sslcertwindow.c:374 src/importldif.c:438 src/inc.c:841
-#: src/message_search.c:320 src/messageview.c:225
+#: 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/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/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/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:631
-#: src/plugins/managesieve/sieve_manager.c:785
-#: src/plugins/pdf_viewer/poppler_viewer.c:1228
-#: src/plugins/pgpcore/sgpgme.c:815 src/prefs_actions.c:887
-#: src/prefs_actions.c:892 src/prefs_actions.c:918 src/prefs_filtering.c:1465
-#: src/prefs_filtering.c:1487 src/prefs_filtering.c:1509
-#: src/prefs_matcher.c:2162 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597 src/summary_search.c:785
+#: 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/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/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: src/account.c:914
+#: src/account.c:926
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Accounts met mappen op de server kunnen niet worden gekopieerd."
 
-#: src/account.c:921
+#: src/account.c:933
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie van %s"
 
-#: src/account.c:1125
+#: src/account.c:1137
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wil je werkelijk het account '%s' verwijderen?"
 
-#: src/account.c:1127
+#: src/account.c:1139
 msgid "(Untitled)"
 msgstr "(Geen titel)"
 
-#: src/account.c:1128
+#: src/account.c:1140
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: src/account.c:1129 src/addrcustomattr.c:162 src/addrcustomattr.c:187
-#: src/addrcustomattr.c:495 src/addrduplicates.c:147 src/addrduplicates.c:793
-#: src/addressadd.c:300 src/addressbook.c:1483 src/addressbook.c:1490
-#: src/addressbook.c:2957 src/addressbook.c:2969 src/addressbook.c:2982
-#: src/addressbook.c:2989 src/addressbook_foldersel.c:212 src/addrgather.c:554
-#: src/compose.c:3681 src/compose.c:3809 src/compose.c:5115 src/compose.c:5152
-#: src/compose.c:5189 src/compose.c:5232 src/compose.c:5796 src/compose.c:5859
-#: src/compose.c:6091 src/compose.c:9516 src/compose.c:10694
-#: src/compose.c:10699 src/compose.c:10773 src/compose.c:11665
-#: src/compose.c:12183 src/editaddress.c:172 src/editaddress.c:815
-#: src/editaddress.c:820 src/editbook.c:196 src/editgroup.c:407
-#: src/editjpilot.c:305 src/editldap_basedn.c:238 src/editldap.c:362
-#: src/edittags.c:222 src/edittags.c:258 src/editvcard.c:203
-#: src/exphtmldlg.c:603 src/exphtmldlg.c:678 src/expldifdlg.c:671
-#: src/expldifdlg.c:747 src/export.c:174 src/foldersel.c:350
-#: src/folderview.c:2480 src/folderview.c:2538 src/grouplistdialog.c:241
-#: src/gtk/foldersort.c:243 src/gtk/gtkaspell.c:1513 src/gtk/inputdialog.c:368
-#: src/gtk/prefswindow.c:504 src/gtk/progressdialog.c:97 src/imap.c:1178
-#: src/imap_gtk.c:369 src/imap_gtk.c:515 src/imap_gtk.c:574 src/import.c:173
-#: src/import.c:204 src/importldif.c:923 src/importldif.c:989
-#: src/importmutt.c:250 src/importpine.c:249 src/inc.c:888 src/main.c:2249
-#: src/mainwindow.c:4000 src/mainwindow.c:4202 src/mbox.c:552
-#: src/messageview.c:2065 src/messageview.c:2076 src/mh_gtk.c:207
-#: src/mh_gtk.c:375 src/mimeview.c:1905 src/mimeview.c:1930 src/mimeview.c:2355
-#: src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:214
+#: src/account.c:1141 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/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/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/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/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:945
-#: src/plugins/archive/archiver_gtk.c:1046
-#: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/att_remover/att_remover.c:430
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/archive/archiver_gtk.c:1043
+#: 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/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:334
+#: 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
-#: src/plugins/managesieve/sieve_editor.c:434
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/notification/notification_foldercheck.c:590
+#: 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:157
-#: src/plugins/rssyl/rssyl_cb_menu.c:323
-#: src/plugins/rssyl/rssyl_feed_props.c:492
+#: 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/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1058
-#: src/plugins/vcalendar/vcal_folder.c:1997
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:217
-#: src/prefs_actions.c:702 src/prefs_actions.c:723 src/prefs_customheader.c:177
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:246
+#: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcal_folder.c:2030
+#: 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:1194 src/prefs_filtering.c:1213
-#: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1761
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:287
+#: 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_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:596 src/send_message.c:294 src/ssl_manager.c:448
-#: src/summaryview.c:1327 src/summaryview.c:4550 src/summaryview.c:5012
-#: src/summaryview.c:5066 src/summaryview.c:5805 src/textview.c:2881
-#: src/toolbar.c:3054 src/wizard.c:1814
+#: 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/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/account.c:1129 src/addrcustomattr.c:216 src/addressbook.c:437
-#: src/addressbook.c:462 src/addressbook.c:479 src/edittags.c:285
-#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1313
-#: src/plugins/mailmbox/plugin_gtk.c:334
+#: 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/plugins/att_remover/att_remover.c:429
+#: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/vcalendar/vcal_folder.c:1997 src/prefs_actions.c:1077
-#: src/prefs_customheader.c:693 src/prefs_filtering.c:1681
-#: src/prefs_template.c:1105 src/summaryview.c:4550
+#: src/plugins/rssyl/rssyl_cb_menu.c:194
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "Ver_wijderen"
 
-#: src/account.c:1602
+#: src/account.c:1615
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "O"
 
-#: src/account.c:1608
+#: src/account.c:1621
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
-#: src/account.c:1615 src/addrduplicates.c:472 src/addressadd.c:220
-#: src/addressbook.c:128 src/compose.c:7467 src/editaddress.c:1475
-#: src/editaddress.c:1497 src/editaddress.c:1516
+#: 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/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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1849
-#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1854 src/prefs_summaries.c:477 src/prefs_template.c:78
-#: src/prefs_themes.c:993
+#: 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
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:1623 src/prefs_account.c:1267 src/prefs_account.c:4955
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1644 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -245,7 +325,7 @@ msgstr ""
 "Ongeldige filteractie(s):\n"
 "%s"
 
-#: src/action.c:997
+#: src/action.c:1000
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -256,36 +336,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5265 src/compose.c:5270 src/compose.c:9669
-#: src/compose.c:9708 src/ldaputil.c:333
+#: 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/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:1831
-#: src/plugins/vcalendar/vcal_folder.c:1849
-#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1845
+#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/action.c:1218 src/action.c:1395
+#: src/action.c:1223 src/action.c:1397
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/action.c:1255
+#: src/action.c:1260
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Starten: %s\n"
 
-#: src/action.c:1259
+#: src/action.c:1264
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beëindigd: %s\n"
 
-#: src/action.c:1305
+#: src/action.c:1307
 msgid "Action's input/output"
 msgstr "Invoer en uitvoer van actie"
 
-#: src/action.c:1641
+#: src/action.c:1371
+msgid "_Execute"
+msgstr "_Uitvoeren"
+
+#: src/action.c:1406
+msgid "_Stop"
+msgstr "_Stop"
+
+#: src/action.c:1648
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -296,11 +384,11 @@ msgstr ""
 "('%%h' zal vervangen worden door het argument)\n"
 "  %s"
 
-#: src/action.c:1646
+#: src/action.c:1653
 msgid "Action's hidden user argument"
 msgstr "Verborgen gebruikersargument van actie"
 
-#: src/action.c:1650
+#: src/action.c:1657
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -310,23 +398,23 @@ msgstr ""
 "Geef het argument van de volgende actie:\n"
 "('%%u' zal vervangen worden door het argument)  %s"
 
-#: src/action.c:1655
+#: src/action.c:1662
 msgid "Action's user argument"
 msgstr "Gebruikersargument van actie"
 
-#: src/addrclip.c:481
+#: src/addrclip.c:483
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "Kan een map niet kopiëren naar zichzelf of één van z'n submappen."
 
-#: src/addrclip.c:504
+#: src/addrclip.c:506
 msgid "Cannot copy an address book to itself."
 msgstr "Kan adresboek niet naar zichzelf kopiëren."
 
-#: src/addrclip.c:595
+#: src/addrclip.c:597
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "Kan een map niet verplaatsen naar zichzelf of één van z'n submappen."
 
-#: src/addr_compl.c:699 src/addressbook.c:5006
+#: src/addr_compl.c:699 src/addressbook.c:5008
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Groep"
@@ -379,19 +467,19 @@ msgstr "Alle eigenschapnamen verwijderen"
 msgid "Do you really want to delete all attribute names?"
 msgstr "Wil je deze eigenschapnamen werkelijk verwijderen?"
 
-#: src/addrcustomattr.c:185
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr "Verwijder eigenschapnaam"
 
-#: src/addrcustomattr.c:186
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr "Wil je werkelijk deze eigenschapnaam verwijderen?"
 
-#: src/addrcustomattr.c:195
+#: src/addrcustomattr.c:197
 msgid "Reset to default"
 msgstr "Terugzetten naar standaard"
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:198
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -399,97 +487,108 @@ msgstr ""
 "Wil je werkelijk alle eigenschapnamen vervangen door\n"
 "de standaard set?"
 
-#: src/addrcustomattr.c:197 src/compose.c:9783 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:880 src/folderview.c:1102
-#: src/folderview.c:2526 src/folderview.c:2628 src/inc.c:1668 src/main.c:407
-#: src/mainwindow.c:2868 src/mainwindow.c:2873 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:708
-#: src/plugins/pgpcore/sgpgme.c:899 src/plugins/pgpcore/sgpgme.c:1021
-#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
-#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
-#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
-#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
-#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
-#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
-#: src/summaryview.c:6072 src/toolbar.c:3034
+#: 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/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/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
 msgid "_No"
 msgstr "_Nee"
 
-#: src/addrcustomattr.c:197 src/compose.c:9783 src/compose.c:12183
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:880
-#: src/folderview.c:1102 src/folderview.c:2526 src/folderview.c:2628
-#: src/inc.c:1668 src/main.c:407 src/mainwindow.c:2868 src/mainwindow.c:2873
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:708 src/plugins/pgpcore/sgpgme.c:899
-#: src/plugins/pgpcore/sgpgme.c:1021 src/plugins/vcalendar/vcalendar.c:122
-#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
-#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
-#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
-#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
-#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
-#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
-#: src/summaryview.c:5066 src/summaryview.c:6072 src/toolbar.c:3034
+#: 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/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/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
 msgid "_Yes"
 msgstr "_Ja"
 
-#: src/addrcustomattr.c:217 src/edittags.c:286 src/prefs_actions.c:1078
-#: src/prefs_filtering.c:1682 src/prefs_template.c:1106
+#: src/addrcustomattr.c:219 src/edittags.c:298 src/prefs_actions.c:1106
+#: src/prefs_filtering.c:1690 src/prefs_template.c:1106
 msgid "Delete _all"
 msgstr "_Alles verwijderen"
 
-#: src/addrcustomattr.c:218
+#: src/addrcustomattr.c:220
 msgid "_Reset to default"
 msgstr "_Terugzetten naar standaard"
 
-#: src/addrcustomattr.c:407
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr "Eigenschapnaam is niet ingesteld."
 
-#: src/addrcustomattr.c:466
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Bewerk eigenschapnamen"
 
-#: src/addrcustomattr.c:480
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr "Nieuwe eigenschapnaam:"
 
-#: src/addrcustomattr.c:496 src/addressadd.c:301
-#: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:363
-#: src/compose.c:5859 src/compose.c:9517 src/editaddress.c:172
-#: src/editaddress.c:816 src/editaddress.c:821 src/editbook.c:197
-#: src/editgroup.c:408 src/editjpilot.c:306 src/editldap_basedn.c:239
-#: src/editldap.c:363 src/editvcard.c:204 src/export.c:175 src/foldersel.c:351
-#: src/grouplistdialog.c:242 src/gtk/foldersort.c:244 src/gtk/gtkaspell.c:1514
-#: src/gtk/inputdialog.c:369 src/gtk/prefswindow.c:505 src/import.c:174
-#: src/import.c:204 src/importmutt.c:251 src/importpine.c:250 src/main.c:2249
-#: src/mimeview.c:1906 src/password_gtk.c:215
-#: src/plugins/archive/archiver_gtk.c:575
+#: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
+#: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
+#: src/prefs_display_header.c:321 src/prefs_display_header.c:372
+#: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
+#: src/prefs_folder_column.c:271 src/prefs_matcher.c:791
+#: src/prefs_summary_column.c:285 src/prefs_summary_open.c:241
+#: src/prefs_template.c:299 src/prefs_toolbar.c:998
+msgid "_Add"
+msgstr "Toe_voegen"
+
+#: 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/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/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:1048
-#: src/plugins/att_remover/att_remover.c:389
+#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/att_remover/att_remover.c:388
 #: src/plugins/gdata/cm_gdata_contacts.c:137
-#: src/plugins/managesieve/sieve_editor.c:632
-#: src/plugins/notification/notification_foldercheck.c:591
+#: 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:509
+#: src/plugins/rssyl/rssyl_feed_props.c:487
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1913 src/prefs_actions.c:218
+#: 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:288 src/prefs_summary_column.c:356
+#: src/prefs_summaries.c:285 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr "_OK"
 
-#: src/addrcustomattr.c:517
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -514,6 +613,11 @@ msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr "Claws Mail zal nu dubbele e-mailadressen zoeken in het adresboek."
 
+#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
+msgid "_Find"
+msgstr "_Vinden"
+
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr "Geen dubbele e-mailadressen gevonden in adresboek"
@@ -523,8 +627,8 @@ msgid "Duplicate email addresses"
 msgstr "Dubbele e-mailadressen"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
-#: src/toolbar.c:529
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/toolbar.c:540
 msgid "Address"
 msgstr "Adres"
 
@@ -532,11 +636,11 @@ msgstr "Adres"
 msgid "Address book path"
 msgstr "Pad naar adresboek"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1435 src/addressbook.c:1488
+#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
 msgid "Delete address(es)"
 msgstr "Verwijder adres(sen)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1489
+#: src/addrduplicates.c:792 src/addressbook.c:1485
 msgid "Really delete the address(es)?"
 msgstr "Wil je de adressen echt verwijderen?"
 
@@ -544,7 +648,7 @@ msgstr "Wil je de adressen echt verwijderen?"
 msgid "Delete address"
 msgstr "Verwijder adres"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1436
+#: src/addrduplicates.c:842 src/addressbook.c:1431
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Deze adresgegevens zijn alleen-lezen en kunnen niet worden verwijderd."
 
@@ -556,8 +660,8 @@ msgstr "Toevoegen aan adresboek"
 msgid "Contact"
 msgstr "Contact"
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1256
-#: src/editaddress.c:1301 src/editgroup.c:290
+#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -565,259 +669,248 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:599 src/addressbook.c:3256 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
 msgid "Add address(es)"
 msgstr "Voeg adres(sen) toe"
 
-#: src/addressadd.c:600
+#: src/addressadd.c:599
 msgid "Can't add the specified address"
 msgstr "Kan het opgegeven adres niet toevoegen"
 
-#: src/addressbook.c:129 src/addressbook.c:4994 src/editaddress.c:1245
-#: src/editaddress.c:1282 src/editgroup.c:289 src/expldifdlg.c:507
-#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
+#: src/addressbook.c:129 src/addressbook.c:4996 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-mailadres"
 
-#: src/addressbook.c:405
+#: src/addressbook.c:400
 msgid "_Book"
 msgstr "_Boek"
 
-#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
-#: src/addressbook.c:478 src/compose.c:610 src/mainwindow.c:517
-#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
-msgid "_Edit"
-msgstr "B_ewerken"
-
-#: src/addressbook.c:407 src/compose.c:615 src/mainwindow.c:520
-#: src/messageview.c:215
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: src/addressbook.c:410 src/addressbook.c:464
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Book"
 msgstr "Nieuw _Boek"
 
-#: src/addressbook.c:411 src/addressbook.c:465
+#: src/addressbook.c:406 src/addressbook.c:460
 msgid "New _Folder"
 msgstr "Nieuwe _Map"
 
-#: src/addressbook.c:412
+#: src/addressbook.c:407
 msgid "New _vCard"
 msgstr "Nieuwe _vCard"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:411
 msgid "New _JPilot"
 msgstr "Nieuwe _JPilot"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:414
 msgid "New LDAP _Server"
 msgstr "Nieuwe LDAP-_Server"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:418
 msgid "_Edit book"
 msgstr "_Bewerk boek"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:419
 msgid "_Delete book"
 msgstr "_Verwijder boek"
 
-#: src/addressbook.c:426 src/compose.c:627 src/gtk/gtkutils.c:69
+#: src/addressbook.c:421 src/compose.c:632 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:434
-#: src/plugins/managesieve/sieve_editor.c:633 src/wizard.c:1813
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:634 src/wizard.c:1832
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
+#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
 msgid "_Select all"
 msgstr "_Alles selecteren"
 
-#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
+#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
-#: src/compose.c:639 src/gtk/gtkutils.c:71 src/mainwindow.c:551
-#: src/messageview.c:228 src/plugins/managesieve/sieve_editor.c:96
-msgid "_Copy"
-msgstr "_Kopiëren"
-
-#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: src/addressbook.c:439 src/addressbook.c:481
+#: src/addressbook.c:434 src/addressbook.c:476
 msgid "New _Address"
 msgstr "Nieuw _Adres"
 
-#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
+#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
 msgid "New _Group"
 msgstr "Nieuwe _Groep"
 
-#: src/addressbook.c:442 src/addressbook.c:488
+#: src/addressbook.c:437 src/addressbook.c:483
 msgid "_Mail To"
 msgstr "_Verzenden Aan"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Merge"
 msgstr "_Samenvoegen"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:442
 msgid "Import _LDIF file..."
 msgstr "_LDIF-bestand importeren..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:443
 msgid "Import M_utt file..."
 msgstr "_Mutt-bestand importeren..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:444
 msgid "Import _Pine file..."
 msgstr "_Pine-bestand importeren..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:446
 msgid "Export _HTML..."
 msgstr "_HTML-bestand exporteren..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:447
 msgid "Export LDI_F..."
 msgstr "LDI_F-bestand exporteren..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:449
 msgid "Find duplicates..."
 msgstr "Vind dubbele adressen..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:450
 msgid "Edit custom attributes..."
 msgstr "Bewerk aangepaste eigenschappen..."
 
-#: src/addressbook.c:490
+#: src/addressbook.c:485
 msgid "_Browse Entry"
 msgstr "_Bekijk item"
 
-#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
-#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:397
-#: src/plugins/vcalendar/month-view.c:424 src/prefs_themes.c:819
-#: src/prefs_themes.c:851 src/prefs_themes.c:852
+#: src/addressbook.c:499 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
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
+#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
 msgid "Success"
 msgstr "Gelukt"
 
-#: src/addressbook.c:512 src/importldif.c:122
+#: src/addressbook.c:507 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Fout argument"
 
-#: src/addressbook.c:513 src/importldif.c:123
+#: src/addressbook.c:508 src/importldif.c:123
 msgid "File not specified"
 msgstr "Bestand niet opgegeven"
 
-#: src/addressbook.c:514 src/importldif.c:124
+#: src/addressbook.c:509 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Fout bij openen bestand"
 
-#: src/addressbook.c:515 src/importldif.c:125
+#: src/addressbook.c:510 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Fout bij lezen bestand"
 
-#: src/addressbook.c:516 src/importldif.c:126
+#: src/addressbook.c:511 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Einde van bestand tegengekomen"
 
-#: src/addressbook.c:517 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Fout bij reserveren van geheugen"
 
-#: src/addressbook.c:518 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Fout bestandsformat"
 
-#: src/addressbook.c:519 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Fout bij schrijven naar bestand"
 
-#: src/addressbook.c:520 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Fout openen map"
 
-#: src/addressbook.c:521 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131
 msgid "No path specified"
 msgstr "Geen pad opgegeven"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:526
 msgid "Error connecting to LDAP server"
 msgstr "Fout bij verbinding maken met POP3-server"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:527
 msgid "Error initializing LDAP"
 msgstr "Fout bij opstarten LDAP"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:528
 msgid "Error binding to LDAP server"
 msgstr "Fout bij binden aan LDAP-server"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:529
 msgid "Error searching LDAP database"
 msgstr "Fout bij zoeken in LDAP-gegevensbank"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:530
 msgid "Timeout performing LDAP operation"
 msgstr "LDAP-operatie niet gelukt binnen de tijdslimiet"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error in LDAP search criteria"
 msgstr "Fout in LDAP-zoekcriteria"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "No LDAP entries found for search criteria"
 msgstr "Geen LDAP-ingangen gevonden voor zoekcriteria"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "LDAP search terminated on request"
 msgstr "LDAP-zoekopdracht op verzoek afgebroken"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error starting STARTTLS connection"
 msgstr "Fout bij starten STARTTLS-verbinding"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Distinguished Name (dn) is missing"
 msgstr "Distinguished Name (dn) mist"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Missing required information"
 msgstr "Benodigde informatie mist"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "Another contact exists with that key"
 msgstr "Een ander contact bestaat met die sleutel"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "Strong(er) authentication required"
 msgstr "Sterkere authenticatie vereist"
 
-#: src/addressbook.c:911
+#: src/addressbook.c:906
 msgid "Sources"
 msgstr "Bronnen"
 
-#: src/addressbook.c:915 src/prefs_matcher.c:642 src/prefs_other.c:491
-#: src/toolbar.c:268 src/toolbar.c:2522
+#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:1108 src/editldap.c:777
+#: src/addressbook.c:1103 src/editldap.c:777
 msgid "Search"
 msgstr "Zoek"
 
-#: src/addressbook.c:1480
+#: src/addressbook.c:1475
 msgid "Delete group"
 msgstr "Verwijder groep"
 
-#: src/addressbook.c:1481
+#: src/addressbook.c:1476
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -825,26 +918,26 @@ msgstr ""
 "Wil je deze groep(en) echt verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2208
+#: src/addressbook.c:2205
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Kan niet plakken. Bedoeld adresboek is alleen-lezen."
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2215
 msgid "Cannot paste into an address group."
 msgstr "Kan niet plakken in een adresgroep."
 
-#: src/addressbook.c:2953
+#: src/addressbook.c:2950
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "Wil je de zoekresultaten en adressen in '%s' verwijderen?"
 
-#: src/addressbook.c:2956 src/addressbook.c:2982 src/addressbook.c:2989
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:171
-#: src/toolbar.c:497
+#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
+#: src/toolbar.c:507
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2963
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -853,20 +946,20 @@ msgstr ""
 "Wil je '%s' verwijderen? Als je alleen de map verwijdert zullen de adressen "
 "die het bevat verplaatst worden naar de bovenliggende map."
 
-#: src/addressbook.c:2968 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:156
+#: 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
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:2969
+#: src/addressbook.c:2967
 msgid "Delete _folder only"
 msgstr "Verwijder alleen _map"
 
-#: src/addressbook.c:2969
+#: src/addressbook.c:2968
 msgid "Delete folder and _addresses"
 msgstr "Verwijder map en _adressen"
 
-#: src/addressbook.c:2980
+#: src/addressbook.c:2979
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -875,7 +968,7 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2987
+#: src/addressbook.c:2986
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -884,28 +977,28 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen verloren gaan."
 
-#: src/addressbook.c:3101
+#: src/addressbook.c:3100
 #, c-format
 msgid "Search '%s'"
 msgstr "Zoek '%s'"
 
-#: src/addressbook.c:3239 src/addressbook.c:3288
+#: src/addressbook.c:3238 src/addressbook.c:3288
 msgid "New Contacts"
 msgstr "Nieuwe contacten"
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4127
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker, kon indexbestand niet bewaren."
 
-#: src/addressbook.c:4129
+#: src/addressbook.c:4131
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker, kon adresboekbestanden niet bewaren."
 
-#: src/addressbook.c:4139
+#: src/addressbook.c:4141
 msgid "Old address book converted successfully."
 msgstr "Oud adresboek is geconverteerd."
 
-#: src/addressbook.c:4144
+#: src/addressbook.c:4146
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -913,7 +1006,7 @@ msgstr ""
 "Oud adresboek geconverteerd,\n"
 "nieuw indexbestand kon niet worden opgeslagen."
 
-#: src/addressbook.c:4157
+#: src/addressbook.c:4159
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -921,7 +1014,7 @@ msgstr ""
 "Kon adresboek niet converteren, \n"
 "maar heb lege adresboekbestanden aangemaakt."
 
-#: src/addressbook.c:4163
+#: src/addressbook.c:4165
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -929,7 +1022,7 @@ msgstr ""
 "Kon adresboek niet converteren,\n"
 "nieuw indexbestand kon niet worden aangemaakt."
 
-#: src/addressbook.c:4168
+#: src/addressbook.c:4170
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -937,57 +1030,57 @@ msgstr ""
 "Kon adresboek niet converteren\n"
 "en kon nieuwe adresboekbestanden niet aanmaken."
 
-#: src/addressbook.c:4175 src/addressbook.c:4181
+#: src/addressbook.c:4177 src/addressbook.c:4182
 msgid "Addressbook conversion error"
 msgstr "Conversiefout adresboek"
 
-#: src/addressbook.c:4296
+#: src/addressbook.c:4297
 msgid "Addressbook Error"
 msgstr "Adresboekfout"
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4298
 msgid "Could not read address index"
 msgstr "Kon adresindexbestand niet lezen"
 
-#: src/addressbook.c:4628
+#: src/addressbook.c:4630
 msgid "Busy searching..."
 msgstr "Bezig met zoeken..."
 
-#: src/addressbook.c:4958 src/prefs_send.c:220
+#: src/addressbook.c:4960 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:4972
 msgid "Address Books"
 msgstr "Adresboeken"
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4984
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:5018 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3420 src/prefs_folder_column.c:77
+#: 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
 msgid "Folder"
 msgstr "Map"
 
-#: src/addressbook.c:5030
+#: src/addressbook.c:5032
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5042 src/addressbook.c:5054
+#: src/addressbook.c:5044 src/addressbook.c:5056
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5066
+#: src/addressbook.c:5068
 msgid "LDAP servers"
 msgstr "LDAP-servers"
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5080
 msgid "LDAP Query"
 msgstr "LDAP-verzoek"
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:369 src/expldifdlg.c:386
-#: src/exporthtml.c:985 src/importldif.c:539
+#: 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 "Adresboek"
 
@@ -1052,8 +1145,8 @@ msgstr "Aantal Adressen"
 msgid "Header Fields"
 msgstr "Header-velden"
 
-#: src/addrgather.c:585 src/exphtmldlg.c:635 src/expldifdlg.c:703
-#: src/importldif.c:965
+#: src/addrgather.c:585 src/exphtmldlg.c:640 src/expldifdlg.c:705
+#: src/importldif.c:967
 msgid "Finish"
 msgstr "Voltooien"
 
@@ -1089,27 +1182,27 @@ msgstr "Adressen update"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Update mislukt. Wijzigingen niet opgeslagen naar map."
 
-#: src/alertpanel.c:144 src/compose.c:9783
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:157 src/compose.c:5859 src/compose.c:6404
-#: src/compose.c:12183 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:855 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5066
+#: 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
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5796 src/inc.c:731
-#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Fout"
 
-#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:204 src/gtk/progressdialog.c:92
 msgid "_View log"
 msgstr "_Bekijk log"
 
-#: src/alertpanel.c:350
+#: src/alertpanel.c:372
 msgid "Show this message next time"
 msgstr "Deze waarschuwing volgende keer herhalen"
 
@@ -1162,14 +1255,14 @@ msgid "a notifier"
 msgstr "een aankondiger"
 
 #: src/common/plugin.c:77
-msgid "an utility"
+msgid "a utility"
 msgstr "een utility"
 
 #: src/common/plugin.c:78
 msgid "things"
 msgstr "dingen"
 
-#: src/common/plugin.c:335
+#: src/common/plugin.c:336
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1177,24 +1270,24 @@ msgstr ""
 "Deze plugin levert ondersteuning voor %s (%s), dat reeds ondersteund wordt "
 "door de plugin %s."
 
-#: src/common/plugin.c:438
+#: src/common/plugin.c:439
 msgid "Plugin already loaded"
 msgstr "Plugin is reeds geladen"
 
-#: src/common/plugin.c:449
+#: src/common/plugin.c:450
 msgid "Failed to allocate memory for Plugin"
 msgstr "Geheugen reserveren voor plugin mislukt"
 
-#: src/common/plugin.c:483
+#: src/common/plugin.c:484
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Deze module heeft geen licentie die verenigbaar is met de GPL v3 of nieuwer."
 
-#: src/common/plugin.c:492
+#: src/common/plugin.c:493
 msgid "This module is for Claws Mail GTK1."
 msgstr "Deze module is voor Claws Mail GTK1."
 
-#: src/common/plugin.c:770
+#: src/common/plugin.c:774
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1203,7 +1296,7 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin '%s' "
 "gecompileerd is."
 
-#: src/common/plugin.c:773
+#: src/common/plugin.c:777
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1211,151 +1304,151 @@ msgstr ""
 "Je versie van Claws Mail is nieuwer dan de versie waarmee de plugin "
 "gecompileerd is."
 
-#: src/common/plugin.c:782
+#: src/common/plugin.c:786
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Je versie van Claws Mail is te oud voor de '%s'-plugin."
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:788
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "Je versie van Claws Mail is te oud voor de plugin."
 
-#: src/common/session.c:201 src/imap.c:1246
-msgid "SSL/TLS handshake failed\n"
-msgstr "SSL/TLS-handdruk mislukt\n"
+#: src/common/session.c:201 src/imap.c:1261
+msgid "TLS handshake failed\n"
+msgstr "TLS-handdruk mislukt\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "SMTP AUTH methode niet beschikbaar\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Geselecteerde SMTP AUTH methode niet beschikbaar\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "verkeerd SMTP-antwoord\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "er is een fout opgetreden tijdens de SMTP-sessie\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "er is een fout opgetreden tijdens de authenticatie\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Bericht is te groot (Maximum grootte is %s)\n"
 
-#: src/common/smtp.c:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "kan de STARTTLS-sessie niet tot stand brengen\n"
 
-#: src/common/socket.c:571
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Socket-IO tijdslimiet bereikt.\n"
 
-#: src/common/socket.c:600
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Verbinding niet binnen tijdslimiet tot stand gekomen.\n"
 
-#: src/common/socket.c:740
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: verbinding maken mislukt (%s).\n"
 
-#: src/common/socket.c:980
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: onbekende host.\n"
 
-#: src/common/socket.c:1072
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: host opzoeken mislukt (%s).\n"
 
-#: src/common/socket.c:1385
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "schrijf op fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:338
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "Kan P12-certificaat-bestand niet vinden (%s)\n"
 
-#: src/common/ssl_certificate.c:346
+#: src/common/ssl_certificate.c:342
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "Kan P12-certificaat-bestand niet lezen (%s)\n"
 
-#: src/common/ssl_certificate.c:355
+#: src/common/ssl_certificate.c:351
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "Kan P12-certificaat-bestand niet importeren (%s)\n"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:636
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: src/common/ssl_certificate.c:645
+#: src/common/ssl_certificate.c:641
 msgid "Uncheckable"
 msgstr "Niet verifieerbaar"
 
-#: src/common/ssl_certificate.c:649
+#: src/common/ssl_certificate.c:645
 msgid "Self-signed certificate"
 msgstr "Zelfondertekend certificaat"
 
-#: src/common/ssl_certificate.c:652
+#: src/common/ssl_certificate.c:648
 msgid "Revoked certificate"
 msgstr "Ingetrokken certificaat"
 
-#: src/common/ssl_certificate.c:654
+#: src/common/ssl_certificate.c:650
 msgid "No certificate issuer found"
 msgstr "Geen uitgever van certificaat gevonden"
 
-#: src/common/ssl_certificate.c:656
+#: src/common/ssl_certificate.c:652
 msgid "Certificate issuer is not a CA"
 msgstr "Uitgever van certificaat is geen CA"
 
-#: src/common/ssl_certificate.c:881
+#: src/common/ssl_certificate.c:877
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Kan certificaat-bestand %s niet openen: %s\n"
 
-#: src/common/ssl_certificate.c:885
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Certificaat-bestand %s mist (%s)\n"
 
-#: src/common/ssl_certificate.c:904
+#: src/common/ssl_certificate.c:900
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "Kan sleutel-bestand %s niet openen (%s)\n"
 
-#: src/common/ssl_certificate.c:908
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Sleutel-bestand %s mist (%s)\n"
 
-#: src/common/ssl_certificate.c:1056
+#: src/common/ssl_certificate.c:1052
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "Kan P12-certificaat bestand niet lezen %s\n"
 
-#: src/common/ssl_certificate.c:1059
+#: src/common/ssl_certificate.c:1055
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "Kan P12-certificaat bestand niet openen %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1063
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12-Certificaat bestand %s mist (%s)\n"
 
-#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1084 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
@@ -1366,237 +1459,239 @@ msgstr "<niet in certificaat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Onderwerp gewist door RegExp)"
 
-#: src/common/utils.c:200
+#: src/common/utils.c:184
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:201
+#: src/common/utils.c:185
 #, c-format
-msgid "%d.%02dKB"
-msgstr "%d,%02dKB"
+#| msgid "%d.%02dKB"
+msgid "%d.%02dKiB"
+msgstr "%d.%02dKiB"
 
-#: src/common/utils.c:202
+#: src/common/utils.c:186
 #, c-format
-msgid "%d.%02dMB"
-msgstr "%d,%02dMB"
+#| msgid "%d.%02dMB"
+msgid "%d.%02dMiB"
+msgstr "%d.%02dMiB"
 
-#: src/common/utils.c:203
+#: src/common/utils.c:187
 #, c-format
-msgid "%.2fGB"
-msgstr "%.2fGB"
+msgid "%.2fGiB"
+msgstr "%.2fGiB"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "zondag"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "maandag"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "donderdag"
 
-#: src/common/utils.c:4092
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "vrijdag"
 
-#: src/common/utils.c:4093
+#: src/common/utils.c:4124
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: src/common/utils.c:4095
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4096
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4097
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "maart"
 
-#: src/common/utils.c:4098
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4099
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:4100
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4101
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augustus"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4106
+#: src/common/utils.c:4137
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: src/common/utils.c:4108
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "zo"
 
-#: src/common/utils.c:4109
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "ma"
 
-#: src/common/utils.c:4110
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "di"
 
-#: src/common/utils.c:4111
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "wo"
 
-#: src/common/utils.c:4112
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "do"
 
-#: src/common/utils.c:4113
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "vr"
 
-#: src/common/utils.c:4114
+#: src/common/utils.c:4145
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "za"
 
-#: src/common/utils.c:4116
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:4117
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "mei"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:4125
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4158
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: src/common/utils.c:4138
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "a.m."
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "p.m."
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "a.m."
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4172
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "p.m."
 
-#: src/compose.c:201
+#: src/compose.c:200
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1608,364 +1703,362 @@ msgstr ""
 "\n"
 "Ondertekenen en versleutelen is uitgeschakeld voor dit bericht."
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Toevoegen..."
 
-#: src/compose.c:600 src/gtk/gtkutils.c:86
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:323
+#: 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/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
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/compose.c:602 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:255
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: src/compose.c:609 src/mainwindow.c:519 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "Be_richt"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Spelling"
 
-#: src/compose.c:614 src/compose.c:681
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Opties"
 
-#: src/compose.c:616 src/mainwindow.c:522 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Help"
 
-#: src/compose.c:618
+#: src/compose.c:623
 msgid "S_end"
 msgstr "_Verzenden"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "_Wachtrij"
 
-#: src/compose.c:622
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "Bestand _bijvoegen"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "Bestand _invoegen"
 
-#: src/compose.c:624
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Ondertekening _invoegen"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "Ondertekening _vervangen"
 
-#: src/compose.c:629
+#: src/compose.c:634
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: src/compose.c:634 src/gtk/gtkutils.c:76
-#: src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Op_nieuw"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: src/compose.c:642
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "_Plakken speciaal"
 
-#: src/compose.c:643
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Als _citaten"
 
-#: src/compose.c:644
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "Afge_broken"
 
-#: src/compose.c:645
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "Niet afgeb_roken"
 
-#: src/compose.c:647 src/mainwindow.c:552
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Alles selecteren"
 
-#: src/compose.c:649
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "_Geavanceerd"
 
-#: src/compose.c:650
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Ga een teken terug"
 
-#: src/compose.c:651
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Ga een teken verder"
 
-#: src/compose.c:652
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Ga een woord terug"
 
-#: src/compose.c:653
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Ga een woord verder"
 
-#: src/compose.c:654
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Ga naar begin van regel"
 
-#: src/compose.c:655
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Ga naar eind van regel"
 
-#: src/compose.c:656
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Ga een regel terug"
 
-#: src/compose.c:657
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Ga een regel verder"
 
-#: src/compose.c:658
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Verwijder vorige teken"
 
-#: src/compose.c:659
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Verwijder volgende teken"
 
-#: src/compose.c:660
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Verwijder vorig woord"
 
-#: src/compose.c:661
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Verwijder volgend woord"
 
-#: src/compose.c:662
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Verwijder deze regel"
 
-#: src/compose.c:663
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Verwijder tot eind van regel"
 
-#: src/compose.c:666 src/gtk/gtkutils.c:73 src/messageview.c:231
-#: src/plugins/managesieve/sieve_editor.c:102
-msgid "_Find"
-msgstr "_Vinden"
-
-#: src/compose.c:669
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "Regels afbreken in _huidige paragraaf"
 
-#: src/compose.c:670
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/compose.c:672
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Aanpassen met e_xterne editor"
 
-#: src/compose.c:675
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Controleer alles of selectie"
 
-#: src/compose.c:676
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "Toon alle _onjuist gespelde woorden"
 
-#: src/compose.c:677
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Controleer _vorig onjuist gespeld woord"
 
-#: src/compose.c:678
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "Ga naar _volgend onjuist gespeld woord"
 
-#: src/compose.c:685
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "_Beantwoord afzender"
 
-#: src/compose.c:687
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Privacy-_systeem"
 
-#: src/compose.c:691
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioriteit"
 
-#: src/compose.c:693 src/mainwindow.c:614 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Tekenset_codering"
 
-#: src/compose.c:698 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "West-Europees"
 
-#: src/compose.c:699 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:700 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: src/compose.c:701 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:702 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: src/compose.c:703 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japans"
 
-#: src/compose.c:704 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chinees"
 
-#: src/compose.c:705 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreaans"
 
-#: src/compose.c:706 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:709 src/mainwindow.c:737 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adresboek"
 
-#: src/compose.c:711
+#: src/compose.c:716
 msgid "_Template"
 msgstr "_Sjabloon"
 
-#: src/compose.c:713 src/mainwindow.c:765 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
-#: src/compose.c:717 src/mainwindow.c:819 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_Over"
 
-#: src/compose.c:722
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisch afbreken"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Automatisch _inspringen"
 
-#: src/compose.c:724
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "_Ondertekenen"
 
-#: src/compose.c:725
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "_Versleutelen"
 
-#: src/compose.c:726
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "_Ontvangstbevestiging"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Ver_wijder verwijzingen"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "_Lineaal weergeven"
 
-#: src/compose.c:733 src/compose.c:743
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: src/compose.c:734 src/mainwindow.c:668 src/messageview.c:305
-#: src/summaryview.c:428
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/summaryview.c:429
 msgid "_All"
 msgstr "_Allen"
 
-#: src/compose.c:735 src/mainwindow.c:669 src/messageview.c:306
-#: src/summaryview.c:429
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Afzender"
 
-#: src/compose.c:736
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Mailing-lijst"
 
-#: src/compose.c:741
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Hoogste"
 
-#: src/compose.c:742
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "H_oog"
 
-#: src/compose.c:744
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "Laa_g"
 
-#: src/compose.c:745
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "_Laagste"
 
-#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:751 src/mainwindow.c:885 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:752 src/mainwindow.c:886 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:756 src/mainwindow.c:890 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraal-Europees (ISO-8859-_2)"
 
-#: src/compose.c:759 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grieks (ISO-8859-_7)"
 
-#: src/compose.c:764 src/mainwindow.c:898 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turks (ISO-8859-_9)"
 
-#: src/compose.c:1035
+#: src/compose.c:1040
 msgid "New message From format error."
 msgstr "Opmaakfout in Van-header van nieuw bericht."
 
-#: src/compose.c:1128
+#: src/compose.c:1133
 msgid "New message subject format error."
 msgstr "Opmaakfout in onderwerp van nieuw bericht."
 
-#: src/compose.c:1160 src/quote_fmt.c:565
+#: src/compose.c:1165 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr ""
 "Opmaakfout in berichtinhoud van \"Nieuw bericht\"-sjabloon op regel %d."
 
-#: src/compose.c:1429
+#: src/compose.c:1434
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 "Niet mogelijk te antwoorden. De originele e-mail bestaat waarschijnlijk niet."
 
-#: src/compose.c:1614 src/quote_fmt.c:582
+#: src/compose.c:1619 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1973,12 +2066,12 @@ msgstr ""
 "Het \"Van\" veld van het \"Antwoord\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1663 src/quote_fmt.c:585
+#: src/compose.c:1668 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "Opmaakfout in berichtinhoud van het \"Antwoord\"-sjabloon op regel %d."
 
-#: src/compose.c:1804 src/compose.c:2005 src/quote_fmt.c:602
+#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1986,56 +2079,56 @@ msgstr ""
 "Het \"Van\" veld van het \"Doorsturen\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1865 src/quote_fmt.c:605
+#: src/compose.c:1870 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "De inhoud van het \"Doorsturen\"-sjabloon heeft een fout op regel %d."
 
-#: src/compose.c:2048
+#: src/compose.c:2053
 msgid "Fw: multiple emails"
 msgstr "Doorsturen: meerdere e-mails"
 
 # TPTD
-#: src/compose.c:2559
+#: src/compose.c:2575
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "De inhoud van het \"Herverwijzen\"-sjabloon heeft en fout op regel %d."
 
-#: src/compose.c:2630 src/gtk/headers.h:14
+#: src/compose.c:2646 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2633 src/gtk/headers.h:15
+#: src/compose.c:2649 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2636 src/gtk/headers.h:12
+#: src/compose.c:2652 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: src/compose.c:2639 src/compose.c:5014 src/compose.c:5016
+#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/compose.c:2642 src/gtk/headers.h:34
+#: src/compose.c:2658 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:2645 src/gtk/headers.h:17
+#: src/compose.c:2661 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In antwoord aan:"
 
-#: src/compose.c:2649 src/compose.c:5011 src/compose.c:5019
+#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Aan:"
 
-#: src/compose.c:2845
+#: src/compose.c:2861
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kan bestand niet bijvoegen (omzetten van de tekenset is mislukt)."
 
-#: src/compose.c:2851
+#: src/compose.c:2867
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2050,16 +2143,16 @@ msgstr[1] ""
 "De volgende bestanden zijn bijgevoegd: \n"
 "%s"
 
-#: src/compose.c:3131
+#: src/compose.c:3147
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "De \"Citatie-markering\" van het sjabloon is ongeldig."
 
-#: src/compose.c:3660
+#: src/compose.c:3680
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kon grootte van bestand '%s' niet opvragen."
 
-#: src/compose.c:3678
+#: src/compose.c:3698
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -2068,57 +2161,57 @@ msgstr ""
 "Je staat op het punt een bestand van %s in de berichtinhoud in te voegen. "
 "Wil je doorgaan?"
 
-#: src/compose.c:3681
+#: src/compose.c:3701
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: src/compose.c:3682 src/compose.c:10773 src/compose.c:11665
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/compose.c:3807
+#: src/compose.c:3827
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg."
 
-#: src/compose.c:3808
+#: src/compose.c:3828
 msgid "Empty file"
 msgstr "Leeg bestand"
 
-#: src/compose.c:3809
+#: src/compose.c:3829
 msgid "_Attach anyway"
 msgstr "Toch bijvoegen"
 
-#: src/compose.c:3818
+#: src/compose.c:3838
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet lezen."
 
-#: src/compose.c:3845
+#: src/compose.c:3865
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:4855 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:4865 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[geen onderwerp] - Bericht opstellen%s"
 
-#: src/compose.c:4867 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Bericht opstellen"
 
-#: src/compose.c:4894 src/messageview.c:884
+#: src/compose.c:4919 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -2126,59 +2219,62 @@ msgstr ""
 "Geen account opgegeven voor het verzenden van berichten.\n"
 "Selecteer eerst een account."
 
-#: src/compose.c:5111 src/compose.c:5148
+#: src/compose.c:5136 src/compose.c:5173
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "De enige ontvanger is het standaard '%s'-adres. Toch verzenden?"
 
-#: src/compose.c:5113 src/compose.c:5150 src/compose.c:5188 src/compose.c:5231
-#: src/prefs_account.c:4072 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:5115 src/compose.c:5152 src/compose.c:5189 src/compose.c:5232
-#: src/compose.c:5797 src/folderview.c:2538 src/messageview.c:856
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
+#: 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/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: src/compose.c:5169
+#: src/compose.c:5194
 msgid "Recipient is not specified."
 msgstr "Geen ontvanger opgegeven."
 
-#: src/compose.c:5184
+#: src/compose.c:5209
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Het onderwerp is leeg. %s"
 
-#: src/compose.c:5185 src/compose.c:5228
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5210 src/compose.c:5253
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Toch verzenden?"
 
-#: src/compose.c:5186 src/compose.c:5229
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5211 src/compose.c:5254
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "Toch in de wachtrij zetten?"
 
-#: src/compose.c:5188 src/compose.c:5231 src/toolbar.c:520
+#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:5189 src/compose.c:5232
+#: src/compose.c:5214 src/compose.c:5257
 msgid "_Queue"
 msgstr "_Wachtrij"
 
-#: src/compose.c:5227
+#: src/compose.c:5252
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Verzenden aan %d ontvangers. %s"
 
-#: src/compose.c:5256
+#: src/compose.c:5281
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:5259
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2189,7 +2285,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5263
+#: src/compose.c:5288
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2200,7 +2296,7 @@ msgstr ""
 "\n"
 "Ondertekenen mislukt: %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5293
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2211,7 +2307,7 @@ msgstr ""
 "\n"
 "Versleuteling mislukt: %s"
 
-#: src/compose.c:5273
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2221,7 +2317,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: src/compose.c:5277
+#: src/compose.c:5302
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2231,7 +2327,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: src/compose.c:5340 src/compose.c:5400
+#: src/compose.c:5365 src/compose.c:5425
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2240,7 +2336,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5396
+#: src/compose.c:5421
 #, c-format
 msgid ""
 "%s\n"
@@ -2250,7 +2346,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5793
+#: src/compose.c:5818
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2261,7 +2357,7 @@ msgstr ""
 "naar de opgegeven tekenset '%s'.\n"
 "Verzenden met tekenset %s?"
 
-#: src/compose.c:5855
+#: src/compose.c:5876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2274,99 +2370,100 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:6090
+#: src/compose.c:6115
 msgid "Encryption warning"
 msgstr "Versleutel-waarschuwing"
 
-#: src/compose.c:6091
+#: src/compose.c:6116
 msgid "C_ontinue"
 msgstr "Ga _door met bewerken"
 
-#: src/compose.c:6140
+#: src/compose.c:6165
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden."
 
-#: src/compose.c:6149
+#: src/compose.c:6174
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Geselecteerd account is geen NNTP: Plaatsen is niet mogelijk."
 
-#: src/compose.c:6403
+#: src/compose.c:6428
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijlage %s bestaat niet meer. Negeren?"
 
-#: src/compose.c:6405 src/mainwindow.c:659 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
 
-#: src/compose.c:6405
+#: src/compose.c:6431
 msgid "Ignore attachment"
 msgstr "Negeer bijlage"
 
-#: src/compose.c:6461
+#: src/compose.c:6487
 #, c-format
 msgid "Original %s part"
 msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:7061
+#: src/compose.c:7094
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:7216
+#: src/compose.c:7249
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: src/compose.c:7220 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Gebruik <tab> om adressen automatisch af te maken"
 
-#: src/compose.c:7455
+#: src/compose.c:7488
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: src/compose.c:7461 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:633
-#: src/prefs_summary_column.c:84 src/summaryview.c:467
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:7523
+#: src/compose.c:7556
 msgid "Save Message to "
 msgstr "Bericht bewaren in "
 
-#: src/compose.c:7556 src/editjpilot.c:277 src/editldap.c:514
-#: src/editvcard.c:193 src/export.c:161 src/gtk/gtkutils.c:77 src/import.c:160
-#: src/importmutt.c:240 src/importpine.c:239
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/compose.c:7589 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/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
-#: src/plugins/bsfilter/bsfilter_gtk.c:181
+#: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
 #: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7572
+#: src/compose.c:7605
 msgid "Select folder to save message to"
 msgstr "Selecteer map om bericht in op te slaan"
 
-#: src/compose.c:8022
+#: src/compose.c:8059
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:8027
+#: src/compose.c:8064
 msgid "_Attachments"
 msgstr "_Bijlages"
 
-#: src/compose.c:8041
+#: src/compose.c:8078
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:8056
+#: src/compose.c:8093
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: src/compose.c:8280
+#: src/compose.c:8317
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2375,19 +2472,19 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:8431
+#: src/compose.c:8468
 msgid "_From:"
 msgstr "_Van:"
 
-#: src/compose.c:8439
+#: src/compose.c:8476
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:8441
+#: src/compose.c:8478
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht"
 
-#: src/compose.c:8623
+#: src/compose.c:8660
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2396,50 +2493,50 @@ msgstr ""
 "Het privacy-systeem '%s' kon niet worden geladen. Het zal niet mogelijk zijn "
 "om dit bericht te ondertekenen of te versleutelen."
 
-#: src/compose.c:8734 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
 msgstr "G_een"
 
-#: src/compose.c:8835 src/prefs_template.c:745
+#: src/compose.c:8872 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "Opmaakfout in berichtinhoud-sjabloon op regel %d."
 
-#: src/compose.c:8932
+#: src/compose.c:8969
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Opmaakfout in '%s'-sjabloon."
 
-#: src/compose.c:9356
+#: src/compose.c:9394
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME-type."
 
-#: src/compose.c:9371
+#: src/compose.c:9409
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:9442
+#: src/compose.c:9480
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:9460
+#: src/compose.c:9498
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9493
+#: src/compose.c:9531
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:9513
+#: src/compose.c:9551
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:9514
+#: src/compose.c:9552
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9609
+#: src/compose.c:9648
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2448,47 +2545,64 @@ msgstr ""
 "Kon de berichtinhoud niet naar bestand schrijven:\n"
 "%s"
 
-#: src/compose.c:9667
+#: src/compose.c:9677
+msgid ""
+"Socket communication with an external editor is not available on Windows."
+msgstr ""
+"Communicatie via socket met een externe editor is niet beschikbaar op "
+"Windows."
+
+#: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Kon de volgende opdracht niet uitvoeren:\n"
+"Kon de volgende opdracht niet uitvoeren voor de externe editor:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9706
+#: src/compose.c:9754
 #, c-format
-msgid "External editor stopped with an error:%s"
-msgstr "Externe editor is gestopt met een fout:%s"
+msgid "External editor stopped with an error: %s"
+msgstr "Externe editor is gestopt met een fout: %s"
 
-#: src/compose.c:9780
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr "proces-id: %"
+
+#: src/compose.c:9830
+#, c-format
+#| msgid "processing folders"
+msgid "process id: %d"
+msgstr "proces-id: %d"
+
+#: src/compose.c:9835
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %d"
+"%s"
 msgstr ""
 "De externe editor is nog steeds actief.\n"
 "Zal ik het programma afbreken?\n"
-"proces-id: %d"
+"%s"
 
-#: src/compose.c:10187 src/messageview.c:1085
+#: src/compose.c:10245 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 "Claws Mail heeft netwerktoegang nodig voor het verzenden van deze e-mail."
 
-#: src/compose.c:10389
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:10393
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:10394
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2496,24 +2610,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:10396
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:10396
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "E-mail _weggooien"
 
-#: src/compose.c:10585 src/compose.c:10599
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:10613
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:10615
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2522,50 +2636,59 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10692
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Bericht weggooien"
 
-#: src/compose.c:10693
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: src/compose.c:10694 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Weggooien"
 
-#: src/compose.c:10694 src/compose.c:10699
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: src/compose.c:10697 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: src/compose.c:10698
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10699
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10770
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10772
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:10773 src/gtk/gtkutils.c:75 src/prefs_actions.c:326
-#: src/prefs_filtering_action.c:585 src/prefs_matcher.c:796
-#: src/prefs_toolbar.c:1003
+#: src/compose.c:10834 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 "_Vervangen"
 
-#: src/compose.c:11658
+#: src/compose.c:10911
+#, c-format
+msgid ""
+"Size of pasted text exceeds limit (%dKiB) for paste.\n"
+"Attach as file instead."
+msgstr ""
+"Grootte van geplakte tekst is groter dan de limiet (%dKiB) voor plakken.\n"
+"Voeg het als bestandsbijlage toe."
+
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2580,20 +2703,20 @@ msgstr[1] ""
 "Wil je de inhoud van de bestanden invoegen in de tekst van de %d berichten "
 "of bijvoegen wanneer het verstuurd wordt?"
 
-#: src/compose.c:11664
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "In- of bijvoegen?"
 
-#: src/compose.c:11665
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11881
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: src/compose.c:12177
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2607,12 +2730,12 @@ msgstr ""
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "Claws Mail process (%ld) ontving signaal %ld"
 
-#: src/crash.c:186
+#: src/crash.c:189
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail is gecrashed"
 
 # , c-format
-#: src/crash.c:203
+#: src/crash.c:206
 #, c-format
 msgid ""
 "%s.\n"
@@ -2621,23 +2744,24 @@ msgstr ""
 "%s.\n"
 "Rapporteer een fout, vermeld onderstaande informatie in je bericht."
 
-#: src/crash.c:208
+#: src/crash.c:211
 msgid "Debug log"
 msgstr "Foutopsporingslogboek"
 
-#: src/crash.c:252 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:539
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
+#: src/uri_opener.c:226
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/crash.c:257
+#: src/crash.c:260
 msgid "Save..."
 msgstr "Opslaan..."
 
-#: src/crash.c:262
+#: src/crash.c:265
 msgid "Create bug report"
 msgstr "Maak een foutrapport"
 
-#: src/crash.c:312
+#: src/crash.c:315
 msgid "Save crash information"
 msgstr "Sla crash-informatie op"
 
@@ -2706,7 +2830,7 @@ msgstr "Een e-mailadres is verplicht."
 msgid "A Name and Value must be supplied."
 msgstr "Naam en waarde verplicht."
 
-#: src/editaddress.c:820 src/prefs_folder_item.c:1761
+#: src/editaddress.c:820 src/prefs_folder_item.c:1827
 msgid "Discard"
 msgstr "Weggooien"
 
@@ -2714,15 +2838,15 @@ msgstr "Weggooien"
 msgid "Apply"
 msgstr "Pas toe"
 
-#: src/editaddress.c:851 src/editaddress.c:901
+#: src/editaddress.c:851 src/editaddress.c:902
 msgid "Edit Person Data"
 msgstr "Wijzig persoonlijke gegevens"
 
-#: src/editaddress.c:930
+#: src/editaddress.c:931
 msgid "Choose a picture"
 msgstr "Kies een afbeelding"
 
-#: src/editaddress.c:949
+#: src/editaddress.c:950
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2731,58 +2855,58 @@ msgstr ""
 "Afbeelding importeren mislukt: \n"
 "%s"
 
-#: src/editaddress.c:991
+#: src/editaddress.c:992
 msgid "_Set picture"
 msgstr "_Stel afbeelding in"
 
-#: src/editaddress.c:992
+#: src/editaddress.c:993
 msgid "_Unset picture"
 msgstr "_Afbeelding verwijderen"
 
-#: src/editaddress.c:1048
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:506
-#: src/exporthtml.c:762 src/ldif.c:747
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:508
+#: src/exporthtml.c:758 src/ldif.c:751
 msgid "Display Name"
 msgstr "Weergegeven naam"
 
-#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:755
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:759
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:751
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:755
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/editaddress.c:1113 src/editaddress.c:1115
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/editaddress.c:1251 src/editaddress.c:1292
+#: src/editaddress.c:1253 src/editaddress.c:1294
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1480 src/editaddress.c:1507 src/editaddress.c:1526
+#: src/editaddress.c:1483 src/editaddress.c:1510 src/editaddress.c:1529
 #: src/editaddress_other_attributes_ldap.c:374
 #: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:217
 msgid "Value"
 msgstr "Waarde"
 
-#: src/editaddress.c:1594
+#: src/editaddress.c:1597
 msgid "_User Data"
 msgstr "_Gebruikersgegevens"
 
-#: src/editaddress.c:1595
+#: src/editaddress.c:1598
 msgid "_Email Addresses"
 msgstr "_E-mailadres"
 
-#: src/editaddress.c:1598 src/editaddress.c:1601
+#: src/editaddress.c:1601 src/editaddress.c:1604
 msgid "O_ther Attributes"
 msgstr "O_verige Eigenschappen"
 
-#: src/editaddress.c:1769
+#: src/editaddress.c:1772
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2812,8 +2936,7 @@ msgid " Check File "
 msgstr " Controleer bestand "
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2442
-#: src/wizard.c:1201 src/wizard.c:1632
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Bestand"
 
@@ -2821,53 +2944,49 @@ msgstr "Bestand"
 msgid "Add New Addressbook"
 msgstr "Nieuw adresboek toevoegen"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Een groepnaam is verplicht."
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
-msgstr "Bewerken Groep"
+#: src/editgroup.c:292
+msgid "Edit group data"
+msgstr "Bewerk groepgegevens"
 
-#: src/editgroup.c:323 src/exporthtml.c:598
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Groepnaam"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Adressen in groep"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Beschikbare adressen"
 
-#: src/editgroup.c:452
-msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr "Verplaats adressen van/naar Groep met de pijltjestoetsen"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Adressen in groep"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
-msgstr "Bewerken groepdetails"
+#: src/editgroup.c:494
+msgid "Edit group details"
+msgstr "Bewerk groepgegevens"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "Toevoegen nieuwe groep"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Bewerken map"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam op van de  map:"
 
-#: src/editgroup.c:555 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: 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
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:556 src/foldersel.c:572 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Geef de naam op van de nieuwe map:"
 
@@ -2895,14 +3014,14 @@ msgstr "Nieuwe JPilot invoer"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Wijzig LDAP - Selecteer zoekbasis"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3189
-#: src/prefs_proxy.c:98
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Hostnaam"
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3196
-#: src/prefs_proxy.c:105 src/ssl_manager.c:117
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Poort"
 
@@ -2962,9 +3081,9 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4163
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#: src/editldap.c:468 src/prefs_account.c:4227
+msgid "TLS"
+msgstr "TLS"
 
 #: src/editldap.c:472
 msgid ""
@@ -2979,13 +3098,13 @@ msgstr ""
 
 #: src/editldap.c:477
 msgid ""
-"Enable secure connection to the LDAP server via SSL/TLS. If connection "
-"fails, be sure to check the correct configuration in ldap.conf "
-"(TLS_CACERTDIR and TLS_REQCERT fields)."
+"Enable secure connection to the LDAP server via TLS. If connection fails, be "
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."
 msgstr ""
-"Gebruik SSL/TLS voor een beveiligde verbinding met de LDAP-server. "
-"Controleer, als het niet lukt om een verbinding te maken, de instellingen in "
-"ldap.conf (de velden TLS_CACERTDIR en TLS_REQCERT)."
+"Gebruik een beveiligde verbinding met de LDAP-server via TLS. Controleer, "
+"als het niet lukt om een verbinding te maken, de instellingen in ldap.conf "
+"(de velden TLS_CACERTDIR en TLS_REQCERT)."
 
 #: src/editldap.c:487
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -3131,13 +3250,13 @@ msgstr ""
 "Het te gebruiken wachtwoord bij het maken van een verbinding als de \"Bind DN"
 "\" gebruiker."
 
-#: src/editldap.c:727 src/prefs_account.c:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3001 src/prefs_account.c:3029 src/prefs_account.c:3230
-#: src/prefs_proxy.c:142
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Wachtwoord weergeven"
 
-#: src/editldap.c:734
+#: src/editldap.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
 msgid "Timeout (secs)"
 msgstr "Tijdslimiet (sec)"
 
@@ -3156,11 +3275,11 @@ msgstr ""
 "Het maximaal aantal ingangen dat moet worden teruggegeven in een "
 "zoekresultaat."
 
-#: src/editldap.c:776 src/prefs_account.c:4036
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Algemeen"
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:877
+#: src/editldap.c:778 src/gtk/quicksearch.c:878
 msgid "Extended"
 msgstr "Uitgebreid"
 
@@ -3168,47 +3287,60 @@ msgstr "Uitgebreid"
 msgid "Add New LDAP Server"
 msgstr "Nieuwe LDAP-server"
 
-#: src/edittags.c:191 src/gtk/quicksearch.c:865
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:640
+#: src/edittags.c:135
+msgctxt "Window title"
+msgid "Tags configuration"
+msgstr "Tag-instellingen"
+
+#: src/edittags.c:140
+msgctxt "Window title"
+msgid "Modify tags"
+msgstr "Wijzig tags"
+
+#: src/edittags.c:203 src/gtk/quicksearch.c:866
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
 msgid "Tag"
 msgstr "Tag"
 
-#: src/edittags.c:220
+#: src/edittags.c:232
 msgid "Delete tag"
 msgstr "Verwijder tag"
 
-#: src/edittags.c:221
+#: src/edittags.c:233
 msgid "Do you really want to delete this tag?"
 msgstr "Wil je deze tag werkelijk verwijderen?"
 
-#: src/edittags.c:256
+#: src/edittags.c:268
 msgid "Delete all tags"
 msgstr "Verwijder alle tags"
 
-#: src/edittags.c:257
+#: src/edittags.c:269
 msgid "Do you really want to delete all tags?"
 msgstr "Wil je alle tags werkelijk verwijderen?"
 
-#: src/edittags.c:427
+#: src/edittags.c:441
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "Je voerde een gereserveerde tag naam in, kies een andere naam."
 
-#: src/edittags.c:469
-msgid "Tag is not set."
-msgstr "Tag is niet ingesteld."
-
-#: src/edittags.c:547
-msgctxt "Dialog title"
-msgid "Apply tags"
-msgstr "Pas tags toe"
-
-#: src/edittags.c:564
+#: src/edittags.c:572
 msgid "New tag:"
 msgstr "Nieuwe tag:"
 
-#: src/edittags.c:597
-msgid "Please select tags to apply/remove. Changes are immediate."
-msgstr "Selecteer tags om onmiddelijk toe te passen of te verwijderen."
+#: src/edittags.c:584
+msgid "Add the new tag"
+msgstr "De nieuwe tag toevoegen"
+
+#: src/edittags.c:589
+msgid "Delete the selected tag"
+msgstr "Verwijder geselecteerde tag"
+
+#: src/edittags.c:608
+msgid ""
+"Choose the tag(s) for the message(s).\n"
+"Changes are immediately applied."
+msgstr ""
+"Kies de tag(s) voor de bericht(en).\n"
+"Wijzigingen worden direct toegepast."
 
 #: src/editvcard.c:94
 msgid "File does not appear to be vCard format."
@@ -3230,11 +3362,11 @@ msgstr "Toevoegen nieuwe VCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Niet mogelijk om client-certificaat in te stellen.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "kan xover-bereik niet ophalen\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "kan xhdr-bereik niet ophalen\n"
 
@@ -3263,7 +3395,7 @@ msgstr ""
 msgid "Create directory"
 msgstr "Map aanmaken"
 
-#: src/exphtmldlg.c:189
+#: src/exphtmldlg.c:190
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -3272,111 +3404,121 @@ msgstr ""
 "Kon uitvoermap voor HTML-bestand niet aanmaken:\n"
 "%s"
 
-#: src/exphtmldlg.c:191 src/expldifdlg.c:201
+#: src/exphtmldlg.c:192 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "Map aanmaken mislukt"
 
-#: src/exphtmldlg.c:233
+#: src/exphtmldlg.c:235
 msgid "Error creating HTML file"
 msgstr "Fout bij aanmaken HTML-bestand"
 
-#: src/exphtmldlg.c:319
+#: src/exphtmldlg.c:324
 msgid "Select HTML output file"
 msgstr "Selecteer HTML-uitvoerbestand"
 
-#: src/exphtmldlg.c:378
+#: src/exphtmldlg.c:383
 msgid "HTML Output File"
 msgstr "HTML-uitvoerbestand"
 
-#: src/exphtmldlg.c:387 src/expldifdlg.c:404 src/export.c:167 src/import.c:166
-#: src/importldif.c:565
+#: src/exphtmldlg.c:392 src/expldifdlg.c:406 src/export.c:167 src/import.c:166
+#: src/importldif.c:567
 msgid "B_rowse"
 msgstr "_Bekijk"
 
-#: src/exphtmldlg.c:436 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
 msgid "Stylesheet"
 msgstr "Stijlblad"
 
-#: src/exphtmldlg.c:443 src/gtk/colorlabel.c:368 src/gtk/colorlabel.c:494
-#: src/gtk/gtkaspell.c:1572 src/gtk/gtkaspell.c:2207 src/gtk/menu.c:126
-#: src/mainwindow.c:1175 src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1420 src/summaryview.c:6246
+#: 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
 msgid "None"
 msgstr "Geen"
 
-#: src/exphtmldlg.c:444 src/prefs_folder_item.c:531
-#: src/prefs_folder_item.c:1178 src/prefs_folder_item.c:1208
+#: src/exphtmldlg.c:449 src/prefs_folder_item.c:532
+#: src/prefs_folder_item.c:1240 src/prefs_folder_item.c:1271
 #: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr "Standaard"
 
-#: src/exphtmldlg.c:445 src/plugins/pgpcore/select-keys.c:240
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
+#: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Volledig"
 
-#: src/exphtmldlg.c:446
+#: src/exphtmldlg.c:451
 msgid "Custom"
 msgstr "Aangepast"
 
-#: src/exphtmldlg.c:447
+#: src/exphtmldlg.c:452
 msgid "Custom-2"
 msgstr "Aangepast-2"
 
-#: src/exphtmldlg.c:448
+#: src/exphtmldlg.c:453
 msgid "Custom-3"
 msgstr "Aangepast-3"
 
-#: src/exphtmldlg.c:449
+#: src/exphtmldlg.c:454
 msgid "Custom-4"
 msgstr "Aangepast-4"
 
-#: src/exphtmldlg.c:454
+#: src/exphtmldlg.c:459
 msgid "Full Name Format"
 msgstr "Volledige namen"
 
-#: src/exphtmldlg.c:461
+#: src/exphtmldlg.c:466
 msgid "First Name, Last Name"
 msgstr "Voornaam, Achternaam"
 
-#: src/exphtmldlg.c:462
+#: src/exphtmldlg.c:467
 msgid "Last Name, First Name"
 msgstr "Achternaam, Voornaam"
 
-#: src/exphtmldlg.c:467
+#: src/exphtmldlg.c:472
 msgid "Color Banding"
 msgstr "Kleur regels"
 
-#: src/exphtmldlg.c:471
+#: src/exphtmldlg.c:476
 msgid "Format Email Links"
 msgstr "Format van E-mail-koppeling"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:480
 msgid "Format User Attributes"
 msgstr "Gebruikerseigenschappen toevoegen"
 
-#: src/exphtmldlg.c:517 src/expldifdlg.c:593 src/importldif.c:837
+#: src/exphtmldlg.c:522 src/expldifdlg.c:595 src/importldif.c:839
 msgid "Address Book:"
 msgstr "Adresboekboek:"
 
-#: src/exphtmldlg.c:526 src/expldifdlg.c:602 src/importldif.c:846
+#: src/exphtmldlg.c:531 src/expldifdlg.c:604 src/importldif.c:848
 msgid "File Name:"
 msgstr "Bestandsnaam:"
 
-#: src/exphtmldlg.c:535
+#: src/exphtmldlg.c:540
 msgid "Open with Web Browser"
 msgstr "Openen met Webbrowser"
 
-#: src/exphtmldlg.c:567
+#: src/exphtmldlg.c:572
 msgid "Export Address Book to HTML File"
 msgstr "Exporteren Adresboek naar HTML-bestand"
 
-#: src/exphtmldlg.c:633 src/expldifdlg.c:701 src/importldif.c:963
+#: 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
+msgid "_Previous"
+msgstr "Vo_rige"
+
+#: src/exphtmldlg.c:607 src/expldifdlg.c:672 src/importldif.c:924
+#: src/message_search.c:233 src/summary_search.c:490 src/wizard.c:1831
+msgid "_Next"
+msgstr "Vo_lgende"
+
+#: src/exphtmldlg.c:638 src/expldifdlg.c:703 src/importldif.c:965
 msgid "File Info"
 msgstr "Bestandsinfo"
 
-#: src/exphtmldlg.c:634
+#: src/exphtmldlg.c:639
 msgid "Format"
 msgstr "Format"
 
@@ -3426,15 +3568,15 @@ msgstr ""
 msgid "Error creating LDIF file"
 msgstr "Fout bij aanmaken LDIF-bestand"
 
-#: src/expldifdlg.c:336
+#: src/expldifdlg.c:338
 msgid "Select LDIF output file"
 msgstr "Selecteer LDIF-uitvoerbestand"
 
-#: src/expldifdlg.c:395
+#: src/expldifdlg.c:397
 msgid "LDIF Output File"
 msgstr "LDIF-uitvoerbestand"
 
-#: src/expldifdlg.c:425
+#: src/expldifdlg.c:427
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3444,7 +3586,7 @@ msgstr ""
 "dan ongeveer zo uit komt te zien:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:431
+#: src/expldifdlg.c:433
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3454,7 +3596,7 @@ msgstr ""
 "die er dan ongeveer zo uit komt te zien:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:439
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3464,11 +3606,11 @@ msgstr ""
 "er dan ongeveer zo uit komt te zien:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:481
+#: src/expldifdlg.c:483
 msgid "Suffix"
 msgstr "Achtervoegsel"
 
-#: src/expldifdlg.c:491
+#: src/expldifdlg.c:493
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3482,15 +3624,15 @@ msgstr ""
 "  ou=people,dc=domeinnaam,dc=nl\n"
 "  o=Organisatie Naam,c=Land\n"
 
-#: src/expldifdlg.c:498
+#: src/expldifdlg.c:500
 msgid "Relative DN"
 msgstr "Relatieve DN"
 
-#: src/expldifdlg.c:505
+#: src/expldifdlg.c:507
 msgid "Unique ID"
 msgstr "Unieke ID"
 
-#: src/expldifdlg.c:512
+#: src/expldifdlg.c:514
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3504,11 +3646,11 @@ msgstr ""
 "zogenaamde \"Relative Distinguished Name\" (of RDN) om zo de DN te "
 "verkrijgen. Kies één van de beschikbare RDN-opties om de DN aan te maken."
 
-#: src/expldifdlg.c:529
+#: src/expldifdlg.c:531
 msgid "Use DN attribute if present in data"
 msgstr "Gebruik de DN-eigenschap indien aanwezig in de gegevens"
 
-#: src/expldifdlg.c:533
+#: src/expldifdlg.c:535
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3521,11 +3663,11 @@ msgstr ""
 "exporteren LDIF-bestand. Als de ingang geen DN-eigenschap bevat zal de "
 "hierboven geselecteerde RDN gebruikt worden."
 
-#: src/expldifdlg.c:542
+#: src/expldifdlg.c:544
 msgid "Exclude record if no Email Address"
 msgstr "Sla ingang zonder e-mailadres over"
 
-#: src/expldifdlg.c:546
+#: src/expldifdlg.c:548
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
@@ -3533,15 +3675,15 @@ msgstr ""
 "Een adresboek kan ingangen zonder e-mailadres bevatten. Vink deze optie aan "
 "als je deze ingangen wil overslaan."
 
-#: src/expldifdlg.c:635
+#: src/expldifdlg.c:637
 msgid "Export Address Book to LDIF File"
 msgstr "Exporteren Adresboek naar LDIF-bestand"
 
-#: src/expldifdlg.c:702
+#: src/expldifdlg.c:704
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:112 src/summaryview.c:8456
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Exporteer naar mbox-bestand"
 
@@ -3577,32 +3719,32 @@ msgstr "Selecteer doelbestand"
 msgid "Select folder to export"
 msgstr "Selecteer map om te exporteren"
 
-#: src/exporthtml.c:768
+#: src/exporthtml.c:764
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: src/exporthtml.c:772 src/importldif.c:964
+#: src/exporthtml.c:768 src/importldif.c:966
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Eigenschappen"
 
-#: src/exporthtml.c:975
+#: src/exporthtml.c:971
 msgid "Claws Mail Address Book"
 msgstr "Claws Mail Adresboek"
 
-#: src/exporthtml.c:1070 src/exportldif.c:607
+#: src/exporthtml.c:1066 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "Bestand bestaat al maar is geen map."
 
-#: src/exporthtml.c:1073 src/exportldif.c:610
+#: src/exporthtml.c:1069 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "Geen rechten om map aan te maken."
 
-#: src/exporthtml.c:1076 src/exportldif.c:613
+#: src/exporthtml.c:1072 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "De naam is te lang."
 
-#: src/exporthtml.c:1079 src/exportldif.c:616
+#: src/exporthtml.c:1075 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Niet aangegeven."
 
@@ -3625,152 +3767,174 @@ msgstr ""
 "Het bestand %s is leeg of beschadigd. Wil je het backup-bestand gebruiken "
 "van %s?"
 
-#: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
-msgstr "regel is niet verbonden met een account\n"
+msgstr "regel is niet gebonden aan een account\n"
 
-#: src/filtering.c:607
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"regel is gebonden aan een account, overeenkomend met het account dat nu "
+"gebruikt wordt om berichten op te halen\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
-"regel is verbonden aan een account [id=%d, naam='%s'], overeenkomend met het "
+"regel is gebonden aan een account [id=%d, naam='%s'], overeenkomend met het "
 "account dat nu gebruikt wordt om berichten op te halen\n"
 
-#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
-#: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
-#: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "NON_EXISTENT"
 
-#: src/filtering.c:617
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
-"regel is verbonden met een account, niet overeenkomend met het account dat "
-"nu gebruikt wordt om berichten op te halen\n"
+"regel is gebonden aan een account, niet overeenkomend met het account dat nu "
+"gebruikt wordt om berichten op te halen\n"
 
-#: src/filtering.c:624
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
-"regel is verbonden met een account [id=%d, naam='%s'], niet overeenkomend "
-"met het account dat nu gebruikt wordt om berichten op te halen [id=%d, "
+"regel is gebonden aan een account [id=%d, naam='%s'], niet overeenkomend met "
+"het account dat nu gebruikt wordt om berichten op te halen [id=%d, "
 "naam='%s']\n"
 
-#: src/filtering.c:643
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"regel is niet verbonden met een account, alle regels worden toegepast "
-"volgens aanvraag van de gebruiker\n"
+"regel is niet gebonden aan een account, alle regels worden toegepast op "
+"aanvraag van de gebruiker\n"
 
-#: src/filtering.c:649
+#: src/filtering.c:665
+msgid ""
+"rule is account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"regel is gebonden aan een account, alle regels worden toegepast op aanvraag "
+"van de gebruiker\n"
+
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
+msgstr ""
+"regel is gebonden aan een account [id=%d, naam='%s'], alle regels worden "
+"toegepast op aanvraag van de gebruiker\n"
+
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
 msgstr ""
-"regel is verbonden met een account [id=%d, naam='%s'], maar alle regels "
-"worden toegepast op aanvraag van de gebruiker\n"
+"regel is gebonden aan een account, overgeslagen op verzoek van de gebruiker\n"
 
-#: src/filtering.c:667
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "regel is gebonden aan een account [id=%d, naam='%s'], overgeslagen op "
 "verzoek van de gebruiker\n"
 
-#: src/filtering.c:672
-msgid "rule is account-based, skipped on user request\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
 msgstr ""
-"regel is gebonden aan een account, overgeslagen op verzoek van de gebruiker\n"
+"regel is gebonden aan een account, overeenkomend met het huidige account\n"
 
-#: src/filtering.c:694
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"regel is gebonden aan een account [id=%d, naam='%s'], niet het huidige "
-"account [id=%d, naam='%s']\n"
+"regel is gebonden aan een account [id=%d, naam='%s'], overeenkomend met het "
+"huidige account [id=%d, naam='%s']\n"
 
-#: src/filtering.c:700
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
-msgstr "regel is gebonden aan een account, niet het huidige account\n"
+msgstr ""
+"regel is gebonden aan een account, niet overeenkomend met het huidige "
+"account\n"
 
-#: src/filtering.c:712
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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 is gebonden aan een account [id=%d, naam='%s'], het huidige account "
-"[id=%d, naam='%s']\n"
+"regel is gebonden aan een account [id=%d, naam='%s'], niet overeenkomend met "
+"het huidige account [id=%d, naam='%s']\n"
 
-#: src/filtering.c:752
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "toepassen actie [ %s ]\n"
 
-#: src/filtering.c:757
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "actie kon niet toegepast worden\n"
 
-#: src/filtering.c:759
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "geen verdere verwerking na actie [ %s ]\n"
 
-#: src/filtering.c:820
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "verwerking van regel '%s' [ %s ]\n"
 
-#: src/filtering.c:824
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "verwerken van regel <onbekend> [ %s ]\n"
 
-#: src/filtering.c:842
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "regel uitgezet '%s' [ %s ]\n"
 
-#: src/filtering.c:846
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regel uitgezet <onbekend> [ %s ]\n"
 
-#: src/filtering.c:884
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "niet gedefiniëerd"
 
-#: src/filtering.c:888
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "bij ontvangen"
 
-#: src/filtering.c:892
+#: src/filtering.c:935
 msgid "manually"
 msgstr "handmatig"
 
-#: src/filtering.c:896
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "verwerken van map"
 
-#: src/filtering.c:900
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "voorverwerken"
 
-#: src/filtering.c:904
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "naverwerken"
 
-#: src/filtering.c:919
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3787,11 +3951,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:921 src/filtering.c:930
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:928
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3800,288 +3964,284 @@ msgstr ""
 "filteren van bericht (%s%s%s)\n"
 "%sberichtbestand: %s\n"
 
-#: src/folder.c:1595 src/prefs_folder_item.c:318
+#: src/folder.c:1596 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/folder.c:1599
+#: src/folder.c:1600
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:321
+#: 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 "Wachtrij"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:322
+#: src/folder.c:1608 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:320
+#: src/folder.c:1612 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/folder.c:2042
+#: src/folder.c:2043
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bezig met verwerken (%s)...\n"
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Bezig met kopiëren van %s naar %s...\n"
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Bezig met verplaatsen van %s naar %s...\n"
 
-#: src/folder.c:3604
+#: src/folder.c:3613
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Cache voor %s wordt bijgewerkt..."
 
-#: src/folder.c:4466
+#: src/folder.c:4478
 msgid "Processing messages..."
 msgstr "Berichten verwerken..."
 
-#: src/folder.c:4601
+#: src/folder.c:4613
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synchroniseren %s voor offline gebruik... \n"
 
-#: src/folder.c:4860
+#: src/folder.c:4872
 msgid "A folder name cannot begin or end with a dot."
 msgstr "Een mapnaam kan niet beginnen of eindigen met een punt."
 
-#: src/folder.c:4864
+#: src/folder.c:4876
 msgid "A folder name can not end with a space."
 msgstr "Een mapnaam kan niet eindigen met een spatie."
 
-#: src/foldersel.c:251
+#: src/foldersel.c:252
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:349
-msgid "_New"
-msgstr "_Nieuw"
-
-#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: 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
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:574 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
 msgstr "Neem eigenschappen en verwerkregels over van bovenliggende map"
 
-#: src/foldersel.c:584 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:431
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2068
+#: 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
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
-#: src/foldersel.c:599 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:270
-#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:214
-#: src/plugins/vcalendar/vcal_folder.c:2075
+#: 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
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:606 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: 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:125
+#: src/plugins/rssyl/rssyl_cb_menu.c:162
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:247
+#: src/folderview.c:248
 msgid "Mark all re_ad"
 msgstr "_Alles gelezen"
 
-#: src/folderview.c:248
+#: src/folderview.c:249
 msgid "Mark all u_nread"
 msgstr "Alles _ongelezen"
 
-#: src/folderview.c:249
+#: src/folderview.c:250
 msgid "Mark all read recursi_vely"
 msgstr "Markeer alles gelezen, _recursief"
 
-#: src/folderview.c:250
+#: src/folderview.c:251
 msgid "Mark all unread recursi_vely"
 msgstr "Markeer alles ongelezen, recursie_f"
 
-#: src/folderview.c:252
+#: src/folderview.c:253
 msgid "R_un processing rules"
 msgstr "_Verwerkingsregel draaien"
 
-#: src/folderview.c:253 src/mainwindow.c:556
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Map doorzoeken..."
 
-#: src/folderview.c:255
+#: src/folderview.c:256
 msgid "Process_ing..."
 msgstr "_Verwerken..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
 msgid "Empty _trash..."
 msgstr "Prullenbak leegmaken..."
 
-#: src/folderview.c:257
+#: src/folderview.c:258
 msgid "Send _queue..."
 msgstr "Verzend wacht_rij..."
 
-#: src/folderview.c:264
+#: src/folderview.c:265
 msgid "Set Displayed columns"
 msgstr "Weergegeven kolommen instellen"
 
-#: src/folderview.c:403 src/folderview.c:450
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6518
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
 msgid "New"
 msgstr "Nieuw"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:405 src/folderview.c:452
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6520
-#: src/toolbar.c:512
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/toolbar.c:522
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "Totaal"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:453 src/summaryview.c:468
+#: src/folderview.c:454 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:781
+#: src/folderview.c:785
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:866 src/summaryview.c:4262
+#: src/folderview.c:870 src/summaryview.c:4272
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
-#: src/folderview.c:867
+#: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
 "Wil je werkelijk alle berichten in deze map en zijn submappen als gelezen "
 "markeren?"
 
-#: src/folderview.c:869 src/summaryview.c:4263
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "Wil je werkelijk alle berichten in deze map als gelezen markeren?"
 
-#: src/folderview.c:872 src/summaryview.c:4308
+#: src/folderview.c:876 src/summaryview.c:4318
 msgid "Mark all as unread"
 msgstr "Markeer alles als ongelezen"
 
-#: src/folderview.c:873
+#: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
 "Wil je werkelijk alle berichten in deze map en zijn submappen als ongelezen "
 "markeren?"
 
-#: src/folderview.c:875 src/summaryview.c:4309
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Wil je werkelijk alle berichten in deze map als ongelezen markeren?"
 
-#: src/folderview.c:1065 src/imap.c:4686
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Map wordt ingelezen %s/%s..."
 
-#: src/folderview.c:1068 src/imap.c:4690 src/mainwindow.c:5223 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Map wordt ingelezen %s..."
 
-#: src/folderview.c:1099
+#: src/folderview.c:1109
 msgid "Rebuild folder tree"
 msgstr "Vernieuw mappenboom"
 
-#: src/folderview.c:1100
+#: src/folderview.c:1110
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Mappenboom vernieuwen verwijdert lokale caches. Wil je doorgaan?"
 
-#: src/folderview.c:1110
+#: src/folderview.c:1120
 msgid "Rebuilding folder tree..."
 msgstr "Mappenboom wordt opnieuw aangemaakt..."
 
-#: src/folderview.c:1112
+#: src/folderview.c:1122
 msgid "Scanning folder tree..."
 msgstr "Mappenboom wordt ingelezen..."
 
-#: src/folderview.c:1202
+#: src/folderview.c:1212
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kan map '%s' niet inlezen\n"
 
-#: src/folderview.c:1256
+#: src/folderview.c:1266
 msgid "Checking for new messages in all folders..."
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten..."
 
-#: src/folderview.c:2225
+#: src/folderview.c:2235
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Map %s wordt gesloten..."
 
-#: src/folderview.c:2320
+#: src/folderview.c:2337
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Map %s wordt geopend..."
 
-#: src/folderview.c:2338
+#: src/folderview.c:2355
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: src/folderview.c:2478 src/mainwindow.c:2866 src/mainwindow.c:2871
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2479
+#: src/folderview.c:2496
 msgid "Delete all messages in trash?"
 msgstr "Alle berichten in de prullenbak weggooien?"
 
-#: src/folderview.c:2480
+#: src/folderview.c:2497
 msgid "_Empty trash"
 msgstr "_Prullenbak legen"
 
-#: src/folderview.c:2524 src/inc.c:1666 src/toolbar.c:3032
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Offline waarschuwing"
 
-#: src/folderview.c:2525 src/toolbar.c:3033
+#: src/folderview.c:2542 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Je bent momenteel niet online. Toch doorgaan?"
 
-#: src/folderview.c:2536 src/toolbar.c:3052
+#: src/folderview.c:2553 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/folderview.c:2537 src/toolbar.c:3053
+#: src/folderview.c:2554 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Alle berichten uit de wachtrij verzenden?"
 
-#: src/folderview.c:2546 src/toolbar.c:3072
+#: src/folderview.c:2563 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij."
 
-#: src/folderview.c:2549 src/main.c:2882 src/toolbar.c:3075
+#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -4090,114 +4250,118 @@ msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij:\n"
 "%s"
 
-#: src/folderview.c:2624
+#: src/folderview.c:2647
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "Wil je werkelijk map '%s' kopiëren naar '%s'?"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2648
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "Wil je werkelijk van map '%s' een submap maken van '%s'?"
 
-#: src/folderview.c:2627
+#: src/folderview.c:2650
 msgid "Copy folder"
 msgstr "Kopieer map"
 
-#: src/folderview.c:2627
+#: src/folderview.c:2650
 msgid "Move folder"
 msgstr "Verplaats map"
 
-#: src/folderview.c:2638
+#: src/folderview.c:2661
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Bezig %s te kopiëren naar %s..."
 
-#: src/folderview.c:2638
+#: src/folderview.c:2661
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Bezig %s te verplaatsen naar %s..."
 
-#: src/folderview.c:2672
+#: src/folderview.c:2695
 msgid "Source and destination are the same."
 msgstr "Bron en bestemming zijn hetzelfde."
 
-#: src/folderview.c:2675
+#: src/folderview.c:2698
 msgid "Can't copy a folder to one of its children."
 msgstr "Kan een map niet kopiëren naar één van z'n submappen."
 
-#: src/folderview.c:2676
+#: src/folderview.c:2699
 msgid "Can't move a folder to one of its children."
 msgstr "Kan een map niet verplaatsen naar één van z'n submappen."
 
-#: src/folderview.c:2679
+#: src/folderview.c:2702
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kan een map niet naar een ander postvak verplaatsen."
 
-#: src/folderview.c:2682
+#: src/folderview.c:2705
 msgid "Copy failed!"
 msgstr "Kopiëren mislukt."
 
-#: src/folderview.c:2682
+#: src/folderview.c:2705
 msgid "Move failed!"
 msgstr "Verplaatsen mislukt."
 
-#: src/folderview.c:2732
+#: src/folderview.c:2755
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: src/folderview.c:3155 src/summaryview.c:4717 src/summaryview.c:4823
+#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Doelmap kan alleen gebruikt worden om submappen op te slaan."
 
-#: src/grouplistdialog.c:161
+#: src/grouplistdialog.c:158
 msgid "Newsgroup subscription"
 msgstr "Nieuwsgroep-abonnementen"
 
-#: src/grouplistdialog.c:178
+#: src/grouplistdialog.c:175
 msgid "Select newsgroups for subscription:"
 msgstr "Selecteer nieuwsgroepen voor een abonnement:"
 
-#: src/grouplistdialog.c:192
+#: src/grouplistdialog.c:189
 msgid "Find groups:"
 msgstr "Zoek nieuwsgroep:"
 
-#: src/grouplistdialog.c:201
+#: src/grouplistdialog.c:198
 msgid " Search "
 msgstr " Zoek "
 
-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:212
 msgid "Newsgroup name"
 msgstr "Naam nieuwsgroep"
 
-#: src/grouplistdialog.c:216 src/prefs_send.c:188
+#: src/grouplistdialog.c:213 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Berichten"
 
-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Type"
 
-#: src/grouplistdialog.c:357
+#: src/grouplistdialog.c:236
+msgid "_Refresh"
+msgstr "V_erversen"
+
+#: src/grouplistdialog.c:354
 msgid "moderated"
 msgstr "gemodereerd"
 
-#: src/grouplistdialog.c:359
-msgid "readonly"
+#: src/grouplistdialog.c:356
+msgid "read-only"
 msgstr "alleen-lezen"
 
-#: src/grouplistdialog.c:361 src/plugins/att_remover/att_remover.c:303
+#: 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
 msgid "unknown"
 msgstr "onbekend"
 
-#: src/grouplistdialog.c:436
+#: src/grouplistdialog.c:433
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan groeplijst niet ophalen."
 
-#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1877 src/summaryview.c:1669
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Klaar."
 
@@ -4206,23 +4370,23 @@ msgstr "Klaar."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d nieuwsgroepen ontvangen (%s gelezen)"
 
-#: src/gtk/about.c:133
+#: src/gtk/about.c:134
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
 "Claws Mail is een lichtgewicht, snelle en zeer configureerbare e-maillezer."
 
-#: src/gtk/about.c:136
+#: src/gtk/about.c:137
 msgid "For further information visit the Claws Mail website:"
 msgstr "Voor meer informatie ga naar de Claws Mail website:"
 
-#: src/gtk/about.c:141
+#: src/gtk/about.c:142
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "Voor ondersteuning en discussie kun je je inschrijven voor de Claws Mail "
 "gebruikers-mailinglijst:"
 
-#: src/gtk/about.c:147
+#: src/gtk/about.c:148
 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:"
@@ -4230,21 +4394,21 @@ msgstr ""
 "Claws Mail is vrije software uitgegeven onder de GPL licentie. Als je een "
 "donatie wenst te maken aan het Claws Mail project, kan dat hier:"
 
-#: src/gtk/about.c:163 src/gtk/about.c:857
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
-"Copyright (C) 1999-2021\n"
+"Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Auteursrecht (C) 1999-2021\n"
+"Auteursrecht (C) 1999-2022\n"
 "Het Claws Mail Team\n"
 "en Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:169
 msgid "System Information\n"
 msgstr "Systeem-informatie\n"
 
-#: src/gtk/about.c:174
+#: src/gtk/about.c:175
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4253,7 +4417,7 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: %s %s (%s)"
 
-#: src/gtk/about.c:183
+#: src/gtk/about.c:185
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4262,7 +4426,7 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: %s"
 
-#: src/gtk/about.c:192
+#: src/gtk/about.c:195
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4271,95 +4435,102 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: unknown"
 
-#: src/gtk/about.c:249 src/prefs_themes.c:842 src/wizard.c:529
+#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Het Claws Mail Team"
 
-#: src/gtk/about.c:268
+#: src/gtk/about.c:273
 msgid "Previous team members"
 msgstr "Voormalige teamleden"
 
-#: src/gtk/about.c:287
+#: src/gtk/about.c:292
 msgid "The translation team"
 msgstr "Het vertaalteam"
 
-#: src/gtk/about.c:306
+#: src/gtk/about.c:311
 msgid "Documentation team"
 msgstr "Documentatieteam"
 
-#: src/gtk/about.c:324
+#: src/gtk/about.c:329
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:343
+#: src/gtk/about.c:348
 msgid "Icons"
 msgstr "Pictogrammen"
 
-#: src/gtk/about.c:362
+#: src/gtk/about.c:367
 msgid "Contributors"
 msgstr "Medewerkers"
 
-#: src/gtk/about.c:411
+#: src/gtk/about.c:416
 msgid "Compiled-in Features"
 msgstr "Ingebouwde eigenschappen"
 
-#: src/gtk/about.c:428
+#: src/gtk/about.c:433
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "ondersteuning voor de X-Face-header\n"
 
-#: src/gtk/about.c:438
+#: src/gtk/about.c:443
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "ondersteuning voor spellingcontrole\n"
 
-#: src/gtk/about.c:448
+#: src/gtk/about.c:453
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "ondersteuning voor beveiligde verbindingen met servers\n"
 
-#: src/gtk/about.c:458
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "ondersteuning voor IPv6, het nieuwe internet-adressering-protocol\n"
-
-#: src/gtk/about.c:469
+#: src/gtk/about.c:463
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr ""
 "ondersteuning voor het converteren van en naar verschillende tekensets\n"
 
-#: src/gtk/about.c:479
+#: src/gtk/about.c:473
+#| msgctxt "JPilot"
+#| msgid "adds support for PalmOS addressbooks\n"
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "voegt ondersteuning toe voor IPv6-addressen\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "ondersteuning voor PalmOS-adresboeken\n"
 
-#: src/gtk/about.c:489
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "ondersteuning voor gedeelde LDAP-adresboeken\n"
 
-#: src/gtk/about.c:499
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "ondersteuning voor IMAP en NNTP-servers\n"
 
-#: src/gtk/about.c:509
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "ondersteuning voor SVG-thema's\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "ondersteuning voor sessiebeheer\n"
 
-#: src/gtk/about.c:519
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "ondersteuning voor veranderingen in netwerkverbinding\n"
 
-#: src/gtk/about.c:529
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "ondersteuning voor SVG-thema's\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "voegt ondersteuning toe voor OAuth2 authenticatie\n"
 
-#: src/gtk/about.c:562
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4370,7 +4541,7 @@ msgstr ""
 "Je mag zelf kiezen of je versie 3 of (als je dat wenst) iedere latere versie "
 "van de GPL hanteert."
 
-#: src/gtk/about.c:569
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4382,7 +4553,7 @@ msgstr ""
 "of GESCHIKTHEID VOOR ENIG DOEL. Lees de GNU General Public License voor "
 "verdere details."
 
-#: src/gtk/about.c:587
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4390,150 +4561,158 @@ msgstr ""
 "Je zou een kopie van de GNU General Public License ontvangen moeten hebben "
 "bij dit programma. Als dit niet het geval is, zie "
 
-#: src/gtk/about.c:722 src/main.c:2706
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Sessie-statistieken\n"
 
-#: src/gtk/about.c:732 src/gtk/about.c:735 src/main.c:2716 src/main.c:2719
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Gestart: %s\n"
 
-#: src/gtk/about.c:742 src/main.c:2725
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Inkomend verkeer\n"
 
-#: src/gtk/about.c:745 src/main.c:2728
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Ontvangen berichten: %d\n"
 
-#: src/gtk/about.c:752 src/main.c:2734
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Uitgaand verkeer\n"
 
-#: src/gtk/about.c:755 src/main.c:2737
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nieuwe/doorverwezen berichten: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2741
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Beantwoorde berichten: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2745
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Doorgestuurde berichten: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2749
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totaal uitgaande berichten: %d\n"
 
-#: src/gtk/about.c:797
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "Over Claws Mail"
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Auteurs"
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "_Kenmerken"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Licentie"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "_Opmerkingen bij deze uitgave"
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "_Statistieken"
 
-#: src/gtk/colorlabel.c:37 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
 msgid "Red"
 msgstr "Rood"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
 msgid "Pink"
 msgstr "Roze"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
 msgid "Sky blue"
 msgstr "Hemelsblauw"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
 msgid "Green"
 msgstr "Groen"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
 msgid "Brown"
 msgstr "Bruin"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
 msgid "Grey"
 msgstr "Grijs"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
 msgid "Light brown"
 msgstr "Lichtbruin"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
 msgid "Dark red"
 msgstr "Donkerrood"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
 msgid "Dark pink"
 msgstr "Donkerroze"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
 msgid "Steel blue"
 msgstr "Staalblauw"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
 msgid "Gold"
 msgstr "Goud"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
 msgid "Bright green"
 msgstr "Heldergroen"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:229
+#: src/gtk/foldersort.c:230
 msgid "Set mailbox order"
 msgstr "Bepaal postvakvolgorde"
 
-#: src/gtk/foldersort.c:265
+#: src/gtk/foldersort.c:266
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Versleep postvakken naar boven of beneden om de sorteervolgorde in de "
 "mappenboom te veranderen."
 
-#: src/gtk/foldersort.c:299
+#: src/gtk/foldersort.c:300
 msgid "Mailboxes"
 msgstr "Postvakken"
 
+#: src/gtk/foldersort.c:316
+msgid "Move the selected mailbox up"
+msgstr "Verplaats het geselecteerde postvak naar boven"
+
+#: src/gtk/foldersort.c:322
+msgid "Move the selected mailbox down"
+msgstr "Verplaats het geselecteerde postvak naar onderen"
+
 #: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr "Geen woordenboek ingesteld."
@@ -4556,16 +4735,16 @@ msgstr "Kon woordenboek %s niet initialiseren:"
 msgid "No misspelled word found."
 msgstr "Geen onjuist gespelde woorden gevonden."
 
-#: src/gtk/gtkaspell.c:1445
+#: src/gtk/gtkaspell.c:1443
 msgid "Replace unknown word"
 msgstr "Vervang onbekend woord"
 
-#: src/gtk/gtkaspell.c:1461
+#: src/gtk/gtkaspell.c:1459
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Vervang \"%s\" met: "
 
-#: src/gtk/gtkaspell.c:1505
+#: src/gtk/gtkaspell.c:1504
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4573,55 +4752,55 @@ msgstr ""
 "Houd Control ingedrukt en druk op Enter\n"
 "om woord te leren.\n"
 
-#: src/gtk/gtkaspell.c:1806 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1801 src/gtk/gtkaspell.c:1938
 msgid "More..."
 msgstr "Verder..."
 
-#: src/gtk/gtkaspell.c:1862
+#: src/gtk/gtkaspell.c:1857
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" onbekend in woordenboek '%s'"
 
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1872
 msgid "Accept in this session"
 msgstr "Accepteren in deze sessie"
 
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1882
 msgid "Add to personal dictionary"
 msgstr "Toevoegen aan persoonlijk woordenboek"
 
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1892
 msgid "Replace with..."
 msgstr "Vervangen door..."
 
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1905
 #, c-format
 msgid "Check with %s"
 msgstr "Controleren met %s"
 
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1927
 msgid "(no suggestions)"
 msgstr "(geen suggesties)"
 
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2001
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Woordenboek: %s"
 
-#: src/gtk/gtkaspell.c:2020
+#: src/gtk/gtkaspell.c:2015
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Gebruik andere (%s)"
 
-#: src/gtk/gtkaspell.c:2031
+#: src/gtk/gtkaspell.c:2026
 msgid "Use both dictionaries"
 msgstr "Gebruik beide woordenlijsten"
 
-#: src/gtk/gtkaspell.c:2047 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2042 src/prefs_spelling.c:130
 msgid "Check while typing"
 msgstr "Controleer tijdens typen"
 
-#: src/gtk/gtkaspell.c:2129
+#: src/gtk/gtkaspell.c:2124
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4630,7 +4809,7 @@ msgstr ""
 "De spellingcontrole kon de woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2185
+#: src/gtk/gtkaspell.c:2180
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4639,94 +4818,26 @@ msgstr ""
 "De spellingcontrole kon de alternatieve woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:66 src/gtk/quicksearch.c:991 src/gtk/quicksearch.c:1020
-msgid "_Information"
-msgstr "_Informatie"
-
-#: src/gtk/gtkutils.c:67 src/mimeview.c:221
-msgid "_Open"
-msgstr "_Openen"
-
-#: src/gtk/gtkutils.c:68
-msgid "_Properties"
-msgstr "_Eigenschappen"
-
-#: src/gtk/gtkutils.c:70 src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-msgid "C_lear"
-msgstr "Leeg _Log"
-
-#: src/gtk/gtkutils.c:72
-msgid "D_elete"
-msgstr "V_erwijderen"
-
-#: src/gtk/gtkutils.c:74
-msgid "Find and _Replace"
-msgstr "Zoeken en _vervangen"
-
-#: src/gtk/gtkutils.c:78
-msgid "_Bottom"
-msgstr "_Onderaan"
-
-#: src/gtk/gtkutils.c:79
-msgid "_Down"
-msgstr "Naar b_eneden"
-
-#: src/gtk/gtkutils.c:80 src/wizard.c:1812
-msgid "_Next"
-msgstr "Vo_lgende"
-
-#: src/gtk/gtkutils.c:81 src/wizard.c:1811
-msgid "_Previous"
-msgstr "Vo_rige"
-
-#: src/gtk/gtkutils.c:82
-msgid "_Top"
-msgstr "_Bovenaan"
-
-#: src/gtk/gtkutils.c:83
-msgid "_Up"
-msgstr "Naar bo_ven"
-
-#: src/gtk/gtkutils.c:84 src/mainwindow.c:681
-msgid "Help"
-msgstr "Help"
-
-#: src/gtk/gtkutils.c:85
-msgid "_Add"
-msgstr "Toe_voegen"
-
-#: src/gtk/gtkutils.c:87
-msgid "_Stop"
-msgstr "_Stop"
-
-#: src/gtk/gtkutils.c:88
-msgid "_Execute"
-msgstr "_Uitvoeren"
-
-#: src/gtk/gtkutils.c:89
-msgid "_Refresh"
-msgstr "V_erversen"
-
-#: src/gtk/gtkutils.c:1882
+#: src/gtk/gtkutils.c:1743
 msgid "Failed: no service record found."
 msgstr "Mislukt: geen service ingang gevonden."
 
-#: src/gtk/gtkutils.c:1885
+#: src/gtk/gtkutils.c:1746
 msgid "Failed: network error."
 msgstr "Mislukt: netwerkfout."
 
-#: src/gtk/gtkutils.c:1888
+#: src/gtk/gtkutils.c:1749
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Mislukt: onbekende fout (%d)."
 
-#: src/gtk/gtkutils.c:1958
+#: src/gtk/gtkutils.c:1819
 msgid "Configuring..."
 msgstr "Instellen..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2212 src/prefs_summaries.c:634
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:466
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Datum"
 
@@ -4734,10 +4845,10 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:853
-#: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2209
-#: src/prefs_summaries.c:636 src/prefs_summary_column.c:81 src/quote_fmt.c:49
-#: src/summaryview.c:464
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: 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/summaryview.c:465
 msgid "From"
 msgstr "Afzender"
 
@@ -4757,15 +4868,15 @@ msgstr "Afzender:"
 msgid "Reply-To"
 msgstr "Antwoord aan"
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:859
-#: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2210
-#: src/prefs_summaries.c:637 src/prefs_summary_column.c:82 src/quote_fmt.c:56
-#: src/summaryview.c:465
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: 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/summaryview.c:466
 msgid "To"
 msgstr "Aan"
 
 #: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
-#: src/prefs_matcher.c:2211 src/quote_fmt.c:57
+#: src/prefs_matcher.c:2217 src/quote_fmt.c:57
 msgid "Cc"
 msgstr "Cc"
 
@@ -4774,7 +4885,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
-#: src/prefs_matcher.c:2213 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:60
 msgid "Message-ID"
 msgstr "Bericht-ID"
 
@@ -4787,7 +4898,7 @@ msgid "In-Reply-To"
 msgstr "In antwoord aan"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
-#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2221 src/quote_fmt.c:59
 msgid "References"
 msgstr "Verwijzingen"
 
@@ -4795,10 +4906,10 @@ msgstr "Verwijzingen"
 msgid "References:"
 msgstr "Verwijzingen:"
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:847
-#: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2208
-#: src/prefs_summaries.c:638 src/prefs_summary_column.c:80 src/quote_fmt.c:55
-#: src/summaryview.c:463
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: 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/summaryview.c:464
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -4807,7 +4918,7 @@ msgstr "Onderwerp"
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
 msgid "Comments"
 msgstr "Opmerkingen"
 
@@ -4896,7 +5007,7 @@ msgid "Received:"
 msgstr "Ontvangen:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
-#: src/prefs_matcher.c:2214 src/quote_fmt.c:58
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
 
@@ -4920,10 +5031,10 @@ msgstr "Gezien"
 msgid "Seen:"
 msgstr "Gezien:"
 
-#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:642
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1031 src/ssl_manager.c:124
-#: src/summaryview.c:2888
+#: 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/summaryview.c:2894
 msgid "Status"
 msgstr "Status"
 
@@ -4967,7 +5078,7 @@ msgstr "Applicatie:"
 msgid "Content-Type"
 msgstr "Inhoud-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:338
 msgid "Content-Type:"
 msgstr "Inhoud-Type:"
 
@@ -4995,7 +5106,7 @@ msgstr "Voorrang"
 msgid "Precedence:"
 msgstr "Voorrang:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -5208,7 +5319,7 @@ msgid "Folder contains marked messages"
 msgstr "Map bevat gemarkeerde berichten"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+msgid "IMAP folder which contains subfolders only"
 msgstr "IMAP-map die alleen submappen bevat"
 
 #: src/gtk/icon_legend.c:92
@@ -5250,7 +5361,7 @@ msgstr "Geef wachtwoord"
 msgid "Remember password for this session"
 msgstr "Onthoud wachtwoord voor deze sessie"
 
-#: src/gtk/inputdialog.c:364 src/gtk/inputdialog.c:411
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:406
 msgid "Remember this"
 msgstr "Onthoud dit"
 
@@ -5309,32 +5420,33 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:776
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:775
 #: src/plugins/address_keeper/address_keeper_prefs.c:280
-#: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
+#: src/plugins/archive/archiver_prefs.c:105
+#: src/plugins/attachwarner/attachwarner_prefs.c:234
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
-#: src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c: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:403
-#: src/plugins/notification/notification_prefs.c:419
-#: src/plugins/notification/notification_prefs.c:438
-#: src/plugins/notification/notification_prefs.c:456
-#: src/plugins/notification/notification_prefs.c:474
-#: src/plugins/notification/notification_prefs.c:492
-#: src/plugins/notification/notification_prefs.c:510
-#: src/plugins/notification/notification_prefs.c:528
+#: 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/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:923
+#: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5346,7 +5458,7 @@ msgstr "_Laden..."
 msgid "_Unload"
 msgstr "_Verwijderen"
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -5367,26 +5479,26 @@ msgstr "Ontlaad de geselecteerde plugins"
 msgid "Loaded plugins"
 msgstr "Plugins geladen"
 
-#: src/gtk/prefswindow.c:503 src/gtk/prefswindow.c:508
-#: src/plugins/archive/archiver_gtk.c:946
+#: 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
 msgid "_Apply"
 msgstr "_Toepassen"
 
-#: src/gtk/prefswindow.c:639
+#: src/gtk/prefswindow.c:647
 msgid "Page Index"
 msgstr "Pagina Inhoudsopgave"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:847
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Verberg"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4035 src/prefs_account.c:4053 src/prefs_account.c:4071
-#: src/prefs_account.c:4089 src/prefs_account.c:4107 src/prefs_account.c:4125
-#: src/prefs_account.c:4143 src/prefs_account.c:4162 src/prefs_account.c:4255
-#: src/prefs_account.c:4273 src/prefs_filtering_action.c:1380
-#: src/prefs_filtering.c:395 src/prefs_filtering.c:1863
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Account"
 
@@ -5612,54 +5724,69 @@ msgstr ""
 "voldoen alvorens ze zichtbaar worden in de berichtenlijst.\n"
 "De volgende speciale tekens kunnen worden gebruikt:"
 
-#: src/gtk/quicksearch.c:587
+#: src/gtk/quicksearch.c:588
 msgid "Something went wrong during search. Please check your logs."
 msgstr "Er ging iets mis tijdens het zoeken. Controleer de logs."
 
-#: src/gtk/quicksearch.c:871
+#: src/gtk/quicksearch.c:872
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Van/Aan/Cc/Onderwerp/Vlag"
 
-#: src/gtk/quicksearch.c:889 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Recursief"
 
-#: src/gtk/quicksearch.c:895
+#: src/gtk/quicksearch.c:896
 msgid "Sticky"
 msgstr "Plakkend"
 
-#: src/gtk/quicksearch.c:901
+#: src/gtk/quicksearch.c:902
 msgid "Type-ahead"
 msgstr "Aanvullen"
 
-#: src/gtk/quicksearch.c:907
+#: src/gtk/quicksearch.c:908
 msgid "Run on select"
 msgstr "Draai bij het selecteren"
 
-#: src/gtk/quicksearch.c:934
+#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
+#: src/gtk/quicksearch.c:1023 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 "Leeg _Log"
+
+#: src/gtk/quicksearch.c:935
 msgid "Clear the current search"
 msgstr "Wis de huidige zoekopdracht"
 
-#: src/gtk/quicksearch.c:944 src/summary_search.c:421
+#: src/gtk/quicksearch.c:945 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Bewerk zoekcriterie"
 
-#: src/gtk/quicksearch.c:953
+#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
+#: src/gtk/quicksearch.c:1021 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/ssl_manager.c:216
+msgid "_Information"
+msgstr "_Informatie"
+
+#: src/gtk/quicksearch.c:954
 msgid "Information about extended symbols"
 msgstr "Informatie over uitgebreide speciale tekens"
 
-#: src/gtk/quicksearch.c:992 src/gtk/quicksearch.c:1021
-#: src/gtk/quicksearch.c:1027
+#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
+#: src/gtk/quicksearch.c:1028
 msgid "E_dit"
 msgstr "_Wijzigen"
 
-#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:302
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:304
 #, c-format
 msgid "Correct%s"
 msgstr "Correct%s"
 
 #: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
-#: src/ssl_manager.c:302 src/ssl_manager.c:306
+#: src/ssl_manager.c:304 src/ssl_manager.c:308
 msgid " (expired)"
 msgstr " (verlopen)"
 
@@ -5701,8 +5828,8 @@ msgstr "Verloopt op: "
 
 #: src/gtk/sslcertwindow.c:373
 #, c-format
-msgid "SSL/TLS certificate for %s"
-msgstr "SSL/TLS-certificaat voor %s"
+msgid "TLS certificate for %s"
+msgstr "TLS-certificaat voor %s"
 
 #: src/gtk/sslcertwindow.c:389
 #, c-format
@@ -5740,12 +5867,12 @@ msgid "_View certificate"
 msgstr "_Bekijk certificaat"
 
 #: src/gtk/sslcertwindow.c:435
-msgid "SSL/TLS certificate is invalid"
-msgstr "SSL/TLS-Certificaat is ongeldig"
+msgid "TLS certificate is invalid"
+msgstr "TLS-Certificaat is ongeldig"
 
 #: src/gtk/sslcertwindow.c:437
-msgid "SSL/TLS certificate is unknown"
-msgstr "SSL/TLS-certificaat is onbekend"
+msgid "TLS certificate is unknown"
+msgstr "TLS-certificaat is onbekend"
 
 #: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:490
 #: src/gtk/sslcertwindow.c:552
@@ -5766,12 +5893,12 @@ msgstr ""
 "%sWil je doorgaan?"
 
 #: src/gtk/sslcertwindow.c:485
-msgid "SSL/TLS certificate is invalid and expired"
-msgstr "SSL/TLS-certificaat is ongeldig en verlopen"
+msgid "TLS certificate is invalid and expired"
+msgstr "TLS-certificaat is ongeldig en verlopen"
 
 #: src/gtk/sslcertwindow.c:487
-msgid "SSL/TLS certificate is expired"
-msgstr "SSL/TLS-certificaat is verlopen"
+msgid "TLS certificate is expired"
+msgstr "TLS-certificaat is verlopen"
 
 #: src/gtk/sslcertwindow.c:490
 msgid "_Accept"
@@ -5799,236 +5926,235 @@ msgid "_View certificates"
 msgstr "_Bekijk certificaten"
 
 #: src/gtk/sslcertwindow.c:548
-msgid "SSL/TLS certificate changed and is invalid"
-msgstr "SSL/TLS-certificaat is veranderd en ongeldig"
+msgid "TLS certificate changed and is invalid"
+msgstr "TLS-certificaat is veranderd en ongeldig"
 
 #: src/gtk/sslcertwindow.c:550
-msgid "SSL/TLS certificate changed"
-msgstr "SSL/TLS-certificaat is veranderd"
+msgid "TLS certificate changed"
+msgstr "TLS-certificaat is veranderd"
 
-#: src/headerview.c:94
+#: src/headerview.c:95
 msgid "Tags:"
 msgstr "Tags:"
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
+#: src/headerview.c:193 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3484
-#: src/summaryview.c:3502 src/summaryview.c:3541
+#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3494
+#: src/summaryview.c:3512 src/summaryview.c:3551
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
+#: src/headerview.c:208 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3553
-#: src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3563
+#: src/summaryview.c:3566
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:100
 msgid "Error:"
 msgstr "Fout:"
 
-#: src/image_viewer.c:316 src/mimeview.c:2672
-#: src/plugins/att_remover/att_remover.c:307
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: src/image_viewer.c:321
+#: src/image_viewer.c:319
 msgid "Filesize:"
 msgstr "Bestandsgrootte:"
 
-#: src/image_viewer.c:366
+#: src/image_viewer.c:364
 msgid "Load Image"
 msgstr "Laad afbeelding"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "IMAP-verbinding verbroken\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-fout op %s:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "geauthenticeerd"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "niet geauthenticeerd"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "bad state (er is iets mis)"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "stream leesfout"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "verwerkingsfout (waarschijnlijk niet-RFC overeenkomende server)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "verbinding geweigerd"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "geheugen-fout"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "fatale fout"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "protocolfout (waarschijnlijk niet-RFC overeenkomend)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "verbinding geweigerd"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "APPEND-fout"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "NOOP-fout"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "LOGOUT-fout"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "CAPABILITY-fout"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "CHECK-fout"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "CLOSE-fout"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "EXPUNGE-fout"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "UID COPY-fout"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "UID COPY-fout"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "CREATE-fout"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "DELETE-fout"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "EXAMINE-fout"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "FETCH-fout"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "UID FETCH-fout"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "LIST-fout"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "LOGIN-fout"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "LSUB-fout"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "RENAME-fout"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "SEARCH-fout"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "UID SEARCH-fout"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "SELECT-fout"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "STATUS-fout"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "STORE-fout"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "UID STORE-fout"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE-fout"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE-fout"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "STARTTLS-fout"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "INVAL-fout"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "EXTENSION-fout"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "SASL-fout"
 
-#: src/imap.c:751
-msgid "SSL/TLS error"
-msgstr "SSL/TLS-fout"
+#: src/imap.c:753
+msgid "TLS error"
+msgstr "TLS-fout"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Onbekende fout [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6040,7 +6166,7 @@ msgstr ""
 "CRAM-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de CRFAM-MD5 SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6052,7 +6178,7 @@ msgstr ""
 "DIGEST-MD5 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de DIGEST-MD5 SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6064,7 +6190,7 @@ msgstr ""
 "CRAM-SHA-1 logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de CRFAM SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6076,7 +6202,7 @@ msgstr ""
 "PLAIN logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de PLAIN SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6088,152 +6214,162 @@ msgstr ""
 "LOGIN logins werken alleen als libetpan gecompileerd is met SASL-"
 "ondersteuning en de LOGIN SASL-plugin geïnstalleerd is."
 
-#: src/imap.c:999
+#: src/imap.c:1008
+msgid ""
+"\n"
+"\n"
+"OAuth2 error. Check and correct your OAuth2 account preferences."
+msgstr ""
+"\n"
+"\n"
+"OAuth2-fout. Controleer en corrigeer de OAuth2 account-voorkeuren."
+
+#: src/imap.c:1014
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s"
 
-#: src/imap.c:1003
+#: src/imap.c:1018
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Verbinding maken met %s mislukt: login geweigerd.%s\n"
 
-#: src/imap.c:1021
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Verbinding maken met %s mislukt"
 
-#: src/imap.c:1028 src/imap.c:1031
+#: src/imap.c:1043 src/imap.c:1046
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP-verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
-#: src/imap.c:4667 src/imap.c:5478
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail heeft netwerktoegang nodig voor toegang tot de IMAP-server."
 
-#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
-"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
-"not available in this build of Claws Mail. \n"
+"This connection is configured to be secured using TLS, but TLS is not "
+"available in this build of Claws Mail. \n"
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
-"Deze verbinding is geconfigureerd om beveiligd te worden met SSL/TLS, maar "
-"SSL/TLS is niet beschikbaar in deze 'build' van Claws Mail. \n"
+"Deze verbinding is geconfigureerd om beveiligd te worden met TLS, maar TLS "
+"is niet beschikbaar in deze 'build' van Claws Mail. \n"
 "\n"
-"Wil je de verbinding met deze server toch maken? De communicatie is dan niet "
+"Wil je toch verbinding maken met deze server? De communicatie is dan niet "
 "beveiligd."
 
-#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Verbinding _hervatten"
 
-#: src/imap.c:1187
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Account '%s': Verbinden met IMAP-server: %s:%d..."
 
-#: src/imap.c:1252
+#: src/imap.c:1267
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Kan geen verbinding maken met de IMAP-server: %s:%d"
 
-#: src/imap.c:1255
+#: src/imap.c:1270
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Kan geen verbinding maken met de IMAP-server: %s:%d\n"
 
-#: src/imap.c:1287 src/imap.c:4157
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "Kan STARTTLS-sessie niet tot stand brengen.\n"
 
-#: src/imap.c:1359
+#: src/imap.c:1374
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kon niet inloggen op IMAP-server %s.\n"
 
-#: src/imap.c:1362
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kon niet inloggen op IMAP-server %s."
 
-#: src/imap.c:1790
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Berichten worden toegevoegd..."
 
-#: src/imap.c:1995 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: src/imap.c:2521
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "Zoeken mislukt vanwege netwerkfout."
 
-#: src/imap.c:2605
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "kan \"verwijderd\" vlaggen niet instellen\n"
 
-#: src/imap.c:2612 src/imap.c:5108
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: src/imap.c:2987
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Zoeken naar niet-geabonneerde mappen in %s..."
 
-#: src/imap.c:2990
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Zoeken naar submappen van %s..."
 
-#: src/imap.c:3278
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "LIST mislukt: kan postvak niet aanmaken\n"
 
-#: src/imap.c:3291
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "kan postvak niet aanmaken\n"
 
-#: src/imap.c:3422
+#: src/imap.c:3439
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan postvak niet hernoemen: %s naar %s\n"
 
-#: src/imap.c:3535
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "kan postvak niet verwijderen\n"
 
-#: src/imap.c:3814
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST mislukt\n"
 
-#: src/imap.c:3899
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Berichten afvlaggen..."
 
-#: src/imap.c:4002
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:4154
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server vereist STARTTLS om in te loggen.\n"
 
-#: src/imap.c:4164
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan 'capabilities' niet verversen.\n"
 
-#: src/imap.c:4169
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6242,20 +6378,20 @@ msgstr ""
 "Verbinden met %s mislukt: de server vereist STARTTLS, maar Claws Mail is "
 "gecompileerd zonder STARTTLS-ondersteuning.\n"
 
-#: src/imap.c:4177
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Inloggen op servers staat uit.\n"
 
-#: src/imap.c:4400
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Berichten worden opgehaald..."
 
-#: src/imap.c:5101
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan \"verwijderd\" vlaggen: %d niet instellen\n"
 
-#: src/imap.c:6136
+#: src/imap.c:6153
 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"
@@ -6307,7 +6443,7 @@ msgstr "_Abonnementen"
 msgid "_Subscribe..."
 msgstr "_Abonneren..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Afmelden..."
 
@@ -6338,22 +6474,22 @@ msgstr ""
 "(wanneer deze submappen en geen e-mail moet bevatten,\n"
 " voeg een `/' toe aan het eind van de naam)"
 
-#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:196
-#: src/plugins/vcalendar/vcal_folder.c:2060
+#: 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
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
-#: src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2061
+#: 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
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:220
-#: src/plugins/vcalendar/vcal_folder.c:2081
+#: 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
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6361,66 +6497,68 @@ msgstr ""
 "De map kon niet worden hernoemd.\n"
 "De nieuwe mapnaam is niet toegestaan."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:373
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Selecteer map om map '%s' heen te verplaatsen"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 msgid "Select folder to copy folder '%s' to"
 msgstr "Selecteer map om map '%s' heen te kopiëren"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
+#: 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
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Alle mappen en berichten in '%s' zullen worden verwijderd. Terughalen is "
-"niet mogelijk.\n"
+"Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
+"Terughalen is niet mogelijk.\n"
+"\n"
 "Wil je werkelijk verwijderen?"
 
-#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:348
-#: src/plugins/rssyl/rssyl_cb_menu.c:172
-#: src/plugins/vcalendar/vcal_folder.c:2014
+#: 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
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:507
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Wil je zoeken naar niet-ingeschreven submappen van '%s'?"
 
-#: src/imap_gtk.c:509
+#: src/imap_gtk.c:510
 msgid "Search recursively"
 msgstr "Zoek recursief"
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:515 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr "Abonnementen"
 
-#: src/imap_gtk.c:515
+#: src/imap_gtk.c:516
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Kies een submap van %s om op te abonneren: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:683
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: src/imap_gtk.c:538 src/imap_gtk.c:540
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr "Allemaal"
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6432,33 +6570,33 @@ msgstr ""
 "Als er nieuwe mappen zijn, gemaakt met een ander programma, gebruik "
 "\"Controleer op nieuwe mappen\" op de postvak-hoofdmap."
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Wil je '%s' toepassen op de %s map?"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr "abonneren"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr "afmelden"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1514 src/prefs_folder_item.c:1542
-#: src/prefs_folder_item.c:1570
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1590 src/prefs_folder_item.c:1618
+#: src/prefs_folder_item.c:1646
 msgid "Apply to subfolders"
 msgstr "Pas toe op submappen"
 
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr "_Abonneren"
 
-#: src/imap_gtk.c:574 src/news_gtk.c:252
+#: src/imap_gtk.c:576 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "_Afmelden"
 
-#: src/import.c:112 src/import.c:203
+#: src/import.c:112 src/import.c:206
 msgid "Import mbox file"
 msgstr "Importeer mbox-bestand"
 
@@ -6470,11 +6608,11 @@ msgstr "Geef het mbox-bestand en de doelmap op."
 msgid "Destination folder:"
 msgstr "Doelmap:"
 
-#: src/import.c:198
+#: src/import.c:201
 msgid "Source mbox filename can't be left empty."
 msgstr "Het bron-mboxbestand mag niet leeg blijven."
 
-#: src/import.c:203
+#: src/import.c:207
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6482,19 +6620,19 @@ msgstr ""
 "Doelmap is niet opgegeven.\n"
 "Mbox-bestand naar de inbox-map importeren?"
 
-#: src/import.c:225
+#: src/import.c:228
 msgid "Can't find the destination folder."
 msgstr "Kan de doelmap niet vinden."
 
-#: src/import.c:230
+#: src/import.c:233
 msgid "Importing mbox file..."
 msgstr "Importeren van mbox-bestand..."
 
-#: src/import.c:252
+#: src/import.c:255
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/import.c:270
+#: src/import.c:273
 msgid "Select folder to import to"
 msgstr "Selecteer map om naar te importeren"
 
@@ -6522,11 +6660,11 @@ msgstr "Naam voor adresboek is verplicht."
 msgid "LDIF file imported successfully."
 msgstr "LDIF-bestand ingelezen."
 
-#: src/importldif.c:465
+#: src/importldif.c:467
 msgid "Select LDIF File"
 msgstr "Selecteer LDIF-bestand"
 
-#: src/importldif.c:549
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
@@ -6534,43 +6672,43 @@ msgstr ""
 "Geef de naam voor het adresboek dat wordt gemaakt van de gegevens in het "
 "LDIF-bestand."
 
-#: src/importldif.c:553
+#: src/importldif.c:555
 msgid "File Name"
 msgstr "Bestandsnaam"
 
-#: src/importldif.c:563
+#: src/importldif.c:565
 msgid "The full file specification of the LDIF file to import."
 msgstr "De volledige bestandsspecificatie van het te importeren LDIF-bestand."
 
-#: src/importldif.c:569
+#: src/importldif.c:571
 msgid "Select the LDIF file to import."
 msgstr "Selecteer het te importeren LDIF-bestand."
 
-#: src/importldif.c:700
+#: src/importldif.c:702
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:705 src/summaryview.c:461
+#: src/importldif.c:707 src/summaryview.c:462
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:711
+#: src/importldif.c:713
 msgid "LDIF Field Name"
 msgstr "Naam van LDIF-veld"
 
-#: src/importldif.c:716
+#: src/importldif.c:718
 msgid "Attribute Name"
 msgstr "Eigenschapnaam"
 
-#: src/importldif.c:734
+#: src/importldif.c:736
 msgid "LDIF Field"
 msgstr "LDIF-veld"
 
-#: src/importldif.c:745
+#: src/importldif.c:747
 msgid "Attribute"
 msgstr "Eigenschap"
 
-#: src/importldif.c:756
+#: src/importldif.c:758
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6588,37 +6726,37 @@ msgstr ""
 "klik ergens in de rij selecteert de rij voor hernoemen en brengt je in het "
 "hernoem-gedeelte onderin het venster."
 
-#: src/importldif.c:772
+#: src/importldif.c:774
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
 "Het LDIF-veld kan als eigenschap, geïmporteerd in het adresboek, een andere "
 "naam krijgen."
 
-#: src/importldif.c:775
+#: src/importldif.c:777
 msgid "Select for Import"
 msgstr "Selecteer voor importeren"
 
-#: src/importldif.c:779
+#: src/importldif.c:781
 msgid "Select the LDIF field for import into the address book."
 msgstr "Selecteer het LDIF-veld dat in het adresboek geïmporteerd moet worden."
 
-#: src/importldif.c:781
+#: src/importldif.c:783
 msgid " Modify "
 msgstr " Wijzigen "
 
-#: src/importldif.c:785
+#: src/importldif.c:787
 msgid "This button will update the list above with the data supplied."
 msgstr "Deze knop zal bovenstaande lijst bijwerken met de geleverde gegevens."
 
-#: src/importldif.c:855
+#: src/importldif.c:857
 msgid "Records Imported:"
 msgstr "Records importeren:"
 
-#: src/importldif.c:887
+#: src/importldif.c:889
 msgid "Import LDIF file into Address Book"
 msgstr "Importeren LDIF-bestand in adresboek"
 
-#: src/importldif.c:925
+#: src/importldif.c:927
 msgid "Proceed"
 msgstr "Ga door"
 
@@ -6650,142 +6788,142 @@ msgstr "Selecteer Pine-bestand"
 msgid "Import Pine file into Address Book"
 msgstr "Importeren Pine-bestand in adresboek"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail heeft netwerktoegang nodig voor het onvangen van e-mail."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s mislukt\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Klaar (%d bericht (%s) ontvangen)"
 msgstr[1] "Klaar (%d berichten (%s) ontvangen)"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Authenticatie mislukt"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:645
-#: src/prefs_summary_column.c:87 src/summaryview.c:2884 src/summaryview.c:6544
+#: 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
 msgid "Locked"
 msgstr "Op slot"
 
-#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Tijdslimiet"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Klaar (%d nieuw bericht)"
 msgstr[1] "Klaar (%d nieuwe berichten)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:865
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:894
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Account '%s': Verbinden met POP3-server: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan geen verbinding maken met POP3-server: %s:%d"
 
-#: src/inc.c:932
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan geen verbinding maken met POP3-server: %s:%d\n"
 
-#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Authenticatie..."
 
-#: src/inc.c:1014
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Berichten ophalen van %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:1064
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Bezig met ophalen (%d bericht (%s) ontvangen)"
 msgstr[1] "Bezig met ophalen (%d berichten (%s) ontvangen)"
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Verbinding maken met %s:%d mislukt."
 
-#: src/inc.c:1237
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail."
 
-#: src/inc.c:1243
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6794,37 +6932,37 @@ msgstr ""
 "Fout bij het verwerken van e-mail:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "De schijf is vol."
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1259
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Socket-fout."
 
-#: src/inc.c:1262
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fout bij verbinding met %s:%d."
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Verbinding gesloten door de server."
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Verbinding met %s:%d gesloten door de server."
 
-#: src/inc.c:1275
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "Postvak zit op slot."
 
-#: src/inc.c:1279
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6833,11 +6971,11 @@ msgstr ""
 "Postvak zit op slot:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6846,7 +6984,7 @@ msgstr ""
 "Authenticatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6854,46 +6992,46 @@ msgstr ""
 "Sessie verlopen. Mogelijk kun je herstellen door de tijdslimiet te verhogen "
 "in Voorkeuren/Diversen/Overige."
 
-#: src/inc.c:1301
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Verbinding met %s:%d niet binnen tijdslimiet tot stand gekomen."
 
-#: src/inc.c:1339
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Het inbedden is afgelast\n"
 
-#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1071
-#: src/plugins/notification/notification_prefs.c:1362
-#: src/plugins/notification/notification_prefs.c:1668
-#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1834
-#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:551
+#: 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
 msgid "seconds"
 msgstr "seconden"
 
-#: src/inc.c:1641 src/inc.c:1651
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: src/inc.c:1644
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uur"
 msgstr[1] "uur"
 
-#: src/inc.c:1656
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sJe werkt nu offline. Toch doorgaan voor %d %s?"
 
-#: src/inc.c:1662
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sJe bent momenteel niet online. Toch doorgaan?"
 
-#: src/inc.c:1669
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "_Eenmalig"
 
@@ -6902,8 +7040,8 @@ msgstr "_Eenmalig"
 msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
 msgstr "LDAP-fout (zoeken): naar eigenschap '%s': %d (%s)\n"
 
-#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
-#: src/ldapupdate.c:1330
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1290
+#: src/ldapupdate.c:1331
 #, c-format
 msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
 msgstr "LDAP-fout (wijzigen): voor DN '%s': %d (%s)\n"
@@ -6926,11 +7064,11 @@ msgstr "LDAP (zoeken): voltooid\n"
 msgid "LDAP error (search): %d (%s)\n"
 msgstr "LDAP-fout (zoeken): %d (%s)\n"
 
-#: src/ldif.c:759
+#: src/ldif.c:763
 msgid "Nick Name"
 msgstr "Bijnaam"
 
-#: src/main.c:251
+#: src/main.c:253
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6939,7 +7077,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: src/main.c:381
+#: src/main.c:383
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6948,7 +7086,7 @@ msgstr ""
 "Er is een configuratiebestand %s gevonden.\n"
 "Wil je dit configuratiebestand overzetten?"
 
-#: src/main.c:383
+#: src/main.c:387
 #, c-format
 msgid ""
 "\n"
@@ -6961,11 +7099,11 @@ msgstr ""
 "Je Sylpheed filterregels kunnen omgezet worden door\n"
 "een script beschikbaar op %s."
 
-#: src/main.c:395
+#: src/main.c:400
 msgid "Keep old configuration"
 msgstr "Oude configuratie behouden"
 
-#: src/main.c:398
+#: src/main.c:403
 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 "
@@ -6975,31 +7113,27 @@ msgstr ""
 "maar kan even duren als je veel IMAP- of Nieuwsgegevens gecached hebt, en "
 "zal wat extra schijfruimte gebruiken."
 
-#: src/main.c:406
+#: src/main.c:411
 msgid "Migration of configuration"
 msgstr "Configuratiebestand overzetten"
 
-#: src/main.c:417
+#: src/main.c:422
 msgid "Copying configuration... This may take a while..."
 msgstr "Configuratiebestand wordt gekopiëerd... Dit kan even duren..."
 
-#: src/main.c:426
+#: src/main.c:431
 msgid "Migration failed!"
 msgstr "Overzetten mislukt."
 
-#: src/main.c:435
+#: src/main.c:440
 msgid "Migrating configuration..."
 msgstr "Configuratiebestand overzetten..."
 
-#: src/main.c:1130
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread niet ondersteund door glib.\n"
-
-#: src/main.c:1150 src/main.c:1154 src/main.c:1158
+#: src/main.c:1194 src/main.c:1198 src/main.c:1202
 msgid "(or older)"
 msgstr "(of ouder)"
 
-#: src/main.c:1499
+#: src/main.c:1540
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -7018,7 +7152,7 @@ msgstr[1] ""
 "instellingen voor meer informatie:\n"
 "%s"
 
-#: src/main.c:1541
+#: src/main.c:1582
 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 "
@@ -7029,7 +7163,7 @@ msgstr ""
 "Gebruik \"Ververs mappenboom\" in het contextmenu van deze map om dit "
 "proberen te repareren."
 
-#: src/main.c:1547
+#: src/main.c:1588
 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 "
@@ -7039,78 +7173,76 @@ msgstr ""
 "laden. Het postvak komt waarschijnlijk van een oude en externe plugin. "
 "Herinstalleer alstublieft deze plugin en probeer het nogmaals."
 
-#: src/main.c:1791
+#: src/main.c:1828
 msgid "Missing filename\n"
 msgstr "Bestandsnaam mist\n"
 
-#: src/main.c:1798
+#: src/main.c:1835
 msgid "Cannot open filename for reading\n"
 msgstr "Kan bestandsnaam niet openen om te lezen\n"
 
-#: src/main.c:1809
+#: src/main.c:1846
 msgid "Malformed header\n"
 msgstr "Vervormde header\n"
 
-#: src/main.c:1816
+#: src/main.c:1853
 msgid "Duplicated 'To:' header\n"
 msgstr "Gedupliceerde 'Aan:' header\n"
 
-#: src/main.c:1827
+#: src/main.c:1864
 msgid "Missing required 'To:' header\n"
 msgstr "Benodigde header 'Aan:' mist\n"
 
-#: src/main.c:1853
+#: src/main.c:1888
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Probeer -h of --help voor het gebruik.\n"
 
-#: src/main.c:1880 src/main.c:1943
+#: src/main.c:1917 src/main.c:1980
 #, c-format
-#| msgid "Missing required information"
 msgid "Missing file argument for option %s"
 msgstr "Benodigd bestand-argument ontbreekt voor optie %s"
 
-#: src/main.c:1902
+#: src/main.c:1939
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Benodigd uri-argument ontbreekt of is leeg voor optie %s"
 
-#: src/main.c:1905
+#: src/main.c:1942
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Benodigd uri-argument ontbreekt voor optie %s"
 
-#: src/main.c:1938
+#: src/main.c:1975
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "Minstens één niet-leeg bestand-argument ontbreekt voor optie %s"
 
-#: src/main.c:2007
+#: src/main.c:2044
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "Benodigde map, type en aanvraag-argumenten ontbreken voor optie %s"
 
-#: src/main.c:2010
+#: src/main.c:2047
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Benodigde type en aanvraag-argumenten ontbreken voor optie %s"
 
-#: src/main.c:2013
+#: src/main.c:2050
 #, c-format
-#| msgid "Missing required information"
 msgid "Missing request argument for option %s"
 msgstr "Benodigd aanvraag-argument ontbreekt voor optie %s"
 
-#: src/main.c:2029
+#: src/main.c:2066
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:2031
+#: src/main.c:2068
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:2032
+#: src/main.c:2069
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -7130,11 +7262,11 @@ msgstr ""
 "                         lege regel, daarna de e-mail-inhoud tot het einde "
 "van het bestand."
 
-#: src/main.c:2037
+#: src/main.c:2074
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe uri      abonneer indien mogelijk op gegeven URI"
 
-#: src/main.c:2038
+#: src/main.c:2075
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7144,7 +7276,7 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden bijgevoegd"
 
-#: src/main.c:2041
+#: src/main.c:2078
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -7154,23 +7286,23 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden ingevoegd"
 
-#: src/main.c:2044
+#: src/main.c:2081
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:2045
+#: src/main.c:2082
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          haal nieuwe berichten op van alle accounts"
 
-#: src/main.c:2046
+#: src/main.c:2083
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuleer het ophalen van berichten"
 
-#: src/main.c:2047
+#: src/main.c:2084
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuleer het verzenden van berichten"
 
-#: src/main.c:2048
+#: src/main.c:2085
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -7188,29 +7320,29 @@ msgstr ""
 "                         aanvraag: zoekstring\n"
 "                         recursief: false als arg. start met 0, n, N, f or F"
 
-#: src/main.c:2055
+#: src/main.c:2092
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verzend alle berichten in de wachtrij"
 
-#: src/main.c:2056
+#: src/main.c:2093
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      geef totaal aantal berichten weer"
 
-#: src/main.c:2057
+#: src/main.c:2094
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [map]... geef status van mappen weer"
 
-#: src/main.c:2059
+#: src/main.c:2096
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           geef statistieken van de sessie weer"
 
-#: src/main.c:2060
+#: src/main.c:2097
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     sessie-statistieken terugzetten"
 
-#: src/main.c:2061
+#: src/main.c:2098
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -7220,51 +7352,45 @@ msgstr ""
 "                         folder is a folder id like 'folder/sub_folder', a "
 "file:// uri or an absolute path"
 
-#: src/main.c:2063
+#: src/main.c:2100
 msgid "  --online               switch to online mode"
 msgstr "  --online               schakel over naar online-modus"
 
-#: src/main.c:2064
+#: src/main.c:2101
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schakel over naar offline-modus"
 
-#: src/main.c:2065
+#: src/main.c:2102
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sluit Claws Mail af"
 
-#: src/main.c:2066
-#| msgid "  --debug                debug mode"
+#: src/main.c:2103
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             foutopsporingsmodus"
 
-#: src/main.c:2067
+#: src/main.c:2104
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         foutopsporingsmodus aan of uit zetten"
 
-#: src/main.c:2068
-#| msgid "  --help -h              display this help and exit"
+#: src/main.c:2105
 msgid "  --help -h              display this help"
 msgstr "  --help -h              geef deze hulp weer"
 
-#: src/main.c:2069
-#| msgid "  --version -v           output version information and exit"
+#: src/main.c:2106
 msgid "  --version -v           output version information"
 msgstr "  --version -v           geef versie-informatie"
 
-#: src/main.c:2070
-#| msgid ""
-#| "  --version-full -V      output version and built-in features information "
-#| "and exit"
+#: src/main.c:2107
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      geef versie-informatie en ingebouwde mogelijkheden"
 
-#: src/main.c:2071
+#: src/main.c:2108
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           print configuratiemap"
 
-#: src/main.c:2072
+#: src/main.c:2109
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7272,10 +7398,7 @@ msgstr ""
 "  --alternate-config-dir directory\n"
 "                         gebruik opgegeven configuratiemap"
 
-#: src/main.c:2074
-#| msgid ""
-#| "  --geometry -geometry WxH+X+Y\n"
-#| "                         set geometry for main window"
+#: src/main.c:2111
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7283,865 +7406,874 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 
-#: src/main.c:2091
+#: src/main.c:2128
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Benodigd map-argument ontbreekt voor optie %s"
 
-#: src/main.c:2099
+#: src/main.c:2136
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Benodigd geometrie-argument ontbreekt voor optie %s"
 
-#: src/main.c:2110
+#: src/main.c:2147
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Benodigd map-argument ontbreekt voor optie %s"
 
-#: src/main.c:2143 src/main.c:2146
+#: src/main.c:2180 src/main.c:2183
 #, c-format
 msgid "Unknown option %s"
 msgstr "Onbekende optie %s"
 
-#: src/main.c:2162
+#: src/main.c:2199
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Verwerken (%s)..."
 
-#: src/main.c:2165
+#: src/main.c:2202
 msgid "top level folder"
 msgstr "map op hoogste niveaux"
 
-#: src/main.c:2247
+#: src/main.c:2284
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:2248
+#: src/main.c:2285
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:3010
+#: src/main.c:3052
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: netwerk is beschikbaar.\n"
 
-#: src/main.c:3016
+#: src/main.c:3058
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: netwerk is niet beschikbaar.\n"
 
-#: src/mainwindow.c:516 src/messageview.c:211
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/mainwindow.c:518 src/messageview.c:213 src/summaryview.c:442
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "Beel_d"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "_Instellingen"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "_Postvak toevoegen"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Verander postvakvolgorde..."
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "_Importeer mbox-bestand..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "_Exporteer naar mbox-bestand..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "E_xporteer selectie naar mbox-bestand..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "Alle prullenbakken _leegmaken"
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Opslaan e-mail als..."
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "Opslaan _deel als..."
 
-#: src/mainwindow.c:543 src/messageview.c:222
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Pagina-instellingen..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "Synchroniseer mappen"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "Af_sluiten"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "_Discussiedraad selecteren"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Zoek in huidige bericht..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "_Snelzoeken"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "_Toon of verberg"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "_Werkbalk"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "In _mappenlijst..."
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "In _berichtenlijst..."
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "_Weergave"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "_Sorteer"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "Ge_lijksoortige onderwerpen bij elkaar"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "Berichtenboom _uitklappen"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "Berichtenboom _inklappen"
 
-#: src/mainwindow.c:579 src/messageview.c:234
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Ga naar"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Vorige bericht"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "V_olgende bericht"
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Volgende o_ngelezen bericht"
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Vo_rige nieuwe bericht"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Volge_nde nieuwe bericht"
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Vorige ge_markeerde bericht"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Volgende gem_arkeerde bericht"
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Vorige bericht met _label"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Volgende bericht met l_abel"
 
-#: src/mainwindow.c:595 src/messageview.c:250
-msgid "Previous opened message"
+#: src/mainwindow.c:594
+msgid "Previously opened message"
 msgstr "Vorige geopende bericht"
 
-#: src/mainwindow.c:596 src/messageview.c:251
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Volgende geopende bericht"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Bovenliggende bericht"
 
-#: src/mainwindow.c:600 src/messageview.c:255
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Volgende _ongelezen bericht"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "_Map..."
 
-#: src/mainwindow.c:603 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Volgende deel"
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Vorige deel"
 
-#: src/mainwindow.c:607 src/messageview.c:260
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Berichten schuiven"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Vorige regel"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Volgende regel"
 
-#: src/mainwindow.c:610 src/messageview.c:263 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Vorige pagina"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Volgende pagina"
 
-#: src/mainwindow.c:629 src/messageview.c:282
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Decodeer"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "_Nieuw venster"
 
-#: src/mainwindow.c:637 src/messageview.c:289
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Br_on weergeven"
 
-#: src/mainwindow.c:639 src/messageview.c:290
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Berichtendeel"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Als tekst weergeven"
 
-#: src/mainwindow.c:641 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Openen"
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Openen met..."
 
-#: src/mainwindow.c:647 src/messageview.c:297
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citaten"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "Berichtenlijst v_erversen"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "Ont_vangen"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Ophalen van _huidige account"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Ophalen van _alle accounts"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "Ophalen ann_uleren"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "Verzend berichten uit de _wachtrij"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "Nieuw _e-mailbericht opstellen"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "Nieuw _Nieuwsbericht opstellen"
 
-#: src/mainwindow.c:666 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:97 src/summaryview.c:426
+#: src/mainwindow.c:665 src/messageview.c:304
+#: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: src/mainwindow.c:667 src/messageview.c:304 src/summaryview.c:427
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Be_antwoord"
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/summaryview.c:430
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "Mailing-_lijst"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "Beantwoorden en _opvolgen"
 
-#: src/mainwindow.c:674 src/messageview.c:310 src/summaryview.c:432
-#: src/toolbar.c:2449
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
+#: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
-#: src/toolbar.c:2450
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
+#: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Doorsturen als bijlage"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
-#: src/toolbar.c:2451
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
+#: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Herverwi_jzen"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "Mailing-_Lijst"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Plaatsen"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:680
+msgid "Help"
+msgstr "Help"
+
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "Bekijk archief"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "Contact eigenaar"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "Ver_plaatsen..."
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "K_opiëren..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Naar _prullenbak"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "Ver_wijderen..."
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Draad naar _prullenbak"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "_Verwijder draad"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Trek nieuwsartikel in"
 
-#: src/mainwindow.c:702 src/mainwindow.c:703 src/summaryview.c:435
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "_Markeren"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "_Demarkeren"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Markeer _gelezen"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Markeer _ongelezen"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Markeer alles gelezen in map"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Markeer alles ongelezen in map"
 
-#: src/mainwindow.c:713 src/prefs_filtering_action.c:191 src/toolbar.c:242
-#: src/toolbar.c:503
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Draad negeren"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Draad niet meer negeren"
 
-#: src/mainwindow.c:715 src/prefs_filtering_action.c:192 src/toolbar.c:243
-#: src/toolbar.c:504
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Volg draad"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Volg draad niet meer"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Markeer als _spam"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Markeer als _ham"
 
-#: src/mainwindow.c:723 src/prefs_filtering_action.c:175 src/toolbar.c:507
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Op slot"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:176 src/toolbar.c:508
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Van slot"
 
-#: src/mainwindow.c:726 src/summaryview.c:436
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "_Kleurlabel"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "Ta_gs"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "_Wijzigen"
 
-#: src/mainwindow.c:733 src/messageview.c:313 src/mimeview.c:1051
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Verifieer ondertekening"
 
-#: src/mainwindow.c:738 src/messageview.c:317
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "A_fzender toevoegen aan adresboek"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "_Verzamel adressen"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Van huidige _map..."
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Van geselecteerde _berichten..."
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "Alle berichten _filteren"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "Selectie _filteren"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "_Verwerkingsregels draaien voor map"
 
-#: src/mainwindow.c:749 src/messageview.c:320
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
+#: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:751 src/mainwindow.c:757 src/mainwindow.c:864
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
+#: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "A_fzender"
 
-#: src/mainwindow.c:752 src/mainwindow.c:758 src/mainwindow.c:865
-#: src/messageview.c:323 src/messageview.c:329
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
+#: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Aan"
 
-#: src/mainwindow.c:753 src/mainwindow.c:759 src/messageview.c:324
-#: src/messageview.c:330
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
+#: src/messageview.c:332
 msgid "By _Subject"
 msgstr "_Onderwerp"
 
-#: src/mainwindow.c:755 src/messageview.c:326 src/summaryview.c:440
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
+#: src/messageview.c:333
+msgid "By S_ender"
+msgstr "Door _afzender"
+
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Verwerkingsregel aanmaken"
 
-#: src/mainwindow.c:762 src/messageview.c:333
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Geef _URLs weer..."
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten"
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Verwijder _dubbele berichten"
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "In geselecteerde map"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "In alle mappen"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "_Uitvoeren"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "_Weggooien"
 
-#: src/mainwindow.c:779
-msgid "SSL/TLS cer_tificates"
-msgstr "SSL/TLS-cer_tificaten"
+#: src/mainwindow.c:780
+msgid "TLS cer_tificates"
+msgstr "TLS-cer_tificaten"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Filterlo_g"
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Netwerk_log"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Foutopsporings_logboek"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "_Vergeet alle wachtwoorden van de sessie"
 
-#: src/mainwindow.c:790
-msgid "Forget _master passphrase"
+#: src/mainwindow.c:791
+msgid "Forget _primary passphrase"
 msgstr "Vergeet _hoofdwachtwoord"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "_Huidig account veranderen"
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "V_oorkeuren huidig account..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "_Nieuw account aanmaken..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "Account_beheer..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "_Voorkeuren..."
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "_Voorverwerken..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "_Naverwerken..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Filteren..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "_Sjablonen..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Acties..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "Tag_s..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "Plu_gins..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Handboek"
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "_Online FAQ met bijdragen van gebruikers"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "Pictogram_legenda"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Instellen als standaard mailprogramma"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "_Werk offline"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Men_ubalk"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "_Berichtweergave"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "_Statusbalk"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Kolomkoppen"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "Toon berichtenlijst in _boomvorm"
 
-#: src/mainwindow.c:831 src/prefs_summaries.c:667
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Gelezen draden verbergen"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "Gelezen berichten _verbergen"
 
-#: src/mainwindow.c:833 src/prefs_summaries.c:673
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Verberg verwijderde berichten"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "_Volledig venster"
 
-#: src/mainwindow.c:835 src/messageview.c:345
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Vo_lledige header weergeven"
 
-#: src/mainwindow.c:836 src/messageview.c:346
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Alles _opvouwen"
 
-#: src/mainwindow.c:837 src/messageview.c:347
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Opvouwen vanaf niveau _2"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Opvouwen vanaf niveau _3"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Tekst _onder pictogrammen"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Tekst _naast pictogrammen"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Alleen _pictogrammen"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Alleen _tekst"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "_Standaard"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "3 _Kolommen"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "_Hele bericht"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "_Brede berichtenlijst"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "K_lein venster"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "Volgens _nummer"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "Volgens _grootte"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "Op _datum"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Volgens datum van draad"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Volgens _onderwerp"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "Volgens _kleurlabel"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Volgens tag"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "Volgens _markering"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "Volgens _status"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "Volgens _bijlage"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Volgens sc_ore"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Volgens op slot"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "Ni_et sorteren"
 
-#: src/mainwindow.c:878 src/prefs_summaries.c:654
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:655
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Aflopend"
 
-#: src/mainwindow.c:921 src/messageview.c:390
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Automatisch detecteren"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6472
-msgid "Apply tags..."
-msgstr "Tags toepassen..."
+#: src/mainwindow.c:1297 src/summaryview.c:6489
+msgid "Modify tags..."
+msgstr "Tags wijzigen..."
 
-#: src/mainwindow.c:1940
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Fout(en) voorgekomen. Klik hier om het log te zien."
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Je bent online. Klik op het pictogram om offline te gaan"
 
-#: src/mainwindow.c:1962
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "Je bent offline. Klik op het pictogram om online te gaan"
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Selecteer account"
 
-#: src/mainwindow.c:2003 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Netwerklog"
 
-#: src/mainwindow.c:2007
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Filteren/Verwerken foutopsporingslogboek"
 
-#: src/mainwindow.c:2026 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "filterlog staat aan\n"
 
-#: src/mainwindow.c:2028 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "filterlog staat uit\n"
 
-#: src/mainwindow.c:2449 src/mainwindow.c:2456 src/mainwindow.c:2499
-#: src/mainwindow.c:2532 src/mainwindow.c:2564 src/mainwindow.c:2609
+#: 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:1075
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: src/mainwindow.c:2610 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:2867 src/mainwindow.c:2872
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten in de prullenbakken weggooien?"
 
-#: src/mainwindow.c:2868
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "Niet afsluiten"
 
-#: src/mainwindow.c:2899 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Postvak toevoegen"
 
-#: src/mainwindow.c:2900
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8155,18 +8287,18 @@ msgstr ""
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Het postvak '%s' bestaat al."
 
-#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
-#: src/wizard.c:742
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Postvak"
 
-#: src/mainwindow.c:2918 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8176,58 +8308,58 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen rechten om er te "
 "schrijven."
 
-#: src/mainwindow.c:3385
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Versturen niet toegestaan"
 
-#: src/mainwindow.c:3940
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Fout bij importeren mbox-bestand."
 
-#: src/mainwindow.c:3949 src/mainwindow.c:3958
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Exporteren naar mbox-bestand mislukt."
 
-#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail afsluiten?"
 
-#: src/mainwindow.c:4000
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: src/mainwindow.c:4200
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Map synchronisatie"
 
-#: src/mainwindow.c:4201
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Wil je alle mappen nu synchroniseren?"
 
-#: src/mainwindow.c:4202
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Synchroniseren"
 
-#: src/mainwindow.c:4680
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Dubbele berichten worden verwijderd..."
 
-#: src/mainwindow.c:4690
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Geen dubbel bericht gevonden in geselecteerde map.\n"
 
-#: src/mainwindow.c:4696
+#: src/mainwindow.c:4709
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "%d dubbel bericht verwijderd in geselecteerde map.\n"
 msgstr[1] "%d dubbele berichten verwijderd in geselecteerde map.\n"
 
-#: src/mainwindow.c:4700
+#: src/mainwindow.c:4713
 #, 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"
@@ -8236,117 +8368,117 @@ msgstr[0] ""
 msgstr[1] ""
 "%d dubbele berichten gemarkeerd voor verwijderen in geselecteerde map.\n"
 
-#: src/mainwindow.c:4738
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Dubbele berichten worden verwijderd in alle mappen..."
 
-#: src/mainwindow.c:4744
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d dubbel bericht verwijderd in %d mappen.\n"
 msgstr[1] "%d dubbele berichten verwijderd in %d mappen.\n"
 
-#: src/mainwindow.c:4749
+#: src/mainwindow.c:4762
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Geen dubbel bericht gevonden in %d mappen.\n"
 
-#: src/mainwindow.c:4911 src/messageview.c:2631
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Selecteer map om heen te gaan"
 
-#: src/mainwindow.c:5012 src/summaryview.c:5913
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Verwerkingsregels toepassen voor mapregels"
 
-#: src/mainwindow.c:5020
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Verwerkingsregels toepassen na mapregels"
 
-#: src/mainwindow.c:5028 src/summaryview.c:5924
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Filters instellen"
 
-#: src/mainwindow.c:5143
+#: src/mainwindow.c:5156
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om het "
 "uitvoerpad te vinden."
 
-#: src/mainwindow.c:5202
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail is geregistreerd als standaard mailprogramma."
 
-#: src/mainwindow.c:5204
+#: src/mainwindow.c:5249
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Kan niet registreren als standaard mailprogramma: niet mogelijk om te "
 "schrijven naar het register."
 
-#: src/mainwindow.c:5218 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Map wordt ingelezen %s%c%s..."
 
-#: src/mainwindow.c:5362
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "%d Vergeten wachtwoord van %d accounts.\n"
 msgstr[1] "%d Vergeten wachtwoorden van %d accounts.\n"
 
-#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
-#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
+#: 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
 #, c-format
 msgid "%s header"
 msgstr "%s header"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header"
 msgstr "header"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "header line"
 msgstr "header-regel"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "body line"
 msgstr "inhoud-regel"
 
-#: src/matcher.c:228
+#: src/matcher.c:227
 msgid "tag"
 msgstr "tag"
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "Hoofd / kleine letters onderscheiden"
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 msgid "Case insensitive"
 msgstr "Hoofd / kleine letters niet onderscheiden"
 
-#: src/matcher.c:1903
+#: src/matcher.c:1902
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "controleren of bericht overeenkomt met [ %s ]\n"
 
-#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
+#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
 msgid "message matches\n"
 msgstr "bericht komt overeen\n"
 
-#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
+#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
 msgid "message does not match\n"
 msgstr "bericht komt niet overeen\n"
 
-#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
-#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
+#: 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
 msgid "(none)"
 msgstr "(geen)"
 
-#: src/mbox.c:98
+#: src/mbox.c:94
 #, c-format
 msgid ""
 "Could not stat mbox file:\n"
@@ -8355,7 +8487,7 @@ msgstr ""
 "Kon mbox-bestand niet vinden:\n"
 "%s\n"
 
-#: src/mbox.c:104
+#: src/mbox.c:100
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -8364,26 +8496,26 @@ msgstr ""
 "Kon mbox-bestand niet openen:\n"
 "%s\n"
 
-#: src/mbox.c:142
+#: src/mbox.c:138
 #, c-format
 msgid "Importing from mbox... (%ld MB imported)"
 msgid_plural "Importing from mbox... (%ld MB imported)"
 msgstr[0] "Importeren van mbox... (%ld MB geïmporteerd)"
 msgstr[1] "Importeren van mbox... (%ld MB geïmporteerd)"
 
-#: src/mbox.c:550
+#: src/mbox.c:547
 msgid "Overwrite mbox file"
 msgstr "Mbox-bestand overschrijven"
 
-#: src/mbox.c:551
+#: src/mbox.c:548
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Dit bestand bestaat reeds. Wil je het overschrijven?"
 
-#: src/mbox.c:552 src/mimeview.c:1905 src/prefs_themes.c:596
+#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: src/mbox.c:561
+#: src/mbox.c:558
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -8392,7 +8524,7 @@ msgstr ""
 "Kon mbox-bestand niet aanmaken:\n"
 "%s\n"
 
-#: src/mbox.c:565
+#: src/mbox.c:562
 msgid "Exporting to mbox..."
 msgstr "Bezig met exporteren naar mbox-bestand..."
 
@@ -8420,23 +8552,27 @@ msgstr "Begin van bericht bereikt, verdergaan vanaf het einde?"
 msgid "End of message reached; continue from beginning?"
 msgstr "Einde van bericht bereikt, verdergaan vanaf het begin?"
 
-#: src/message_search.c:334 src/summary_search.c:795
+#: src/message_search.c:334 src/summary_search.c:796
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:300 src/textview.c:225
+#: src/messageview.c:251
+msgid "Previous opened message"
+msgstr "Vorige geopende bericht"
+
+#: src/messageview.c:301 src/textview.c:248
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/messageview.c:711 src/messageview.c:1433 src/messageview.c:1584
+#: src/messageview.c:717 src/messageview.c:1442 src/messageview.c:1593
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Berichtenvenster"
 
-#: src/messageview.c:842
+#: src/messageview.c:848
 msgid "<No Return-Path found>"
 msgstr "<Geen Return-Path gevonden>"
 
-#: src/messageview.c:849
+#: src/messageview.c:855
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8451,36 +8587,36 @@ msgstr ""
 "Return path: %s\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:856
+#: src/messageview.c:862
 msgid "_Don't Send"
 msgstr "_Niet versturen"
 
-#: src/messageview.c:1363
+#: src/messageview.c:1372
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Ophalen van bericht (%s)..."
 
-#: src/messageview.c:1399 src/procmime.c:996
+#: src/messageview.c:1408 src/procmime.c:1026
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Decoderen mislukt: %s"
 
-#: src/messageview.c:1480 src/messageview.c:1488
+#: src/messageview.c:1489 src/messageview.c:1497
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 "Bericht is niet conform de MIME-standaard. Het zou verkeerd weergegeven "
 "kunnen worden."
 
-#: src/messageview.c:1865
+#: src/messageview.c:1881
 #, c-format
 msgid "Show all %s."
 msgstr "Geef alle %s weer."
 
-#: src/messageview.c:1867
+#: src/messageview.c:1883
 msgid "Only the first megabyte of text is shown."
 msgstr "Alleen de eerste megabyte tekst is weergegeven."
 
-#: src/messageview.c:1898
+#: src/messageview.c:1914
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8488,19 +8624,19 @@ msgstr ""
 "Je kreeg een ontvangstbevestiging in dit bericht: het is gezien door de "
 "ontvanger."
 
-#: src/messageview.c:1901
+#: src/messageview.c:1917
 msgid "You asked for a return receipt in this message."
 msgstr "Je hebt om een ontvangstbevestiging gevraagd voor dit bericht."
 
-#: src/messageview.c:1907
+#: src/messageview.c:1923
 msgid "This message asks for a return receipt."
 msgstr "Dit bericht vraagt om een ontvangstbevestiging."
 
-#: src/messageview.c:1908
+#: src/messageview.c:1924
 msgid "Send receipt"
 msgstr "Ontvangstbevestiging versturen"
 
-#: src/messageview.c:1951
+#: src/messageview.c:1967
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8508,7 +8644,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "en is verwijderd van de server."
 
-#: src/messageview.c:1957
+#: src/messageview.c:1973
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8517,15 +8653,15 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s."
 
-#: src/messageview.c:1961 src/messageview.c:1983
+#: src/messageview.c:1977 src/messageview.c:1999
 msgid "Mark for download"
 msgstr "Markeer voor ophalen"
 
-#: src/messageview.c:1962 src/messageview.c:1974
+#: src/messageview.c:1978 src/messageview.c:1990
 msgid "Mark for deletion"
 msgstr "Gemarkeerd om te verwijderen"
 
-#: src/messageview.c:1967
+#: src/messageview.c:1983
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8534,12 +8670,12 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden opgehaald."
 
-#: src/messageview.c:1972 src/messageview.c:1985
-#: src/prefs_filtering_action.c:174 src/toolbar.c:506
+#: src/messageview.c:1988 src/messageview.c:2001
+#: src/prefs_filtering_action.c:174 src/toolbar.c:516
 msgid "Unmark"
 msgstr "Demarkeer"
 
-#: src/messageview.c:1978
+#: src/messageview.c:1994
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8548,7 +8684,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden verwijderd."
 
-#: src/messageview.c:2055
+#: src/messageview.c:2071
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8562,15 +8698,15 @@ msgstr ""
 "officieel aan je gericht.\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:2063 src/messageview.c:2071
+#: src/messageview.c:2079 src/messageview.c:2086
 msgid "Return Receipt Notification"
 msgstr "Verstuur ontvangstbevestiging"
 
-#: src/messageview.c:2065 src/messageview.c:2076
+#: src/messageview.c:2080 src/messageview.c:2091
 msgid "_Send Notification"
 msgstr "Ver_stuur melding"
 
-#: src/messageview.c:2072
+#: src/messageview.c:2087
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8581,11 +8717,11 @@ msgstr ""
 "gebruiken.\n"
 "Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
-#: src/messageview.c:2168 src/messageview.c:2187
+#: src/messageview.c:2183 src/messageview.c:2202
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan niet afdrukken: het bericht bevat geen tekst."
 
-#: src/messageview.c:2941
+#: src/messageview.c:2958
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8593,7 +8729,7 @@ msgstr ""
 "\n"
 " Er zijn geen berichten in deze map"
 
-#: src/messageview.c:2949
+#: src/messageview.c:2966
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8601,7 +8737,7 @@ msgstr ""
 "\n"
 " Bericht is verwijderd"
 
-#: src/messageview.c:2950
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8609,8 +8745,8 @@ msgstr ""
 "\n"
 "  Bericht is verplaatst naar de prullenbak of naar een andere map"
 
-#: src/messageview.c:2983 src/messageview.c:2989 src/summaryview.c:4394
-#: src/summaryview.c:7271
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "Er is een fout opgetreden tijdens het leren.\n"
 
@@ -8618,7 +8754,7 @@ msgstr "Er is een fout opgetreden tijdens het leren.\n"
 msgid "Moving messages..."
 msgstr "Berichten worden verplaatst..."
 
-#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:836
 msgid "Deleting messages..."
 msgstr "Berichten worden verwijderd..."
 
@@ -8626,7 +8762,7 @@ msgstr "Berichten worden verwijderd..."
 msgid "Remove _mailbox..."
 msgstr "Verwijder _postvak..."
 
-#: src/mh_gtk.c:222
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8637,7 +8773,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:299
+#: src/mh_gtk.c:373 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8646,10 +8782,14 @@ msgstr ""
 "Wil je het postvak '%s' werkelijk verwijderen?\n"
 "(De berichten zullen niet van de schijf worden verwijderd)"
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr "Verwijder postvak"
 
+#: src/mimeview.c:221 src/prefs_actions.c:1315
+msgid "_Open"
+msgstr "_Openen"
+
 #: src/mimeview.c:223
 msgid "Open _with..."
 msgstr "Openen met..."
@@ -8678,21 +8818,21 @@ msgstr "_Alles op_slaan..."
 msgid "MIME Type"
 msgstr "MIME-Type"
 
-#: src/mimeview.c:1056 src/mimeview.c:1061 src/mimeview.c:1066
-#: src/mimeview.c:1071
+#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
+#: src/mimeview.c:1072
 msgid "View full information"
 msgstr "Bekijk volledige informatie"
 
-#: src/mimeview.c:1077
+#: src/mimeview.c:1079
 msgid "Check again"
 msgstr "Opnieuw controleren"
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1092
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klik het pictogram om te controleren."
 
-#: src/mimeview.c:1091
+#: src/mimeview.c:1094
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s Klik het pictogram of klik op '%s' om te controleren."
@@ -8711,88 +8851,101 @@ msgstr ""
 "Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
 "pictogram of klik op '%s' om het opnieuw te proberen."
 
-#: src/mimeview.c:1348
+#: src/mimeview.c:1110
+msgid "Error checking the signature. Click the icon to try again."
+msgstr ""
+"Controleren van ondertekening niet gelukt. Klik op het pictogram om het "
+"opnieuw te proberen."
+
+#: src/mimeview.c:1112
+#, c-format
+msgid "Error checking the signature. Click the icon or hit '%s' to try again."
+msgstr ""
+"Controleren van ondertekening niet gelukt. Klik op het pictogram of klik op "
+"'%s' om het opnieuw te proberen."
+
+#: src/mimeview.c:1231
 msgid "Checking signature..."
 msgstr "Ondertekening wordt geverifieerd..."
 
-#: src/mimeview.c:1389
+#: src/mimeview.c:1286
 msgid "Go back to email"
 msgstr "Ga terug naar bericht"
 
-#: src/mimeview.c:1823 src/mimeview.c:1915 src/mimeview.c:2157
-#: src/mimeview.c:2193 src/mimeview.c:2305 src/plugins/fancy/fancy_viewer.c:501
-#: src/plugins/fancy/fancy_viewer.c:530
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan het deel van een meerdelig bericht niet opslaan: %s"
 
-#: src/mimeview.c:1902
+#: src/mimeview.c:1815
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Bestaand bestand '%s' overschrijven?"
 
-#: src/mimeview.c:1926
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"An error has occurred while saving message part %d. Do you want to cancel "
+"saving or ignore error and continue?"
 msgstr ""
-"Er kwam een fout voor tijdens het opslaan van berichtdeel #%d. Wil je de "
-"handeling stoppen of de fout overslaan en doorgaan?"
+"Er kwam een fout voor tijdens het opslaan van berichtdeel #%d. Wil je het "
+"opslaan annuleren of de fout overslaan en doorgaan?"
 
-#: src/mimeview.c:1929
-msgid "Error saving all message parts"
-msgstr "Fout bij opslaan van alle berichtdelen"
+#: src/mimeview.c:1843
+msgid "Error saving message part"
+msgstr "Fout bij opslaan van berichtdeel"
 
-#: src/mimeview.c:1930
-msgid "Skip"
-msgstr "Overslaan"
+#: src/mimeview.c:1844
+msgid "Ignore"
+msgstr "Negeren"
 
-#: src/mimeview.c:1930
-msgid "Skip all"
-msgstr "Alles overslaan"
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "Alles negeren"
 
-#: src/mimeview.c:1940
+#: src/mimeview.c:1856
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "%d bestand opgeslagen."
 msgstr[1] "%d bestanden opgeslagen."
 
-#: src/mimeview.c:1948
+#: src/mimeview.c:1868
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "%d bestand opgeslagen"
 msgstr[1] "%d bestanden opgeslagen"
 
-#: src/mimeview.c:1953
+#: src/mimeview.c:1873
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d bestand mislukt."
 msgstr[1] "%s, %d bestanden mislukt."
 
-#: src/mimeview.c:1986 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Selecteer doelmap"
 
-#: src/mimeview.c:1993 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' is geen map."
 
-#: src/mimeview.c:2110 src/plugins/fancy/fancy_viewer.c:800
-#: src/summaryview.c:5006
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
+#: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: src/mimeview.c:2240 src/mimeview.c:2247
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Open met"
 
-#: src/mimeview.c:2241 src/mimeview.c:2248
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8801,7 +8954,7 @@ msgstr ""
 "Geef de opdracht om het bestand mee te openen:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8812,11 +8965,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2351
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Onbekend programma uitvoeren?"
 
-#: src/mimeview.c:2352
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8829,22 +8982,22 @@ msgstr ""
 "\n"
 "Wil je dit programma uitvoeren?"
 
-#: src/mimeview.c:2356
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Draai programma"
 
-#: src/mimeview.c:2657 src/plugins/att_remover/att_remover.c:305
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Type:"
 
-#: src/mimeview.c:2658 src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2778
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/mimeview.c:2672 src/plugins/vcalendar/vcalendar.c:1243
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1618
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
 msgstr "Beschrijving:"
 
@@ -8893,34 +9046,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "kan groep '%s' niet selecteren\n"
 
-#: src/news.c:1067 src/news.c:1253
+#: src/news.c:1068 src/news.c:1254
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kan groep niet instellen: %s\n"
 
-#: src/news.c:1076
+#: src/news.c:1077
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: src/news.c:1154 src/news.c:1181 src/news.c:1208
+#: src/news.c:1155 src/news.c:1182 src/news.c:1209
 msgid "couldn't get xhdr\n"
 msgstr "kan xhdr niet ophalen\n"
 
-#: src/news.c:1246
+#: src/news.c:1247
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: src/news.c:1261
+#: src/news.c:1262
 msgid "couldn't get xover\n"
 msgstr "kan xover niet ophalen\n"
 
-#: src/news.c:1278
+#: src/news.c:1279
 msgid "invalid xover line\n"
 msgstr "ongeldige xover regel\n"
 
-#: src/news.c:1480
+#: src/news.c:1481
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8951,77 +9104,82 @@ msgstr "Nieuwsgroep '%s' werkelijk afmelden?"
 msgid "Unsubscribe newsgroup"
 msgstr "Afmelden van nieuwsgroep"
 
-#: src/news_gtk.c:291
+#: src/news_gtk.c:294
 msgid "Rename newsgroup folder"
 msgstr "Hernoem nieuwsgroep map"
 
-#: src/oauth2.c:238
-#| msgid "Default missing icon mode"
-msgid "OAuth2 missing authentication code\n"
+#: src/oauth2.c:241
+msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 ontbrekende autorisatie-code\n"
 
-#: src/oauth2.c:244 src/oauth2.c:359
-#| msgid "IMAP connection broken\n"
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 verbindingsfout\n"
 
-#: src/oauth2.c:253 src/oauth2.c:367
-#| msgid "IMAP connection broken\n"
-msgid "OAuth2 SSL connection error\n"
-msgstr "OAuth2 SSL-verbindingsfout\n"
+#: src/oauth2.c:257 src/oauth2.c:397
+msgid "OAuth2 TLS connection error\n"
+msgstr "OAuth2 TLS-verbindingsfout\n"
 
-#: src/oauth2.c:311 src/oauth2.c:418
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2-toegangswoord verkregen\n"
 
-#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2-toegangswoord niet verkregen\n"
 
-#: src/oauth2.c:320
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2-verversingswoord verkregen\n"
 
-#: src/oauth2.c:322
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2-verversingswoord niet verkregen\n"
 
-#: src/oauth2.c:452
+#: src/oauth2.c:479
+msgid "OAuth2 replacement refresh token provided\n"
+msgstr "OAuth2 vervangend toegangswoord verkregen\n"
+
+#: src/oauth2.c:481
+msgid "OAuth2 replacement refresh token not provided\n"
+msgstr "OAuth2 vervangend toegangswoord niet verkregen\n"
+
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2-socket schrijffout\n"
 
-#: src/oauth2.c:472
-msgid "OAuth2 socket timeout error \n"
-msgstr "OAuth2-socket-fout vanwege tijdslimiet \n"
+#: src/oauth2.c:534
+msgid "OAuth2 socket timeout error\n"
+msgstr "OAuth2 socket-fout vanwege tijdslimiet \n"
 
-#: src/oauth2.c:528
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2-toegangswoord nog steeds geldig\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:635
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2-toegangswoord verkrijgen m.b.v. verversingswoord\n"
 
-#: src/oauth2.c:538
-msgid "OAuth2 trying for fresh access token with auth code\n"
-msgstr "OAuth2 proberen verversingswoord te verkrijgen met autorisatie-code\n"
+#: src/oauth2.c:639
+msgid "OAuth2 trying for fresh access token with authorization code\n"
+msgstr ""
+"OAuth2 proberen nieuw toegangswoord te verkrijgen met autorisatie-code\n"
 
-#: src/oauth2.c:552
-msgid "OAuth2 access token updated\n"
-msgstr "OAuth2-toegangswoord bijgewerkt\n"
+#: src/oauth2.c:656
+msgid "OAuth2 access and refresh token updated\n"
+msgstr "OAuth2 toegang- en verversingswoord bijgewerkt\n"
 
-#: src/oauth2.c:583
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 origineel: %s\n"
 
-#: src/oauth2.c:584
+#: src/oauth2.c:689
 #, c-format
-#| msgid "--- Ended: %s\n"
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 versleuteld: %s\n"
 
-#: src/oauth2.c:585
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9031,11 +9189,11 @@ msgstr ""
 "\n"
 
 #: src/password.c:128 src/password.c:129
-msgid "Input master passphrase"
+msgid "Input primary passphrase"
 msgstr "Invoeren hoofdwachtwoord"
 
 #: src/password.c:141
-msgid "Incorrect master passphrase."
+msgid "Incorrect primary passphrase."
 msgstr "Ongeldig hoofdwachtwoord."
 
 #: src/password_gtk.c:66
@@ -9043,38 +9201,38 @@ msgid "New passphrases do not match, try again."
 msgstr "Nieuwe wachtwoorden komen niet overeen, probeer nogmaals."
 
 #: src/password_gtk.c:79
-msgid "Incorrect old master passphrase entered, try again."
-msgstr "Fout oud wachtwoord ingevoerd, probeer nogmaals."
+msgid "Incorrect old primary passphrase entered, try again."
+msgstr "Fout oud hoofdwachtwoord ingevoerd, probeer nogmaals."
 
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
+#: src/password_gtk.c:143
+msgid "Changing primary passphrase"
 msgstr "Wijzigen hoofdwachtwoord"
 
-#: src/password_gtk.c:165
+#: src/password_gtk.c:164
 msgid ""
-"If a master passphrase is currently active, it\n"
+"If a primary passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
 "Als een hoofdwachtwoord op dit moment\n"
 "actief is, moet het ingevoerd worden."
 
-#: src/password_gtk.c:175
+#: src/password_gtk.c:174
 msgid "Old passphrase:"
 msgstr "Oud wachtwoord:"
 
-#: src/password_gtk.c:189
+#: src/password_gtk.c:188
 msgid "New passphrase:"
 msgstr "Nieuw wachtwoord:"
 
-#: src/password_gtk.c:200
+#: src/password_gtk.c:199
 msgid "Confirm passphrase:"
 msgstr "Bevestig wachtwoord:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:55
+#: src/plugins/acpi_notifier/acpi_notifier.c:54
 msgid "Acpi Notifier"
 msgstr "Acpi-meldingen"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:70
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -9082,7 +9240,7 @@ msgstr ""
 "Controleer dat de kernel-module 'acerhk' geladen is.\n"
 "Je kunt het verkrijgen op http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -9090,19 +9248,19 @@ msgstr ""
 "Controleer dat de kernel-module 'acer_acpi' geladen is.\n"
 "Je kunt het verkrijgen op http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Controleer dat de kernel-module 'asus_laptop' geladen is."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Controleer dat de kernel-module 'asus_acpi' geladen is."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:77
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Controleer dat de kernel-module 'ibm_acpi' geladen is."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:78
+#: src/plugins/acpi_notifier/acpi_notifier.c:77
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -9110,78 +9268,79 @@ msgstr ""
 "Controleer dat apanelc geinstalleerd is.\n"
 "Je kunt het verkrijgen op http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:211
-#: src/plugins/acpi_notifier/acpi_notifier.c:217
-#: src/plugins/acpi_notifier/acpi_notifier.c:419
+#: 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 "Beheer bestand bestaat niet."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:300
+#: src/plugins/acpi_notifier/acpi_notifier.c:299
 msgid " : no new or unread mail"
 msgstr " : geen nieuwe of ongelezen mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:301
+#: src/plugins/acpi_notifier/acpi_notifier.c:300
 msgid " : unread mail"
 msgstr " : ongelezen mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:302
+#: src/plugins/acpi_notifier/acpi_notifier.c:301
 msgid " : new mail"
 msgstr " : nieuwe mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:304
-#: src/plugins/acpi_notifier/acpi_notifier.c:310
-#: src/plugins/acpi_notifier/acpi_notifier.c:316
+#: src/plugins/acpi_notifier/acpi_notifier.c:303
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
 msgid "off"
 msgstr "uit"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
-#: src/plugins/acpi_notifier/acpi_notifier.c:312
-#: src/plugins/acpi_notifier/acpi_notifier.c:318
+#: 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 "knipperend"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
-#: src/plugins/acpi_notifier/acpi_notifier.c:314
-#: src/plugins/acpi_notifier/acpi_notifier.c:320
+#: 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 "aan"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:341
-#: src/plugins/acpi_notifier/acpi_notifier.c:350
-#: src/plugins/acpi_notifier/acpi_notifier.c:365
+#: src/plugins/acpi_notifier/acpi_notifier.c:340
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:364
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:380
+#: src/plugins/acpi_notifier/acpi_notifier.c:379
 msgid "ACPI type: "
 msgstr "ACPI-type: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:389
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI file: "
 msgstr "ACPI-bestand: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:400
+#: src/plugins/acpi_notifier/acpi_notifier.c:399
 msgid "values - On: "
 msgstr "waardes - Aan: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:405
+#: src/plugins/acpi_notifier/acpi_notifier.c:404
 msgid " - Off: "
 msgstr " - Uit: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:427
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
 msgid "Blink when user interaction is required"
 msgstr "Knipperen wanneer interactie gevraagd wordt"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:853
+#: src/plugins/acpi_notifier/acpi_notifier.c:852
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Deze plugin regelt verschillende ACPI-mail-LEDs."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:874
+#: src/plugins/acpi_notifier/acpi_notifier.c:873
 msgid "Laptop LED"
 msgstr "Laptop-LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
 #: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/keyword_warner/keyword_warner.c:230
 msgid "Failed to register check before send hook"
 msgstr "Registreren van 'check before send'-hook is mislukt"
 
@@ -9209,7 +9368,7 @@ msgstr "Adresboek pad waar adressen opgeslagen worden"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:126
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
-#: src/plugins/bsfilter/bsfilter_gtk.c:201
+#: src/plugins/bsfilter/bsfilter_gtk.c:200
 #: src/plugins/spamassassin/spamassassin_gtk.c:458
 #: src/prefs_filtering_action.c:548 src/prefs_filtering_action.c:555
 #: src/prefs_matcher.c:688
@@ -9235,7 +9394,7 @@ msgstr ""
 "Negeer adressen bij het voorkomen van de volgende reguliere expressies (één "
 "per regel)"
 
-#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:106
 msgid "Mail Archiver"
 msgstr "Mail Archiveerder"
 
@@ -9443,17 +9602,17 @@ msgstr "Compressieniveau"
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:533
-#: src/prefs_folder_item.c:1180 src/prefs_folder_item.c:1210
+#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:534
+#: src/prefs_folder_item.c:1242 src/prefs_folder_item.c:1273
 msgid "Yes"
 msgstr "Ja"
 
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:532
-#: src/prefs_folder_item.c:1179 src/prefs_folder_item.c:1209
-#: src/prefs_summaries.c:409
+#: 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
 msgid "No"
 msgstr "Geen"
 
@@ -9470,7 +9629,7 @@ msgid "Delete selected files"
 msgstr "Verwijder geselecteerd bestand"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1330
+#: src/plugins/archive/archiver_gtk.c:1327
 msgid "Select mails before"
 msgstr "Selecteer e-mails voor"
 
@@ -9478,104 +9637,104 @@ msgstr "Selecteer e-mails voor"
 msgid "Select folder to archive"
 msgstr "Selecteer map om te archiveren"
 
-#: src/plugins/archive/archiver_gtk.c:942
+#: src/plugins/archive/archiver_gtk.c:941
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 "Selecteer bestandsnaam voor archief [achtervoegsel moet overeenkomen met "
 "archief zoals .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:990
+#: src/plugins/archive/archiver_gtk.c:987
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld van %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:1040
 msgid "Create Archive"
 msgstr "Maak archief aan"
 
-#: src/plugins/archive/archiver_gtk.c:1058
+#: src/plugins/archive/archiver_gtk.c:1055
 msgid "Enter Archiver arguments"
 msgstr "Voer Archiveerder argumenten in"
 
-#: src/plugins/archive/archiver_gtk.c:1072
+#: src/plugins/archive/archiver_gtk.c:1069
 msgid "Folder to archive"
 msgstr "Map om te archiveren"
 
-#: src/plugins/archive/archiver_gtk.c:1079
+#: src/plugins/archive/archiver_gtk.c:1076
 msgid "Folder which is the root of the archive"
 msgstr "Bovenste map van het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1081
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 "Klik hier om een map te selecteren wat de bovenste map van het archief is"
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1087
 msgid "Name for archive"
 msgstr "Naam van het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1096
+#: src/plugins/archive/archiver_gtk.c:1093
 msgid "Archive location and name"
 msgstr "Locatie en naam van het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1098
-#: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:494
+#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_prefs.c:224
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Selecteren"
 
-#: src/plugins/archive/archiver_gtk.c:1101
+#: src/plugins/archive/archiver_gtk.c:1098
 msgid "Click this button to select a name and location for the archive"
 msgstr "Klik hier om een naam en locatie voor het archief te selecteren"
 
-#: src/plugins/archive/archiver_gtk.c:1103
+#: src/plugins/archive/archiver_gtk.c:1100
 msgid "Choose compression"
 msgstr "Kies compressie"
 
-#: src/plugins/archive/archiver_gtk.c:1115
-#: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1127
-#: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1140
-#: src/plugins/archive/archiver_gtk.c:1148
-#: src/plugins/archive/archiver_gtk.c:1156
-#: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1168
-#: src/plugins/archive/archiver_gtk.c:1176
-#: src/plugins/archive/archiver_gtk.c:1183
+#: 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
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "Kies deze optie om %s-compressie te gebruiken voor het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1232
+#: src/plugins/archive/archiver_gtk.c:1229
 msgid "Choose format"
 msgstr "Kies format"
 
-#: src/plugins/archive/archiver_gtk.c:1244
-#: src/plugins/archive/archiver_gtk.c:1250
-#: src/plugins/archive/archiver_gtk.c:1256
-#: src/plugins/archive/archiver_gtk.c:1262
+#: 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
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "Kies deze optie om %s te gebruiken als format voor het archief"
 
-#: src/plugins/archive/archiver_gtk.c:1282
+#: src/plugins/archive/archiver_gtk.c:1279
 msgid "Miscellaneous options"
 msgstr "Overige opties"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1288
 msgid "_Recursive"
 msgstr "_Recursief"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1292
 msgid "Choose this option to include subfolders in the archive"
 msgstr "Kies deze optie om submappen in het archief te voegen"
 
-#: src/plugins/archive/archiver_gtk.c:1297
+#: src/plugins/archive/archiver_gtk.c:1294
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1301
+#: src/plugins/archive/archiver_gtk.c:1298
 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"
@@ -9585,12 +9744,12 @@ msgstr ""
 "Wees je ervan bewust dat dit de tijd die het duurt om het archief aan te "
 "maken drastisch verhoogt"
 
-#: src/plugins/archive/archiver_gtk.c:1305
+#: src/plugins/archive/archiver_gtk.c:1302
 msgid "R_ename"
 msgstr "_Hernoemen"
 
-#: src/plugins/archive/archiver_gtk.c:1309
-#: src/plugins/archive/archiver_prefs.c:427
+#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
@@ -9600,7 +9759,7 @@ msgstr ""
 "Dit volgens het schema: datum_van at onderwerp.\n"
 "Namen worden verkort tot max 96 karakters"
 
-#: src/plugins/archive/archiver_gtk.c:1317
+#: src/plugins/archive/archiver_gtk.c:1314
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9608,11 +9767,11 @@ msgstr ""
 "Kies deze optie om e-mails te verwijderen na het archiveren\n"
 "Op dit moment kan dit alleen bij IMAP4, Lokale mbox en POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1321
+#: src/plugins/archive/archiver_gtk.c:1318
 msgid "Selection options"
 msgstr "Selecteer opties"
 
-#: src/plugins/archive/archiver_gtk.c:1337
+#: src/plugins/archive/archiver_gtk.c:1334
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9620,60 +9779,60 @@ msgstr ""
 "Selecteer e-mails van voor een bepaalde datum\n"
 "datum moet overeenkomen met ISO-8601 [YYYY-MM-DD]"
 
-#: src/plugins/archive/archiver_prefs.c:217
+#: src/plugins/archive/archiver_prefs.c:216
 msgid "Default save folder"
 msgstr "Standaard bewaarmap"
 
-#: src/plugins/archive/archiver_prefs.c:229
+#: src/plugins/archive/archiver_prefs.c:228
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
 "Klik deze knop om de standaard locatie te selecteren voor het bewaren van "
 "archieven"
 
-#: src/plugins/archive/archiver_prefs.c:238
+#: src/plugins/archive/archiver_prefs.c:237
 msgid "Default compression"
 msgstr "Standaard compressie"
 
-#: src/plugins/archive/archiver_prefs.c:249
-#: src/plugins/archive/archiver_prefs.c:255
-#: src/plugins/archive/archiver_prefs.c:261
-#: src/plugins/archive/archiver_prefs.c:268
-#: src/plugins/archive/archiver_prefs.c:274
-#: src/plugins/archive/archiver_prefs.c:282
-#: src/plugins/archive/archiver_prefs.c:290
-#: src/plugins/archive/archiver_prefs.c:296
-#: src/plugins/archive/archiver_prefs.c:302
-#: src/plugins/archive/archiver_prefs.c:310
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:248
+#: src/plugins/archive/archiver_prefs.c:254
+#: src/plugins/archive/archiver_prefs.c:260
+#: src/plugins/archive/archiver_prefs.c:267
+#: src/plugins/archive/archiver_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:281
+#: src/plugins/archive/archiver_prefs.c:289
+#: src/plugins/archive/archiver_prefs.c:295
+#: src/plugins/archive/archiver_prefs.c:301
+#: src/plugins/archive/archiver_prefs.c:309
+#: src/plugins/archive/archiver_prefs.c:316
 #, c-format
 msgid "Choose this option to use %s compression by default"
 msgstr "Kies deze optie om standaard %s-compressie te gebruiken"
 
-#: src/plugins/archive/archiver_prefs.c:363
+#: src/plugins/archive/archiver_prefs.c:362
 msgid "Default format"
 msgstr "Standaard format"
 
-#: src/plugins/archive/archiver_prefs.c:374
-#: src/plugins/archive/archiver_prefs.c:380
-#: src/plugins/archive/archiver_prefs.c:386
-#: src/plugins/archive/archiver_prefs.c:392
+#: src/plugins/archive/archiver_prefs.c:373
+#: src/plugins/archive/archiver_prefs.c:379
+#: src/plugins/archive/archiver_prefs.c:385
+#: src/plugins/archive/archiver_prefs.c:391
 #, c-format
 msgid "Choose this option to use the %s as format by default"
 msgstr "Kies deze optie om standaard het %s-format te gebruiken"
 
-#: src/plugins/archive/archiver_prefs.c:409
+#: src/plugins/archive/archiver_prefs.c:408
 msgid "Default miscellaneous options"
 msgstr "Standaard opties"
 
-#: src/plugins/archive/archiver_prefs.c:418
+#: src/plugins/archive/archiver_prefs.c:417
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr "Kies deze optie om standaard submappen bij te voegen in de archieven"
 
-#: src/plugins/archive/archiver_prefs.c:419
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "MD5sum"
 msgstr "MD5sum"
 
-#: src/plugins/archive/archiver_prefs.c:421
+#: src/plugins/archive/archiver_prefs.c:420
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9685,33 +9844,37 @@ msgstr ""
 "Wees je ervan bewust dat dit de tijd die nodig is om de archieven aan te "
 "maken drastisch verhoogt"
 
-#: src/plugins/archive/archiver_prefs.c:425
+#: src/plugins/archive/archiver_prefs.c:424
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: src/plugins/archive/archiver_prefs.c:433
+#: src/plugins/archive/archiver_prefs.c:432
 msgid "Choose this option to delete mails after archiving"
 msgstr "Kies deze optie om e-mails te verwijderen na het archiveren"
 
-#: src/plugins/att_remover/att_remover.c:338
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Bestandsnaam"
+
+#: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Verwijder bijlages"
 
-#: src/plugins/att_remover/att_remover.c:364
+#: src/plugins/att_remover/att_remover.c:363
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: src/plugins/att_remover/att_remover.c:372 src/prefs_summaries.c:643
-#: src/prefs_summary_column.c:79 src/summaryview.c:2872
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:425
 msgid "Destroy attachments"
 msgstr "Vernietig bijlages"
 
-#: src/plugins/att_remover/att_remover.c:427
+#: src/plugins/att_remover/att_remover.c:426
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9721,34 +9884,34 @@ msgstr ""
 "\n"
 "De verwijderde gegevens kunnen niet teruggehaald worden."
 
-#: src/plugins/att_remover/att_remover.c:470
+#: src/plugins/att_remover/att_remover.c:469
 msgid "The selected messages don't have any attachments."
 msgstr "Het geselecteerde bericht bevat geen bijlages."
 
-#: src/plugins/att_remover/att_remover.c:473
+#: src/plugins/att_remover/att_remover.c:472
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr "Bijlages verwijderd van %d van de %d geselecteerde berichten."
 
-#: src/plugins/att_remover/att_remover.c:476
+#: src/plugins/att_remover/att_remover.c:475
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr "Bijlages verwijderd van alle %d geselecteerde berichten."
 
-#: src/plugins/att_remover/att_remover.c:505
+#: src/plugins/att_remover/att_remover.c:504
 msgid "This message doesn't have any attachments."
 msgstr "Dit bericht bevat geen bijlages."
 
-#: src/plugins/att_remover/att_remover.c:518
+#: src/plugins/att_remover/att_remover.c:517
 msgid "Remove attachments..."
 msgstr "Verwijderen bijlages..."
 
-#: src/plugins/att_remover/att_remover.c:530
-#: src/plugins/att_remover/att_remover.c:590
+#: src/plugins/att_remover/att_remover.c:529
+#: src/plugins/att_remover/att_remover.c:589
 msgid "AttRemover"
 msgstr "Bijlage verwijderaar"
 
-#: src/plugins/att_remover/att_remover.c:595
+#: src/plugins/att_remover/att_remover.c:594
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9760,11 +9923,11 @@ msgstr ""
 "Waarschuwing: deze operatie is volledig onomkeerbaar en de verwijderde "
 "bijlages zijn voor eeuwig en altijd verloren."
 
-#: src/plugins/att_remover/att_remover.c:619
+#: src/plugins/att_remover/att_remover.c:618
 msgid "Attachment handling"
 msgstr "Bijlage-afhandeling"
 
-#: src/plugins/attachwarner/attachwarner.c:210
+#: src/plugins/attachwarner/attachwarner.c:211
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9778,14 +9941,14 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/attachwarner/attachwarner.c:217
 msgid "Attachment warning"
 msgstr "Bijlage-waarschuwing"
 
-#: src/plugins/attachwarner/attachwarner.c:245
 #: src/plugins/attachwarner/attachwarner.c:282
 #: src/plugins/attachwarner/attachwarner.c:334
-msgid "Attach warner"
+#: src/plugins/attachwarner/attachwarner_prefs.c:235
+msgid "AttachWarner"
 msgstr "Bijlage waarschuwingen"
 
 #: src/plugins/attachwarner/attachwarner.c:292
@@ -9801,23 +9964,31 @@ msgid "attach"
 msgstr "bijvoegen"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-msgid "One of the following regular expressions is matched (one per line)"
-msgstr "Eén van de volgende reguliere expressies overeenkomt (één per regel)"
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:83
+msgid ""
+"Warn when one of the following regular expressions is matched (one per line)"
+msgstr ""
+"Waarschuwen wanneer één van de volgende reguliere expressies overeenkomt "
+"(één per regel)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:88
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:88
 msgid "Expressions are case sensitive"
 msgstr "Expressies zijn hoofdlettergevoelig"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:94
+#: src/plugins/attachwarner/attachwarner_prefs.c:95
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:95
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
 "Hoofdlettergevoelig bij het voorkomen van de reguliere expressies in de lijst"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:117
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:117
 msgid "Lines starting with quotation marks"
 msgstr "Regels beginnend met citaatmarkeringen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:123
+#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:125
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
@@ -9827,22 +9998,26 @@ msgstr ""
 "Opmerking: handgemaakte citaten kunnen niet worden onderscheiden van citaten "
 "die gegenereerd zijn bij het antwoorden."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:130
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:130
 msgid "Forwarded or redirected messages"
 msgstr "Doorgestuurde of herverwezen berichten"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:133
+#: src/plugins/attachwarner/attachwarner_prefs.c:138
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Controleer niet op missende bijlages bij doorgestuurde of herverwezen "
 "berichten"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:136 src/prefs_msg_colors.c:308
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:141
+#: src/prefs_msg_colors.c:305
 msgid "Signatures"
 msgstr "Ondertekeningen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:143
+#: src/plugins/attachwarner/attachwarner_prefs.c:148
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:148
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9850,49 +10025,42 @@ msgstr ""
 "Negeer regels van de eerste ondertekening-scheiding en verder bij het "
 "controleren op de reguliere expressie hierboven"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:149
-msgid "Warn when"
-msgstr "Waarschuwen wanneer"
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:153
-msgid "Excluding"
-msgstr "Uitsluiten"
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:231
-msgid "Attach Warner"
-msgstr "Bijlage waarschuwingen"
+#: src/plugins/attachwarner/attachwarner_prefs.c:157
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:157
+msgid "Exclude"
+msgstr "Uitgezonderd"
 
-#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter.c:80
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter.c:106
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 #: src/plugins/bogofilter/bogofilter_gtk.c:331
 #: src/plugins/bogofilter/bogofilter_gtk.c:408
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/bsfilter/bsfilter.c:104 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_gtk.c:454
 #: src/plugins/spamassassin/spamassassin_gtk.c:503
 #: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
-#: src/prefs_matcher.c:715 src/prefs_matcher.c:1656 src/prefs_matcher.c:1663
-#: src/prefs_matcher.c:1671 src/prefs_matcher.c:1673 src/prefs_matcher.c:2580
-#: src/prefs_matcher.c:2584
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1658 src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1673 src/prefs_matcher.c:1675 src/prefs_matcher.c:2586
+#: src/prefs_matcher.c:2590
 msgid "Any"
 msgstr "Elke"
 
-#: src/plugins/bogofilter/bogofilter.c:457
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: ophalen van berichten..."
 
-#: src/plugins/bogofilter/bogofilter.c:470
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: berichten sorteren..."
 
-#: src/plugins/bogofilter/bogofilter.c:586
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9904,7 +10072,7 @@ msgstr ""
 "Gebruik \"/Markeer/Markeer als spam\" en \"/Markeer/Markeer als ham\" om "
 "Bogofilter te trainen met enkele honderden spam en ham berichten."
 
-#: src/plugins/bogofilter/bogofilter.c:593
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9918,7 +10086,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: leren van bericht..."
 
 #: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Leren mislukt: `%s` gaf status %d terug."
@@ -9964,39 +10132,40 @@ msgstr ""
 "\n"
 "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:643
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
+#: src/plugins/spamassassin/spamassassin.c:647
 msgid "Spam detection"
 msgstr "Spam detecteren"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:644
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:648
 msgid "Spam learning"
 msgstr "Spam leren"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
-#: src/plugins/bsfilter/bsfilter_gtk.c:143
+#: src/plugins/bsfilter/bsfilter_gtk.c:142
 #: src/plugins/spamassassin/spamassassin_gtk.c:411
 msgid "Process messages on receiving"
 msgstr "Verwerk de berichten bij het ophalen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
-#: src/plugins/bsfilter/bsfilter_gtk.c:151
+#: src/plugins/bsfilter/bsfilter_gtk.c:150
 #: src/plugins/spamassassin/spamassassin_gtk.c:369
 msgid "Maximum size"
 msgstr "Maximale grootte"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
-#: src/plugins/bsfilter/bsfilter_gtk.c:160
+#: src/plugins/bsfilter/bsfilter_gtk.c:159
 #: src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Messages larger than this will not be checked"
 msgstr "Berichten groter dan dit zullen niet worden gecontroleerd"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
-#: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1684
-msgid "KB"
-msgstr "KB"
+#: src/plugins/bsfilter/bsfilter_gtk.c:162
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+#| msgid "KB"
+msgid "KiB"
+msgstr "KiB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
@@ -10011,7 +10180,7 @@ msgid "Only mark as spam"
 msgstr "Markeer alleen als spam"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
-#: src/plugins/bsfilter/bsfilter_gtk.c:179
+#: src/plugins/bsfilter/bsfilter_gtk.c:178
 #: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
@@ -10020,7 +10189,7 @@ msgstr ""
 "gebruiken."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
-#: src/plugins/bsfilter/bsfilter_gtk.c:185
+#: src/plugins/bsfilter/bsfilter_gtk.c:184
 #: src/plugins/spamassassin/spamassassin_gtk.c:433
 msgid "Click this button to select a folder for storing spam"
 msgstr "Klik op deze knop om een map te selecteren voor het opslaan van spam"
@@ -10052,13 +10221,13 @@ msgid "Only done for messages in MH folders"
 msgstr "Alleen voor berichten in MH-mappen"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/plugins/bsfilter/bsfilter_gtk.c:191
+#: src/plugins/bsfilter/bsfilter_gtk.c:190
 #: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Whitelist senders found in address book/folder"
 msgstr "'Whitelist' afzenders gevonden in adresboek/map"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
-#: src/plugins/bsfilter/bsfilter_gtk.c:195
+#: src/plugins/bsfilter/bsfilter_gtk.c:194
 #: src/plugins/spamassassin/spamassassin_gtk.c:452
 msgid ""
 "Messages coming from your address book contacts will be received in the "
@@ -10068,13 +10237,13 @@ msgstr ""
 "de gewone map zelfs als ze als spam herkend worden"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:205
+#: src/plugins/bsfilter/bsfilter_gtk.c:204
 #: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Klik op deze knop om een boek of map te selecteren in het adresboek"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
-#: src/plugins/bsfilter/bsfilter_gtk.c:207
+#: src/plugins/bsfilter/bsfilter_gtk.c:206
 msgid "Learn whitelisted emails as ham"
 msgstr "Leer 'whitelisted' e-mails als ham"
 
@@ -10095,24 +10264,24 @@ msgid "Path to bogofilter executable"
 msgstr "Pad naar bogofilter-programma"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
-#: src/plugins/bsfilter/bsfilter_gtk.c:232
+#: src/plugins/bsfilter/bsfilter_gtk.c:231
 #: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid "Mark spam as read"
 msgstr "Markeer spam als gelezen"
 
-#: src/plugins/bsfilter/bsfilter.c:82 src/plugins/bsfilter/bsfilter_gtk.c:401
+#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:273
+#: src/plugins/bsfilter/bsfilter.c:271
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: ophalen berichtinhoud..."
 
-#: src/plugins/bsfilter/bsfilter.c:282
+#: src/plugins/bsfilter/bsfilter.c:280
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filteren bericht..."
 
-#: src/plugins/bsfilter/bsfilter.c:367
+#: src/plugins/bsfilter/bsfilter.c:365
 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"
@@ -10124,7 +10293,7 @@ msgstr ""
 "Gebruik \"/Markeren/Markeer als spam\" en \"/Markeren/Markeer als ham\" om "
 "Bsfilter te trainen met een paar honderd spam en ham berichten."
 
-#: src/plugins/bsfilter/bsfilter.c:374
+#: src/plugins/bsfilter/bsfilter.c:372
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -10133,11 +10302,11 @@ msgstr ""
 "De Bsfilter-plugin kon een bericht niet filteren. Het commando `%s` kon niet "
 "gestart worden."
 
-#: src/plugins/bsfilter/bsfilter.c:475
+#: src/plugins/bsfilter/bsfilter.c:474
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: leren van bericht..."
 
-#: src/plugins/bsfilter/bsfilter.c:616
+#: src/plugins/bsfilter/bsfilter.c:615
 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 "
@@ -10165,12 +10334,12 @@ msgstr ""
 "\n"
 "Opties kunnen gevonden worden in /Instellingen/Voorkeuren/Plugins/Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:171
+#: src/plugins/bsfilter/bsfilter_gtk.c:170
 #: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Save spam in"
 msgstr "Spam opslaan in"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:209
+#: src/plugins/bsfilter/bsfilter_gtk.c:208
 msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
@@ -10178,11 +10347,11 @@ msgstr ""
 "Als Bsfilter dacht een e-mail was spam, of het niet zeker wist, maar het was "
 "ge-whitelist, leer het als ham."
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:218
+#: src/plugins/bsfilter/bsfilter_gtk.c:217
 msgid "Bsfilter call"
 msgstr "Bsfilter aanroep"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:226
+#: src/plugins/bsfilter/bsfilter_gtk.c:225
 msgid "Path to bsfilter executable"
 msgstr "Pad naar het bsfilter-programma"
 
@@ -10211,12 +10380,12 @@ msgstr ""
 "Clamd reageert niet op ping.\n"
 "Draait clamd wel?"
 
-#: src/plugins/clamd/clamav_plugin.c:119
+#: src/plugins/clamd/clamav_plugin.c:120
 #, c-format
 msgid "Detected %s virus."
 msgstr "%s virus ontdekt."
 
-#: src/plugins/clamd/clamav_plugin.c:135
+#: src/plugins/clamd/clamav_plugin.c:137
 #, c-format
 msgid ""
 "Scanning error:\n"
@@ -10225,20 +10394,20 @@ msgstr ""
 "Fout bij scannen:\n"
 "%s"
 
-#: src/plugins/clamd/clamav_plugin.c:146
+#: src/plugins/clamd/clamav_plugin.c:148
 #, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr "Bestand: %s. Grootte (%d) groter dan limiet (%d)\n"
 
-#: src/plugins/clamd/clamav_plugin.c:174
+#: src/plugins/clamd/clamav_plugin.c:177
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: scannen bericht..."
 
-#: src/plugins/clamd/clamav_plugin.c:280
+#: src/plugins/clamd/clamav_plugin.c:283
 msgid "Failed to register mail filtering hook"
 msgstr "Registreren van 'register mail filtering'-hook is mislukt"
 
-#: src/plugins/clamd/clamav_plugin.c:298
+#: src/plugins/clamd/clamav_plugin.c:301
 msgid ""
 "Init\n"
 "No socket information.\n"
@@ -10248,7 +10417,7 @@ msgstr ""
 "Geen socket-informatie.\n"
 "Antivirus uitgeschakeld."
 
-#: src/plugins/clamd/clamav_plugin.c:302
+#: src/plugins/clamd/clamav_plugin.c:305
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
@@ -10258,7 +10427,7 @@ msgstr ""
 "Clamd reageert niet op ping.\n"
 "Draait clamd wel?"
 
-#: src/plugins/clamd/clamav_plugin.c:333
+#: src/plugins/clamd/clamav_plugin.c:336
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -10301,7 +10470,7 @@ msgstr ""
 "Opties kunnen gevonden worden in\n"
 "/Instellingen/Voorkeuren/Plugins/Clam AntiVirus"
 
-#: src/plugins/clamd/clamav_plugin.c:372
+#: src/plugins/clamd/clamav_plugin.c:375
 msgid "Virus detection"
 msgstr "Virus detecteren"
 
@@ -10378,6 +10547,10 @@ msgstr "Klik op deze knop om het volledige pad te selecteren naar clamd.conf"
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Controleer rechten voor mappen en wijzig indien noodzakelijk"
 
+#: src/plugins/clamd/clamav_plugin_gtk.c:348
+msgid "Find and _Replace"
+msgstr "Zoeken en _vervangen"
+
 #: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr ""
@@ -10415,7 +10588,7 @@ msgstr ""
 "Clamd reageert niet op ping.\n"
 "Draait clamd wel?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:122
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -10424,7 +10597,7 @@ msgstr ""
 "%s: Niet in staat te openen\n"
 "clamd wordt uitgezet"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:217
+#: src/plugins/clamd/libclamd/clamd-plugin.c:210
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -10433,44 +10606,44 @@ msgstr ""
 "%s: Niet in staat de benodigde informatie te vinden\n"
 "clamd wordt uitgezet"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:251
+#: src/plugins/clamd/libclamd/clamd-plugin.c:244
 msgid "Could not create socket"
 msgstr "Kon socket niet aanmaken"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:442
+#: src/plugins/clamd/libclamd/clamd-plugin.c:435
 msgid ": File does not exist"
 msgstr ": Bestand bestaat niet"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
+#: src/plugins/clamd/libclamd/clamd-plugin.c:448
 msgid ": Unable to open"
 msgstr ": Niet in staat te openen"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
-#: src/plugins/clamd/libclamd/clamd-plugin.c:479
-#: src/plugins/clamd/libclamd/clamd-plugin.c:493
+#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:472
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 msgid "Socket write error"
 msgstr "Socket-schrijffout"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:486
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Fout bij lezen"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:500
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket read error"
 msgstr "Socket-leesfout"
 
-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
+#: src/plugins/demo/demo.c:33 src/plugins/demo/demo.c:102
 msgid "Demo"
 msgstr "Demo"
 
-#: src/plugins/demo/demo.c:52
+#: src/plugins/demo/demo.c:54
 msgid "Failed to register log text hook"
 msgstr "Registreren van 'log text'-hook is mislukt"
 
-#: src/plugins/demo/demo.c:76
+#: src/plugins/demo/demo.c:78
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It "
+"This plugin is only a demo of how to write plugins for Claws Mail. It "
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
@@ -10479,7 +10652,7 @@ msgstr ""
 "Mail te schrijven. Het installeert een hook voor nieuwe log-uitvoer en "
 "schrijft die naar stdout.\n"
 "\n"
-"De plugin is als plugin niet echt echt nuttig."
+"De plugin is niet echt nuttig."
 
 #: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
@@ -10514,15 +10687,15 @@ msgid "Render embedded objects using plugins"
 msgstr "Toon ingesloten objecten met behulp van plugins"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
+msgid "Open in Viewer (remote content is enabled)"
 msgstr "Open in weergever (inhoud van de server wordt geladen)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Doe niets (inhoud van de server wordt niet geladen)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4256
-#: src/prefs_proxy.c:235
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
+#: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -10563,7 +10736,7 @@ msgid "When clicking on a link, by default"
 msgstr "Bij klikken op een koppeling, standaard"
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
+msgid "Open in External Browser"
 msgstr "Open met externe browser"
 
 #: src/plugins/fancy/fancy_prefs.c:300
@@ -10571,9 +10744,9 @@ msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "De CSS in dit bestand wordt toegepast op alle HTML-delen"
 
 #: src/plugins/fancy/fancy_prefs.c:310
-#: src/plugins/notification/notification_prefs.c:1341
+#: 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:1587 src/prefs_account.c:1706 src/prefs_account.c:2474
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Bekijk"
@@ -10582,89 +10755,86 @@ msgstr "Bekijk"
 msgid "Select stylesheet"
 msgstr "Stijlblad selecteren"
 
-#: src/plugins/fancy/fancy_viewer.c:469
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "Inhoud van de server laden is uitgezet."
 
-#: src/plugins/fancy/fancy_viewer.c:578
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Laad afbeeldingen"
 
-#: src/plugins/fancy/fancy_viewer.c:580
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Deblokkeer externe inhoud"
 
-#: src/plugins/fancy/fancy_viewer.c:582
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Zet Javascript Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:584
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Zet Plugins Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Java activeren"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Open koppelingen met externe browser"
 
-#: src/plugins/fancy/fancy_viewer.c:780
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Een fout gebeurde: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:840
+#: src/plugins/fancy/fancy_viewer.c:853
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s is een foutgevormde of niet-ondersteunde feed"
 
-#: src/plugins/fancy/fancy_viewer.c:851
-msgid "Search the Web"
-msgstr "Zoeken op het Web"
-
-#: src/plugins/fancy/fancy_viewer.c:862
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Open in weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:871
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Open in Browser"
 
-#: src/plugins/fancy/fancy_viewer.c:881
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Open Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:890
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Kopieer koppeling"
 
-#: src/plugins/fancy/fancy_viewer.c:894
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Haal koppeling op"
 
-#: src/plugins/fancy/fancy_viewer.c:905
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Sla Afbeelding Op Als"
 
-#: src/plugins/fancy/fancy_viewer.c:915
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Kopieer Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:953
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Importeer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1245
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1273
+#. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:1278
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10676,17 +10846,22 @@ msgstr ""
 "worden niet automatisch geladen. Opties kunnen worden gevonden in /"
 "Instellingen/Voorkeuren/Plugins/Fancy"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:160
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:193
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
+#. TRANSLATORS: Possible error message during plugin load
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:166
 msgid "Failed to register mail receive hook"
 msgstr "Registreren van 'mail receive'-hook is mislukt"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
+#. TRANSLATORS: Description seen in plugins dialog.
+#. * Translation of "Plugins" part of preferences path should to be
+#. * the same as translation of "Plugins" string in Claws Mail message
+#. * catalog.
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:202
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -10700,10 +10875,12 @@ msgstr ""
 "\n"
 "Opties kunnen gevonden worden in /Instellingen/Voorkeuren/Plugins/Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
+#. TRANSLATORS: Description of functionality added by this plugin
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:229
 msgid "Mail marking"
 msgstr "E-mail marketing"
 
+#. TRANSLATORS: Heading of a preferences section determining which headers to add
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:92
 msgid "Add fetchinfo headers"
 msgstr "Toevoegen fetchinfo-headers"
@@ -10712,10 +10889,7 @@ msgstr "Toevoegen fetchinfo-headers"
 msgid "Headers to be added"
 msgstr "Headers om toe te voegen"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
-msgid "UIDL"
-msgstr "UIDL"
-
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
@@ -10723,6 +10897,7 @@ msgstr ""
 "Voegt de X-FETCH-UIDL-header toe met de unieke ID-nummering van het bericht "
 "(POP3)"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
 msgstr "Accountnaam"
@@ -10731,6 +10906,7 @@ msgstr "Accountnaam"
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
 msgstr "Voegt de X-FETCH-ACCOUNT-header toe met de accountnaam"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
 msgstr "Server om van te ontvangen"
@@ -10739,6 +10915,7 @@ msgstr "Server om van te ontvangen"
 msgid "Adds the X-FETCH-SERVER header with the receive server"
 msgstr "Voegt de X-FETCH-SERVER-header toe met de ontvangende server"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
 msgstr "Gebruikersnaam"
@@ -10747,6 +10924,7 @@ msgstr "Gebruikersnaam"
 msgid "Adds the X-FETCH-USERID header with the user ID"
 msgstr "Voegt de X-FETCH-USERID-header toe met de gebruikers-ID"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
 msgstr "Fetch-tijd"
@@ -10889,12 +11067,12 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-plugin: Starten van vernieuwing autorisatie\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Authenticatie"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1570
+#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
@@ -10943,6 +11121,44 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData integratie"
 
+#: 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"
+"\n"
+"%s"
+msgstr ""
+"Een sleutelwoord wordt vermeld in de e-mail die je verstuurt. Het "
+"sleutelwoord staat op regel op regel %d, die begint met de tekst: %s\n"
+"\n"
+"%s"
+
+#: src/plugins/keyword_warner/keyword_warner.c:195
+msgid "Keyword warning"
+msgstr "Sleutelwoord waarschuwing"
+
+#: src/plugins/keyword_warner/keyword_warner.c:260
+#: src/plugins/keyword_warner/keyword_warner.c:313
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:235
+msgid "Keyword Warner"
+msgstr "Sleutelwoorden waarschuwingen"
+
+#: src/plugins/keyword_warner/keyword_warner.c:270
+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 ""
+"Toont een waarschuwing wanneer bij het verzenden of plaatsen in de wachtrij "
+"van een bericht er een referentie in de berichttekst is gevonden in het "
+"bericht naar één of meer sleutelwoorden."
+
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:138
+msgid "Don't check for keywords when forwarding or redirecting messages"
+msgstr ""
+"Controleer niet op missende sleutelwoorden bij doorgestuurde of herverwezen "
+"berichten"
+
 #: src/plugins/libravatar/libravatar.c:334
 #: src/plugins/libravatar/libravatar.c:399
 #: src/plugins/libravatar/libravatar.c:459
@@ -11020,7 +11236,7 @@ msgstr "Wil je de cache van avatarpictogrammen werkelijk verwijderen?"
 
 #: src/plugins/libravatar/libravatar_prefs.c:187
 msgid "Not enough memory for operation"
-msgstr "Niet genoeg geheugen om uitt e voeren"
+msgstr "Niet genoeg geheugen om uit te voeren"
 
 #: src/plugins/libravatar/libravatar_prefs.c:192
 #, c-format
@@ -11072,8 +11288,8 @@ msgid "Cache refresh interval"
 msgstr "Cache verversingsinterval"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "uur"
 
@@ -11218,20 +11434,19 @@ msgstr ""
 msgid "Size of image cache in megabytes"
 msgstr "Grootte van afbeeldings-cache in megabytes"
 
-#: src/plugins/litehtml_viewer/lh_prefs.c:149
+#: src/plugins/litehtml_viewer/lh_prefs.c:150
 msgid "Default font"
 msgstr "Standaard lettertype"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Open Link"
 msgstr "Open koppeling"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+#: src/plugins/litehtml_viewer/lh_widget.cpp:99
 msgid "Copy Link Location"
 msgstr "Kopieer koppelingslocatie"
 
 #: src/plugins/litehtml_viewer/plugin.c:50
-#| msgid "_List view"
 msgid "LiteHTML viewer"
 msgstr "LiteHTML-weergever"
 
@@ -11243,15 +11458,15 @@ msgstr ""
 "Weergave-plugin voor HTML-emails, dzee gebruikt de litehtml-bibliotheek "
 "(http://www.litehtml.com/)."
 
-#: src/plugins/mailmbox/plugin.c:58
+#: src/plugins/mailmbox/plugin.c:57
 msgid "mailmbox folder"
 msgstr "mailmbox map"
 
-#: src/plugins/mailmbox/plugin.c:63
+#: src/plugins/mailmbox/plugin.c:62
 msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr "Dit is een plugin die inboxen in mbox-format afhandelt."
 
-#: src/plugins/mailmbox/plugin.c:84
+#: src/plugins/mailmbox/plugin.c:83
 msgid "MBOX"
 msgstr "MBOX"
 
@@ -11265,79 +11480,70 @@ msgstr ""
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/plugins/mailmbox/plugin_gtk.c:331
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be deleted.\n"
-"Do you really want to delete?"
-msgstr ""
-"Alle map(pen) en bericht(en) onder '%s' zullen worden verwijderd.\n"
-"Wil je werkelijk verwijderen?"
-
-#: src/plugins/managesieve/managesieve.c:436
+#: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Sieve-auth-methode niet beschikbaar\n"
 
-#: src/plugins/managesieve/managesieve.c:440
+#: src/plugins/managesieve/managesieve.c:442
 msgid "Selected Sieve auth method not available\n"
 msgstr "Geselecteerde Sieve-auth-methode niet beschikbaar\n"
 
-#: src/plugins/managesieve/managesieve.c:673
+#: src/plugins/managesieve/managesieve.c:675
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: src/plugins/managesieve/managesieve.c:677
+#: src/plugins/managesieve/managesieve.c:679
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Verbinding verbroken: %s"
 
-#: src/plugins/managesieve/managesieve.c:726
-#: src/plugins/managesieve/managesieve.c:871
+#: src/plugins/managesieve/managesieve.c:728
+#: src/plugins/managesieve/managesieve.c:873
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "onbehandeld bericht in Sieve-sessie: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:733
+#: src/plugins/managesieve/managesieve.c:735
 msgid "STARTTLS failed"
 msgstr "STARTTLS mislukt"
 
-#: src/plugins/managesieve/managesieve.c:798
-#: src/plugins/managesieve/managesieve.c:814
-#: src/plugins/managesieve/managesieve.c:841
-#: src/plugins/managesieve/managesieve.c:923
-#: src/plugins/managesieve/managesieve.c:941
+#: src/plugins/managesieve/managesieve.c:800
+#: src/plugins/managesieve/managesieve.c:816
+#: src/plugins/managesieve/managesieve.c:843
+#: src/plugins/managesieve/managesieve.c:925
+#: src/plugins/managesieve/managesieve.c:943
 msgid "error occurred on SIEVE session\n"
 msgstr "er is een fout opgetreden tijdens de SIEVE-sessie\n"
 
-#: src/plugins/managesieve/managesieve.c:867
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "er is een fout opgetreden tijdens de Sieve-sessie. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:876
+#: src/plugins/managesieve/managesieve.c:878
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "onbehandeld bericht in Sieve-sessie: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1153
+#: src/plugins/managesieve/managesieve.c:1160
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: auth opnieuw proberen\n"
 
-#: src/plugins/managesieve/managesieve.c:1155
+#: src/plugins/managesieve/managesieve.c:1162
 msgid "Auth method not available"
 msgstr "Auth-methode niet beschikbaar"
 
-#: src/plugins/managesieve/managesieve.c:1172
+#: src/plugins/managesieve/managesieve.c:1179
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "verzendfout in Sieve-sessie: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5805
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
 msgid "_Filter"
 msgstr "_Filter"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "Chec_k Syntax"
 msgstr "Co_ntroleer Syntax"
 
@@ -11346,7 +11552,7 @@ msgid "Re_vert"
 msgstr "Teru_gdraaien"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_editor.c:725
 #: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "Kon scriptinhoud niet verkrijgen"
@@ -11367,29 +11573,29 @@ msgstr "Dit script is gewijzigd. Niet-opgeslagen veranderingen terugdraaien?"
 msgid "_Revert"
 msgstr "_Terugdraaien"
 
-#: src/plugins/managesieve/sieve_editor.c:353
+#: src/plugins/managesieve/sieve_editor.c:354
 msgid "Script saved successfully."
 msgstr "Script opgeslagen."
 
-#: src/plugins/managesieve/sieve_editor.c:370
+#: src/plugins/managesieve/sieve_editor.c:371
 msgid "Saving..."
 msgstr "Opslaan..."
 
-#: src/plugins/managesieve/sieve_editor.c:399
+#: src/plugins/managesieve/sieve_editor.c:400
 msgid "Checking syntax..."
 msgstr "Syntax wordt geverifieerd..."
 
-#: src/plugins/managesieve/sieve_editor.c:433
+#: src/plugins/managesieve/sieve_editor.c:434
 msgid "This script has been modified. Save the latest changes?"
 msgstr "Dit script is gewijzigd. Veranderingen opslaan?"
 
-#: src/plugins/managesieve/sieve_editor.c:695
+#: src/plugins/managesieve/sieve_editor.c:696
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve-filter%s"
 
-#: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#: src/plugins/managesieve/sieve_editor.c:745
+#: src/plugins/pdf_viewer/poppler_viewer.c:1331
 msgid "Loading..."
 msgstr "Laden..."
 
@@ -11439,24 +11645,24 @@ msgstr "Verbinden..."
 msgid "Manage Sieve Filters"
 msgstr "Beheer Sieve-filters"
 
-#: src/plugins/managesieve/sieve_manager.c:771
+#: src/plugins/managesieve/sieve_manager.c:772
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: src/plugins/managesieve/sieve_manager.c:806
+#: src/plugins/managesieve/sieve_manager.c:807
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "Om Sieve te gebruiken, activeer het in de voorkeuren van een account."
 
-#: src/plugins/managesieve/sieve_plugin.c:36
-#: src/plugins/managesieve/sieve_plugin.c:154
+#: src/plugins/managesieve/sieve_plugin.c:38
+#: src/plugins/managesieve/sieve_plugin.c:156
 msgid "ManageSieve"
 msgstr "ManageSieve"
 
-#: src/plugins/managesieve/sieve_plugin.c:46
+#: src/plugins/managesieve/sieve_plugin.c:48
 msgid "Manage Sieve Filters..."
 msgstr "Beheer Sieve-Filters..."
 
-#: src/plugins/managesieve/sieve_plugin.c:114
+#: src/plugins/managesieve/sieve_plugin.c:116
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr "Beheer sieve-filters op een server mbv. het ManageSieve-protocol."
 
@@ -11464,7 +11670,7 @@ msgstr "Beheer sieve-filters op een server mbv. het ManageSieve-protocol."
 msgid "Enable Sieve"
 msgstr "Sieve activeren"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Serverinformatie"
 
@@ -11502,7 +11708,7 @@ msgid "Require STARTTLS"
 msgstr "STARTTLS vereist"
 
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr "Geen authenticatie"
 
@@ -11515,30 +11721,29 @@ msgid "Specify authentication"
 msgstr "Geef authenticatie op"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
-#: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:383
-#: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2997 src/prefs_account.c:3025
-#: src/prefs_account.c:3220 src/prefs_proxy.c:132 src/wizard.c:1222
-#: src/wizard.c:1652
+#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: 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
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Authenticatie-methode"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
-#: src/prefs_themes.c:1116
+#: 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
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -11588,7 +11793,7 @@ msgstr ""
 msgid "Log file"
 msgstr "Logbestand"
 
-#: src/plugins/notification/notification_banner.c:358
+#: src/plugins/notification/notification_banner.c:360
 msgid "Folder:"
 msgstr "Map:"
 
@@ -11596,7 +11801,7 @@ msgstr "Map:"
 msgid "Select folder(s)"
 msgstr "Selecteer map(pen)"
 
-#: src/plugins/notification/notification_foldercheck.c:583
+#: src/plugins/notification/notification_foldercheck.c:581
 msgid "select recursively"
 msgstr "selecteer recursief"
 
@@ -11605,61 +11810,57 @@ msgid "No new messages"
 msgstr "Geen nieuwe berichten"
 
 #: src/plugins/notification/notification_plugin.c:220
-#: src/plugins/notification/notification_plugin.c:424
-#: 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/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
 msgid "Notification"
 msgstr "Meldingen"
 
-#: src/plugins/notification/notification_plugin.c:225
-msgid "The Notification plugin needs threading support."
-msgstr "De Meldingen-plugin heeft threading-ondersteuning nodig."
-
-#: src/plugins/notification/notification_plugin.c:232
+#: src/plugins/notification/notification_plugin.c:226
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 "Registreren van de 'folder item update'-hook in de Meldingen-plugin is "
 "mislukt"
 
-#: src/plugins/notification/notification_plugin.c:240
+#: src/plugins/notification/notification_plugin.c:234
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr "Registreren van 'folder update'-hook in de Meldingen-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:250
+#: src/plugins/notification/notification_plugin.c:244
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 "Registreren van 'msginfo update'-hook in de Meldingen-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:260
+#: src/plugins/notification/notification_plugin.c:254
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 "Registreren van 'offline switch'-hook in de Meldingen-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:271
+#: src/plugins/notification/notification_plugin.c:265
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 "Registreren van 'main window close'-hook in de Meldingen-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:284
+#: src/plugins/notification/notification_plugin.c:278
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr "Registreren van 'got iconified'-hook in de Meldingen-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:297
+#: src/plugins/notification/notification_plugin.c:291
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 "Registreren van 'account list changed'-hook in de Meldingen-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:310
+#: src/plugins/notification/notification_plugin.c:304
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr "Registreren van 'theme change'-hook in de Meldingen-plugin is mislukt"
 
-#: src/plugins/notification/notification_plugin.c:429
+#: src/plugins/notification/notification_plugin.c:423
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11674,7 +11875,7 @@ msgstr ""
 "instellingen-dialoog.\n"
 "Feedback naar <berndth at gmx.de> is welkom."
 
-#: src/plugins/notification/notification_plugin.c:454
+#: src/plugins/notification/notification_plugin.c:448
 msgid "Various tools"
 msgstr "Verschillend gereedschap"
 
@@ -11767,243 +11968,243 @@ msgid_plural "%d new messages"
 msgstr[0] "%d nieuw bericht"
 msgstr[1] "%d nieuwe berichten"
 
-#: src/plugins/notification/notification_prefs.c:421
+#: src/plugins/notification/notification_prefs.c:419
 msgid "Hotkeys"
 msgstr "Sneltoetsen"
 
-#: src/plugins/notification/notification_prefs.c:440
+#: src/plugins/notification/notification_prefs.c:438
 msgid "Banner"
 msgstr "Banner"
 
-#: src/plugins/notification/notification_prefs.c:458
+#: src/plugins/notification/notification_prefs.c:456
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:476 src/prefs_actions.c:262
+#: src/plugins/notification/notification_prefs.c:474 src/prefs_actions.c:264
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Opdracht"
 
-#: src/plugins/notification/notification_prefs.c:494
+#: src/plugins/notification/notification_prefs.c:492
 msgid "LCD"
 msgstr "LCD"
 
-#: src/plugins/notification/notification_prefs.c:512
+#: src/plugins/notification/notification_prefs.c:510
 msgid "SysTrayicon"
 msgstr "Systeemvak pictogram"
 
-#: src/plugins/notification/notification_prefs.c:530
+#: src/plugins/notification/notification_prefs.c:528
 msgid "Indicator"
 msgstr "Indicator"
 
-#: src/plugins/notification/notification_prefs.c:613
+#: src/plugins/notification/notification_prefs.c:611
 msgid "Include folder types"
 msgstr "Voeg maptypen toe"
 
-#: src/plugins/notification/notification_prefs.c:622
+#: src/plugins/notification/notification_prefs.c:620
 msgid "Mail folders"
 msgstr "Mailmappen"
 
-#: src/plugins/notification/notification_prefs.c:630
+#: src/plugins/notification/notification_prefs.c:628
 msgid "News folders"
 msgstr "Nieuwsmappen"
 
-#: src/plugins/notification/notification_prefs.c:638
+#: src/plugins/notification/notification_prefs.c:636
 msgid "RSSyl folders"
 msgstr "RSSyl-mappen"
 
-#: src/plugins/notification/notification_prefs.c:646
+#: src/plugins/notification/notification_prefs.c:644
 msgid "vCalendar folders"
 msgstr "vCalender-mappen"
 
-#: src/plugins/notification/notification_prefs.c:654
+#: src/plugins/notification/notification_prefs.c:652
 msgid "These settings override folder-specific selections."
 msgstr "Deze instellingen overschrijven map-specifieke selecties."
 
-#: src/plugins/notification/notification_prefs.c:665
+#: src/plugins/notification/notification_prefs.c:663
 msgid "Global notification settings"
 msgstr "Globale melding-instellingen"
 
-#: src/plugins/notification/notification_prefs.c:674
+#: src/plugins/notification/notification_prefs.c:672
 msgid "Set window manager urgency hint when new messages exist"
 msgstr "Stel vensterbeheerder hint in wanneer er nieuwe berichten zijn"
 
-#: src/plugins/notification/notification_prefs.c:683
+#: src/plugins/notification/notification_prefs.c:681
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr "Stel vensterbeheerder hint in wanneer er ongelezen berichten zijn"
 
-#: src/plugins/notification/notification_prefs.c:693
+#: src/plugins/notification/notification_prefs.c:691
 msgid "Use sound theme"
 msgstr "Geluids-thema gebruiken"
 
-#: src/plugins/notification/notification_prefs.c:765
+#: src/plugins/notification/notification_prefs.c:763
 msgid "Show banner"
 msgstr "Geef banner weer"
 
-#: src/plugins/notification/notification_prefs.c:770
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/plugins/notification/notification_prefs.c:768
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nooit"
 
-#: src/plugins/notification/notification_prefs.c:772 src/prefs_receive.c:229
-#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
+#: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
+#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
 msgid "Always"
 msgstr "Altijd"
 
-#: src/plugins/notification/notification_prefs.c:774
+#: src/plugins/notification/notification_prefs.c:772
 msgid "Only when not empty"
 msgstr "Alleen wanneer niet leeg"
 
-#: src/plugins/notification/notification_prefs.c:793
+#: src/plugins/notification/notification_prefs.c:791
 msgid "Banner speed"
 msgstr "Bannersnelheid"
 
-#: src/plugins/notification/notification_prefs.c:830
+#: src/plugins/notification/notification_prefs.c:828
 msgid "Maximum number of messages"
 msgstr "Maximum aantal berichten"
 
-#: src/plugins/notification/notification_prefs.c:836
+#: src/plugins/notification/notification_prefs.c:834
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "Beperk het aantal getoonde berichten, gebruik 0 voor onbeperkt"
 
-#: src/plugins/notification/notification_prefs.c:845
+#: src/plugins/notification/notification_prefs.c:843
 msgid "Banner width"
 msgstr "Bannerbreedte"
 
-#: src/plugins/notification/notification_prefs.c:851
+#: src/plugins/notification/notification_prefs.c:849
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "Beperk de afmetingen van de banner, gebruik 0 voor schermbreedte"
 
-#: src/plugins/notification/notification_prefs.c:853
+#: src/plugins/notification/notification_prefs.c:851
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/plugins/notification/notification_prefs.c:862
+#: src/plugins/notification/notification_prefs.c:860
 msgid "Include unread mails in banner"
 msgstr "Voeg ongelezen e-mails bij in banner"
 
-#: src/plugins/notification/notification_prefs.c:870
+#: src/plugins/notification/notification_prefs.c:868
 msgid "Make banner sticky"
 msgstr "Maak banner klevend"
 
-#: src/plugins/notification/notification_prefs.c:880
-#: src/plugins/notification/notification_prefs.c:1080
-#: src/plugins/notification/notification_prefs.c:1371
-#: src/plugins/notification/notification_prefs.c:1606
+#: 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
 msgid "Only include selected folders"
 msgstr "Voeg alleen geselecteerde mappen bij"
 
-#: src/plugins/notification/notification_prefs.c:889
-#: src/plugins/notification/notification_prefs.c:1089
-#: src/plugins/notification/notification_prefs.c:1380
-#: src/plugins/notification/notification_prefs.c:1615
+#: 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
 msgid "Select folders..."
 msgstr "Selecteer mappen..."
 
-#: src/plugins/notification/notification_prefs.c:901
+#: src/plugins/notification/notification_prefs.c:899
 msgid "Banner colors"
 msgstr "Bannerkleuren"
 
-#: src/plugins/notification/notification_prefs.c:905
-#: src/plugins/notification/notification_prefs.c:1121
+#: src/plugins/notification/notification_prefs.c:903
+#: src/plugins/notification/notification_prefs.c:1114
 msgid "Use custom colors"
 msgstr "Gebruik eigen kleuren"
 
-#: src/plugins/notification/notification_prefs.c:920
-#: src/plugins/notification/notification_prefs.c:1135
+#: src/plugins/notification/notification_prefs.c:918
+#: src/plugins/notification/notification_prefs.c:1128
 msgid "Foreground"
 msgstr "Voorgrond"
 
-#: src/plugins/notification/notification_prefs.c:926
-#: src/plugins/notification/notification_prefs.c:1141
+#: src/plugins/notification/notification_prefs.c:922
+#: src/plugins/notification/notification_prefs.c:1134
 msgid "Foreground color"
 msgstr "Voorgrondkleur"
 
-#: src/plugins/notification/notification_prefs.c:931
-#: src/plugins/notification/notification_prefs.c:1147
-#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
-#: src/prefs_msg_colors.c:284
+#: src/plugins/notification/notification_prefs.c:927
+#: src/plugins/notification/notification_prefs.c:1140
+#: src/prefs_msg_colors.c:251 src/prefs_msg_colors.c:265
+#: src/prefs_msg_colors.c:279
 msgid "Background"
 msgstr "Achtergrond"
 
-#: src/plugins/notification/notification_prefs.c:937
-#: src/plugins/notification/notification_prefs.c:1153
+#: src/plugins/notification/notification_prefs.c:931
+#: src/plugins/notification/notification_prefs.c:1146
 msgid "Background color"
 msgstr "Achtergrondkleur"
 
-#: src/plugins/notification/notification_prefs.c:1044
-#: src/plugins/notification/notification_prefs.c:1641
+#: src/plugins/notification/notification_prefs.c:1037
+#: src/plugins/notification/notification_prefs.c:1634
 msgid "Enable popup"
 msgstr "Zet popup aan"
 
-#: src/plugins/notification/notification_prefs.c:1061
-#: src/plugins/notification/notification_prefs.c:1659
+#: src/plugins/notification/notification_prefs.c:1054
+#: src/plugins/notification/notification_prefs.c:1652
 msgid "Popup timeout"
 msgstr "Popup tijdslimiet"
 
-#: src/plugins/notification/notification_prefs.c:1100
+#: src/plugins/notification/notification_prefs.c:1093
 msgid "Make popup sticky"
 msgstr "Maak popup klevend"
 
-#: src/plugins/notification/notification_prefs.c:1110
+#: src/plugins/notification/notification_prefs.c:1103
 msgid "Set popup window width and position"
 msgstr "Stel van popupvenster de breedte en positie in"
 
-#: src/plugins/notification/notification_prefs.c:1115
+#: src/plugins/notification/notification_prefs.c:1108
 msgid "(the window manager is free to ignore this)"
 msgstr "(de vensterbeheerder is vrij om dit te negeren)"
 
-#: src/plugins/notification/notification_prefs.c:1165
-#: src/plugins/notification/notification_prefs.c:1671
+#: src/plugins/notification/notification_prefs.c:1158
+#: src/plugins/notification/notification_prefs.c:1664
 msgid "Display folder name"
 msgstr "Geef mapnaam weer"
 
-#: src/plugins/notification/notification_prefs.c:1224
+#: src/plugins/notification/notification_prefs.c:1217
 msgid "Sample popup window"
 msgstr "Voorbeeld popupvenster"
 
-#: src/plugins/notification/notification_prefs.c:1230
+#: src/plugins/notification/notification_prefs.c:1223
 msgid "Done"
 msgstr "Klaar"
 
-#: src/plugins/notification/notification_prefs.c:1288
+#: src/plugins/notification/notification_prefs.c:1281
 msgid "Select command"
 msgstr "Selecteer opdracht"
 
-#: src/plugins/notification/notification_prefs.c:1317
+#: src/plugins/notification/notification_prefs.c:1310
 msgid "Enable command"
 msgstr "Zet programma aan"
 
-#: src/plugins/notification/notification_prefs.c:1334 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1327 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Programma om uit te voeren"
 
-#: src/plugins/notification/notification_prefs.c:1352
+#: src/plugins/notification/notification_prefs.c:1345
 msgid "Block command after execution for"
 msgstr "Blokkeer commando na uitvoeren voor"
 
-#: src/plugins/notification/notification_prefs.c:1459
+#: src/plugins/notification/notification_prefs.c:1452
 msgid "Enable LCD"
 msgstr "Zet LCD aan"
 
-#: src/plugins/notification/notification_prefs.c:1478
+#: src/plugins/notification/notification_prefs.c:1471
 msgid "Hostname:Port of LCDd server"
 msgstr "Hostnaam:Poort van LCDd-server"
 
-#: src/plugins/notification/notification_prefs.c:1563
+#: src/plugins/notification/notification_prefs.c:1556
 msgid "Enable Trayicon"
 msgstr "Zet Systeemvak-pictogram aan"
 
-#: src/plugins/notification/notification_prefs.c:1579
+#: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
 msgstr "Verberg bij opstarten"
 
-#: src/plugins/notification/notification_prefs.c:1587
+#: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
 msgstr "Verplaats naar systeemvak"
 
-#: src/plugins/notification/notification_prefs.c:1595
+#: src/plugins/notification/notification_prefs.c:1588
 msgid "Hide when iconified"
 msgstr "Verberg wanneer geïconifeerd"
 
@@ -12013,38 +12214,38 @@ msgstr "Verberg wanneer geïconifeerd"
 #. 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:1632
+#: src/plugins/notification/notification_prefs.c:1625
 msgid "Passive toaster popup"
 msgstr "Passieve popup"
 
-#: src/plugins/notification/notification_prefs.c:1796
+#: src/plugins/notification/notification_prefs.c:1789
 msgid "Add to Indicator Applet"
 msgstr "Voeg toe aan Indicator Applet"
 
-#: src/plugins/notification/notification_prefs.c:1810
+#: src/plugins/notification/notification_prefs.c:1803
 msgid "Hide mainwindow when minimized"
 msgstr "Verberg hoofdvenster wanneer geiconifeerd"
 
-#: src/plugins/notification/notification_prefs.c:1863
+#: src/plugins/notification/notification_prefs.c:1856
 msgid "Enable global hotkeys"
 msgstr "Gebruik globale sneltoetsen"
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr ""
 "Voorbeelden van toestenbordcombinaties zijn onder andere <b>%s</b> en <b>%s</"
 "b>"
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<alt>N"
 msgstr "<alt>N"
 
-#: src/plugins/notification/notification_prefs.c:1889
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "Toggle minimize"
 msgstr "Klik om te minimaliseren"
 
@@ -12159,96 +12360,96 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Geoptimaliseerd:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1228
+#: src/plugins/pdf_viewer/poppler_viewer.c:1233
 msgid "PDF properties"
 msgstr "PDF-eigenschappen"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1377
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 msgid "Enter password"
 msgstr "Invoeren wachtwoord"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1378
+#: src/plugins/pdf_viewer/poppler_viewer.c:1383
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 "Dit document is beveiligd en vereist een wachtwoord om geopend te worden."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1393
+#: src/plugins/pdf_viewer/poppler_viewer.c:1398
 #, c-format
 msgid "%s Document"
 msgstr "%s Document"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1399
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 #, c-format
 msgid "of %d"
 msgstr "van %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1415
+#: src/plugins/pdf_viewer/poppler_viewer.c:1420
 msgid "PDF rendering failed for an unknown reason."
 msgstr "PDF-weergave is om een onbekende reden mislukt."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1787
-#: src/plugins/pdf_viewer/poppler_viewer.c:1996
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Inhoudsopgave"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "Eerste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Vorige pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Volgende Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Laatste Pagina"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1973
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Zoom in"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Zoom uit"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Paginabreed passend"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Roteer naar links"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Roteer naar rechts"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Document afdrukken"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1993
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Document Info"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Pagina Nummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2000
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Zoom Factor"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2111
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12261,13 +12462,13 @@ msgstr ""
 "\n"
 "Feedback is welkom: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2117
-#: src/plugins/pdf_viewer/poppler_viewer.c:2125
-#: src/plugins/pdf_viewer/poppler_viewer.c:2145
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "PDF Lezer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2121
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12283,7 +12484,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/perl/perl_gtk.c:50
+#: src/plugins/perl/perl_gtk.c:48
 msgid "Edit perl filter rules (ext)..."
 msgstr "Bewerk perl filterregels (ext)..."
 
@@ -12299,35 +12500,35 @@ msgstr "Wachtwoord"
 msgid "[no user id]"
 msgstr "[geen gebruikers-ID]"
 
-# c-format
 #: src/plugins/pgpcore/passphrase.c:260
-msgid "Please enter the passphrase for the new key:"
-msgstr "Geef het wachtwoord voor de nieuwe sleutel:"
-
-#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr "Wachtwoord was niet hetzelfde.\n"
 
 # c-format
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:261
+msgid "Please enter the passphrase for the new key:"
+msgstr "Geef het wachtwoord voor de nieuwe sleutel:"
+
+# c-format
+#: src/plugins/pgpcore/passphrase.c:265
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Geef nogmaals het wachtwoord voor de nieuwe sleutel:"
 
-#: src/plugins/pgpcore/passphrase.c:272
-msgid "Please enter the passphrase for:"
-msgstr "Geef het wachtwoord voor:"
-
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:269
 msgid "Bad passphrase.\n"
 msgstr "Fout wachtwoord. Probeer opnieuw...\n"
 
+#: src/plugins/pgpcore/passphrase.c:270
+msgid "Please enter the passphrase for:"
+msgstr "Geef het wachtwoord voor:"
+
 #: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Sleutel importeren"
 
 #: src/plugins/pgpcore/pgp_viewer.c:180
 msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it?"
+"This key is not in your keyring. Do you want Claws Mail to try to import it?"
 msgstr ""
 "Deze sleutel zit niet aan je sleutelring. Wil je dat Claws Mail probeert om "
 "hem te importeren?"
@@ -12336,7 +12537,7 @@ msgstr ""
 msgid "from keyserver"
 msgstr "van sleutelserver"
 
-#: src/plugins/pgpcore/pgp_viewer.c:182
+#: src/plugins/pgpcore/pgp_viewer.c:183
 msgid "from Web Key Directory"
 msgstr "van sleutelmap van website"
 
@@ -12427,7 +12628,7 @@ msgstr ""
 "Het wordt gebruikt door andere plugins zoals PGP/Mime.\n"
 "\n"
 "Opties kunnen worden gevonden in /Instellingen/Voorkeuren/Plugins/GPG en /"
-"Instellingen/[Accountvoorkeuren]/Plugins/GPG\n"
+"Instellingen/[Account-voorkeuren]/Plugins/GPG\n"
 "\n"
 "De plugin gebruikt de GPGME-bibliotheek als een schil om GnuPG.\n"
 "\n"
@@ -12463,9 +12664,9 @@ msgstr ""
 "Instellen op 0 zal het wachtwoord voor de hele\n"
 "sessie opslaan"
 
-#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: 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
 msgid "minutes"
 msgstr "minuten"
 
@@ -12524,69 +12725,69 @@ msgstr "Genereer een nieuw sleutelpaar"
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:35
+#: src/plugins/smime/smime.c:1078
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "Geen exacte overeenkomst gevonden voor '%s', selecteer de sleutel."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Info wordt verzameld voor '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Niet gedefiniëerd"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:166
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Marginaal"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
-#: src/plugins/pgpcore/sgpgme.c:170
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Ultiem"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Selecteer sleutels"
 
-#: src/plugins/pgpcore/select-keys.c:458
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "Sleutel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:476
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Vertrouw"
 
-#: src/plugins/pgpcore/select-keys.c:495
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "D_iversen"
 
-#: src/plugins/pgpcore/select-keys.c:496
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "_Niet versleutelen"
 
-#: src/plugins/pgpcore/select-keys.c:677
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Sleutel toevoegen"
 
-#: src/plugins/pgpcore/select-keys.c:678
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Kies een ander gebruikers- of sleutel-ID:"
 
-#: src/plugins/pgpcore/select-keys.c:700
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Versleutelen naar %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:701
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -12606,180 +12807,179 @@ msgstr ""
 "\n"
 "Vertrouw je deze sleutel genoeg om hem toch te gebruiken?"
 
-#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
-#: src/privacy.c:270 src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:281 src/privacy.c:286
 msgid "No signature found"
 msgstr "Geen ondertekening gevonden"
 
-#: src/plugins/pgpcore/sgpgme.c:164
+#: src/plugins/pgpcore/sgpgme.c:350
 msgid "Untrusted"
 msgstr "Niet vertrouwd"
 
-#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:424 src/plugins/pgpcore/sgpgme.c:443
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "De ondertekening kan niet worden gecontroleerd - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
+#: src/plugins/pgpcore/sgpgme.c:428 src/plugins/pgpcore/sgpgme.c:432
 msgid "The signature has not been checked."
 msgstr "Deze ondertekening is nog niet gecontroleerd."
 
-#: src/plugins/pgpcore/sgpgme.c:252
+#: src/plugins/pgpcore/sgpgme.c:438
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Geen sleutel, er draait geen gpg-agent."
 
-#: src/plugins/pgpcore/sgpgme.c:270
+#: src/plugins/pgpcore/sgpgme.c:456
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [ultimate]"
 
-#: src/plugins/pgpcore/sgpgme.c:273
+#: src/plugins/pgpcore/sgpgme.c:459
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [volledig]"
 
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:462
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Goedgekeurde ondertekening van \"%s\" [beperkt]"
 
-#: src/plugins/pgpcore/sgpgme.c:283
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Goedgekeurde ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
+#: src/plugins/pgpcore/sgpgme.c:471 src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "Sleutel 0x%s niet beschikbaar om deze ondertekening te verifiëren"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:477
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verlopen ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:294
+#: src/plugins/pgpcore/sgpgme.c:480
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is verlopen"
 
-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:483
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Goedgekeurde ondertekening van \"%s\", maar de sleutel is ingetrokken"
 
-#: src/plugins/pgpcore/sgpgme.c:300
+#: src/plugins/pgpcore/sgpgme.c:486
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Foutieve ondertekening van \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:493
 msgid "The signature has not been checked"
 msgstr "Deze ondertekening is nog niet gecontroleerd"
 
-#: src/plugins/pgpcore/sgpgme.c:330
+#: src/plugins/pgpcore/sgpgme.c:516
 msgid "Error checking signature: no status\n"
 msgstr "Fout bij het controleren van de ondertekening: no status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:535
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fout bij het controleren van de ondertekening: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:553
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "Ondertekening gemaakt op %s met %s sleutel-ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:559
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Goedgekeurde ondertekening van \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:564
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Verlopen sleutel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:569
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "Verlopen ondertekening van uid \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:574
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Ingetrokken sleutel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:392
+#: src/plugins/pgpcore/sgpgme.c:579
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "FOUTIEVE ondertekening van \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:405
+#: src/plugins/pgpcore/sgpgme.c:591
 #, c-format
-msgid "uid \"%s\" (Validity: %s)\n"
-msgstr "uid \"%s\" (Vertrouwen: %s)\n"
+msgid "                    uid \"%s\" (Validity: %s)\n"
+msgstr "                uid \"%s\" (Vertrouwen: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:593
 msgid "Revoked"
 msgstr "Ingetrokken"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:598
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Betrouwbaarheid eigenaar: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:413
+#: src/plugins/pgpcore/sgpgme.c:599
 msgid "No key!"
 msgstr "Geen sleutel."
 
-#: src/plugins/pgpcore/sgpgme.c:415
+#: src/plugins/pgpcore/sgpgme.c:601
 msgid "Primary key fingerprint:"
 msgstr "Vingerafdruk van primaire sleutel:"
 
-#: src/plugins/pgpcore/sgpgme.c:433
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "Waarschuwing: Adres van ondertekenaar \"%s\" klopt niet met DNS ingang\n"
 
-#: src/plugins/pgpcore/sgpgme.c:439
+#: src/plugins/pgpcore/sgpgme.c:625
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Adres van geverifieerde ondertekenaar is \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:473
+#: src/plugins/pgpcore/sgpgme.c:660
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Kon geen gegevens van bericht verkrijgen, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:489
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kon gegevens initialiseren, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:855
 msgid "Secret key specification is ambiguous"
 msgstr "Geheime sleutel-specificatie is onduidelijk"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:865
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Geheime sleutel niet gevonden (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:689
+#: src/plugins/pgpcore/sgpgme.c:878
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fout bij instellen geheime sleutel: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:782
+#: src/plugins/pgpcore/sgpgme.c:971
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' is niet goed geïnstalleerd."
 
-#: src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/pgpcore/sgpgme.c:977
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12788,12 +12988,12 @@ msgstr ""
 "Gpgme-protocol '%s' is onbruikbaar: Engine '%s' versie %s is geïnstalleerd, "
 "maar versie %s is nodig.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:796
+#: src/plugins/pgpcore/sgpgme.c:985
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-protocol '%s' is onbruikbaar (onbekend probleem)"
 
-#: src/plugins/pgpcore/sgpgme.c:812
+#: src/plugins/pgpcore/sgpgme.c:1001
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12801,7 +13001,7 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of moet worden bijgewerkt.\n"
 "OpenPGP-ondersteuning wordt uitgeschakeld."
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:1078
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12809,11 +13009,11 @@ msgstr ""
 "Je dient de informatie van het account op te slaan door op \"OK\" te klikken "
 "alvorens je een sleutelpaar kunt aanmaken.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:894
+#: src/plugins/pgpcore/sgpgme.c:1083
 msgid "No PGP key found"
 msgstr "Geen PGP-sleutel gevonden"
 
-#: src/plugins/pgpcore/sgpgme.c:895
+#: src/plugins/pgpcore/sgpgme.c:1084
 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"
@@ -12823,12 +13023,12 @@ msgstr ""
 "berichten kunt ondertekenen of versleutelde berichten kunt ontvangen.\n"
 "Wil je nu een sleutelpaar aanmaken?"
 
-#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
+#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:994
+#: src/plugins/pgpcore/sgpgme.c:1184
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12836,11 +13036,11 @@ msgstr ""
 "Je nieuwe sleutelpaar wordt nu aangemaakt... Beweeg je muis heen en weer om "
 "te helpen bij het maken van entropie..."
 
-#: src/plugins/pgpcore/sgpgme.c:1012
+#: src/plugins/pgpcore/sgpgme.c:1202
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kon nieuw sleutelpaar niet aanmaken: onbekende fout"
 
-#: src/plugins/pgpcore/sgpgme.c:1016
+#: src/plugins/pgpcore/sgpgme.c:1206
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12853,62 +13053,41 @@ msgstr ""
 "\n"
 "Wil je de sleutel exporteren naar een sleutelserver?"
 
-#: src/plugins/pgpcore/sgpgme.c:1020
+#: src/plugins/pgpcore/sgpgme.c:1210
 msgid "Key generated"
 msgstr "Seutel aangemaakt"
 
-#: src/plugins/pgpcore/sgpgme.c:1096
+#: src/plugins/pgpcore/sgpgme.c:1286
 msgid "Key exported."
 msgstr "Sleutel geëxporteerd."
 
-#: src/plugins/pgpcore/sgpgme.c:1098
+#: src/plugins/pgpcore/sgpgme.c:1288
 msgid "Couldn't export key."
 msgstr "Kon sleutel niet exporteren."
 
-#: src/plugins/pgpinline/pgpinline.c:156
-msgid "Incorrect part"
-msgstr "Incorrect gedeelte"
-
-#: src/plugins/pgpinline/pgpinline.c:160
-msgid "Not a text part"
-msgstr "Geen tekst gedeelte"
+#: src/plugins/pgpinline/pgpinline.c:385
+msgid "Couldn't parse mime part."
+msgstr "Kon mime-gedeelte van bericht niet lezen."
 
-#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
+#: src/plugins/pgpinline/pgpinline.c:392
 msgid "Couldn't get text data."
 msgstr "Kon tekstgegevens niet vinden."
 
-#: src/plugins/pgpinline/pgpinline.c:189
-msgid "Couldn't convert text data to any sane charset."
-msgstr "Kon tekstgegevens naar geen enkel zinnige karakterset converteren."
-
-#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
-#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
-#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
-#: src/plugins/smime/smime.c:418
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "Kon de GPG-context niet initialiseren, %s"
-
-#: src/plugins/pgpinline/pgpinline.c:316
-msgid "Couldn't parse mime part."
-msgstr "Kon mime-gedeelte van bericht niet lezen."
-
-#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
+#: src/plugins/pgpinline/pgpinline.c:423 src/plugins/pgpmime/pgpmime.c:262
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet openen"
 
-#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
-#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
-#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
-#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#: src/plugins/pgpinline/pgpinline.c:442 src/plugins/pgpinline/pgpinline.c:451
+#: src/plugins/pgpinline/pgpinline.c:460 src/plugins/pgpinline/pgpinline.c:468
+#: src/plugins/pgpinline/pgpinline.c:478 src/plugins/pgpinline/pgpinline.c:487
+#: src/plugins/pgpmime/pgpmime.c:274 src/plugins/pgpmime/pgpmime.c:289
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet wegschrijven"
 
-#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
-#: src/plugins/pgpinline/pgpinline.c:379
+#: src/plugins/pgpinline/pgpinline.c:456 src/plugins/pgpinline/pgpinline.c:457
+#: src/plugins/pgpinline/pgpinline.c:458
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12916,53 +13095,61 @@ msgstr ""
 "\n"
 "--- Begin van PGP/Ingesloten versleutelde data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
-#: src/plugins/pgpinline/pgpinline.c:397
+#: 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 "--- Einde van PGP/Ingesloten versleutelde data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
+#: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpmime/pgpmime.c:302
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Kon gedecodeerd bestand %s niet sluiten"
 
-#: src/plugins/pgpinline/pgpinline.c:428
+#: src/plugins/pgpinline/pgpinline.c:509
 msgid "Couldn't scan decrypted file."
 msgstr "Kon gedecodeerd bestand niet scannen."
 
-#: src/plugins/pgpinline/pgpinline.c:436
+#: src/plugins/pgpinline/pgpinline.c:518
 msgid "Couldn't scan decrypted file parts."
 msgstr "Kon gedecodeerde bestandsonderdelen niet scannen."
 
-#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
+#: src/plugins/pgpinline/pgpinline.c:575 src/plugins/pgpinline/pgpinline.c:770
 msgid "Malformed message"
 msgstr "Vervormd bericht"
 
-#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
-#: src/plugins/pgpmime/pgpmime.c:696
+#: src/plugins/pgpinline/pgpinline.c:586 src/plugins/pgpinline/pgpinline.c:784
+#: src/plugins/pgpmime/pgpmime.c:614
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Kon tijdelijk bestand niet aanmaken, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
+#: src/plugins/pgpinline/pgpinline.c:601 src/plugins/pgpinline/pgpinline.c:740
+#: src/plugins/pgpinline/pgpinline.c:805 src/plugins/pgpmime/pgpmime.c:230
+#: src/plugins/pgpmime/pgpmime.c:425 src/plugins/pgpmime/pgpmime.c:569
+#: src/plugins/smime/smime.c:559
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "Kon de GPG-context niet initialiseren, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:625 src/plugins/pgpmime/pgpmime.c:452
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Gegevens ondertekenen mislukt, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
+#: src/plugins/pgpinline/pgpinline.c:643 src/plugins/pgpmime/pgpmime.c:479
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Gegevens ondertekenen mislukt wegens ongeldige ondertekenaar: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
+#: src/plugins/pgpinline/pgpinline.c:652 src/plugins/pgpmime/pgpmime.c:488
 msgid "Data signing failed, no results."
 msgstr "Gegevens ondertekenen mislukt, geen resultaten."
 
-#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
+#: src/plugins/pgpinline/pgpinline.c:662 src/plugins/pgpmime/pgpmime.c:499
 msgid "Data signing failed, no contents."
 msgstr "Gegevens ondertekenen mislukt, geen inhoud."
 
-#: src/plugins/pgpinline/pgpinline.c:624
+#: src/plugins/pgpinline/pgpinline.c:706
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12970,17 +13157,17 @@ msgstr ""
 "Let op dat bijlages niet worden versleuteld door het PGP/Ingesloten systeem, "
 "noch e-mail-headers, zoals Onderwerp."
 
-#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:580
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Kon GPG-sleutel niet toevoegen %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpinline/pgpinline.c:823 src/plugins/pgpmime/pgpmime.c:649
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Versleutelen mislukt, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:796
+#: src/plugins/pgpinline/pgpinline.c:892
 msgid "PGP/Inline"
 msgstr "PGP/Ingesloten"
 
@@ -13007,35 +13194,31 @@ msgstr ""
 "ondertekeningen verifiëren of zelf berichten versleutelen en ondertekenen.\n"
 "\n"
 "Je kunt het selecteren als het standaard privacy-systeem in /Instellingen/"
-"[Account voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
+"[Account-voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
 "bent in /Opties/Privacy systeem\n"
 "\n"
 "De plugin gebruikt de GPGME-bibliotheek als een schil om GnuPG.\n"
 "\n"
 "GPGME auteursrecht 2001 door Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:204
-msgid "Signature boundary not found."
-msgstr "Grens van ondertekening niet gevonden."
-
-#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
+#: src/plugins/pgpmime/pgpmime.c:314 src/plugins/smime/smime.c:653
 msgid "Couldn't parse decrypted file."
 msgstr "Kon gedecodeerd bestand niet lezen."
 
-#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
+#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/smime/smime.c:661
 msgid "Couldn't parse decrypted file parts."
 msgstr "Kon gedecodeerde bestandsonderdelen niet lezen."
 
-#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
+#: src/plugins/pgpmime/pgpmime.c:369 src/plugins/pgpmime/pgpmime.c:408
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Kon tijdelijk bestand niet aanmaken: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:599
+#: src/plugins/pgpmime/pgpmime.c:513
 msgid "OpenPGP digital signature"
 msgstr "OpenPGP digitale ondertekening"
 
-#: src/plugins/pgpmime/pgpmime.c:622
+#: src/plugins/pgpmime/pgpmime.c:536
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -13043,7 +13226,7 @@ msgstr ""
 "Let op dat e-mail-headers, zoals Onderwerp, niet versleuteld worden door het "
 "PGP/Mime-systeem."
 
-#: src/plugins/pgpmime/pgpmime.c:798
+#: src/plugins/pgpmime/pgpmime.c:723
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -13069,7 +13252,7 @@ msgstr ""
 "ondertekenen en versleutelen.\n"
 "\n"
 "Je kunt het selecteren als het standaard privacy-systeem in /Instellingen/"
-"[Account voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
+"[Account-voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
 "bent in /Opties/Privacy systeem\n"
 "\n"
 "De plugin gebruikt de GPGME-bibliotheek als een schil om GnuPG.\n"
@@ -13086,26 +13269,26 @@ msgid "Show Python console..."
 msgstr "Geef Python-console weer..."
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:471
+#: src/plugins/rssyl/rssyl_feed_props.c:470
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2986
-#: src/prefs_account.c:3014 src/prefs_account.c:3442 src/wizard.c:1212
-#: src/wizard.c:1642
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Bekijk"
 
-#: src/plugins/python/python_plugin.c:673
-#: src/plugins/python/python_plugin.c:760
+#: src/plugins/python/python_plugin.c:635
+#: src/plugins/python/python_plugin.c:722
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:682
+#: src/plugins/python/python_plugin.c:644
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "Registreren van 'compose create'-hook in de Python-plugin is mislukt"
 
-#: src/plugins/python/python_plugin.c:765
+#: src/plugins/python/python_plugin.c:727
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -13196,11 +13379,11 @@ msgstr ""
 "\n"
 "Feedback naar <berndth at gmx.de> is welkom."
 
-#: src/plugins/python/python_plugin.c:816
+#: src/plugins/python/python_plugin.c:778
 msgid "Python integration"
 msgstr "Python integratie"
 
-#: src/plugins/rssyl/old_feeds.c:90
+#: src/plugins/rssyl/old_feeds.c:92
 #, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
@@ -13265,40 +13448,40 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(leegmaken)"
 
-#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
 msgid "Refresh all feeds"
 msgstr "Ververs alle feeds"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 msgid "Subscribe feed"
 msgstr "Abonneer op feed"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:67
+#: src/plugins/rssyl/rssyl_cb_menu.c:100
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "Voer de URL in van de nieuwsfeed waarop je wilt abonneren:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:136
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' mag niet in de naam van een map voorkomen."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws-Mail heeft netwerktoegang nodig om de feed te verversen."
 msgstr[1] "Claws-Mail heeft netwerktoegang nodig om de feeds te verversen."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:321
+#: src/plugins/rssyl/rssyl_cb_menu.c:359
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "Werkelijk de feedboom '%s' verwijderen?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:322
+#: src/plugins/rssyl/rssyl_cb_menu.c:360
 msgid "Remove feed tree"
 msgstr "Verwijder feedboom"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_cb_menu.c:395
 msgid "Select an OPML file"
 msgstr "Selecteer een OPML bestand"
 
@@ -13342,53 +13525,53 @@ msgstr "RSSyl: Kon feed niet verwerken van '%s'\n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: Applicatie wordt beeindigd, kon feed niet verversen op '%s'\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:270
+#: src/plugins/rssyl/rssyl_feed_props.c:269
 msgid "HTTP Basic authentication"
 msgstr "HTTP Basale authenticatie"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:292
+#: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Gebruik standaard verversings-interval"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:304
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
 msgstr "Bewaar oude items"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:310
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
 msgstr "_Trim"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 "Verversen feed, verwijderen van items die niet langer in de feedbron "
 "aanwezig zijn"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:315
+#: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Haal reacties op indien mogelijk"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:335
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Always mark it as new"
 msgstr "Altijd markeren als nieuw"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:336
 msgid "Only mark it as new if its text has changed"
 msgstr "Alleen als nieuw markeren als de tekst is gewijzigd"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Never mark it as new"
 msgstr "Nooit markeren als nieuw"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:344
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 msgid "Add item title to the top of message"
 msgstr "Voeg item-titel toe aan bovenkant van bericht"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Ignore title rename"
 msgstr "Titel hernoemen negeren"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13396,50 +13579,50 @@ msgstr ""
 "Activeren om de huidige mapnaam te behouden, zelfs wanneer de feed-auteur de "
 "titel van de feed wijzigt."
 
-#: src/plugins/rssyl/rssyl_feed_props.c:360
-#: src/plugins/vcalendar/vcal_prefs.c:593
-msgid "Verify SSL/TLS certificate validity"
-msgstr "Verifieer geldigheid van SSL/TLS-certificaat"
+#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/vcalendar/vcal_prefs.c:594
+msgid "Verify TLS certificate validity"
+msgstr "Verifieer geldigheid van TLS-certificaat"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:380
+#: src/plugins/rssyl/rssyl_feed_props.c:379
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "Source URL"
 msgstr "Bron-URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:406
+#: src/plugins/rssyl/rssyl_feed_props.c:405
 msgid "Fetch comments on posts aged less than"
 msgstr "Haal reacties op van berichten jonger dan"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
-#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:572 src/prefs_matcher.c:340
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: 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
 msgid "days"
 msgstr "dagen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:415
+#: src/plugins/rssyl/rssyl_feed_props.c:414
 msgid "Set to -1 to fetch all comments"
 msgstr "Stel in op -1 om alle reacties op te halen"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:439
+#: src/plugins/rssyl/rssyl_feed_props.c:438
 msgid "If an item changes"
 msgstr "Alleen als de tekst is veranderd"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:444
+#: src/plugins/rssyl/rssyl_feed_props.c:443
 msgid "Items"
 msgstr "Items"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:457
+#: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Refresh interval"
 msgstr "Verversingsinterval"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:465
+#: src/plugins/rssyl/rssyl_feed_props.c:464
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "Stel in op 0 om automatische verversing uit te zetten voor deze feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:517
+#: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "Set feed properties"
 msgstr "Stel feed-eigenschappen in"
 
@@ -13510,8 +13693,8 @@ msgid "Refresh all feeds on application start"
 msgstr "Ververs alle feeds bij het starten van het programma"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-msgid "Verify SSL/TLS certificates validity for new feeds"
-msgstr "Verifieer geldigheid van SSL/TLS-certificaat voor nieuwe feeds"
+msgid "Verify TLS certificates validity for new feeds"
+msgstr "Verifieer geldigheid van TLS-certificaat voor nieuwe feeds"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
 msgid "Path to cookies file"
@@ -13554,13 +13737,13 @@ msgstr ""
 msgid "_Edit feed properties after subscribing"
 msgstr "_Bewerk feed-eigenschappen na het abonneren"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:107
+#: src/plugins/rssyl/rssyl_update_comments.c:109
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "Bijwerken reacties voor '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1624
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Autorisatie vereist)"
 
@@ -13569,7 +13752,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Verboden)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1630
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Niet gevonden)"
 
@@ -13641,7 +13824,7 @@ msgstr ""
 "gebeuren. Maak een foutrapport aan, met de foutopsporingsuitvoer "
 "bijgevoegd.\n"
 
-#: src/plugins/smime/plugin.c:59
+#: src/plugins/smime/plugin.c:61
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
@@ -13665,8 +13848,8 @@ msgstr ""
 "ondertekenen en versleutelen.\n"
 "\n"
 "Je kunt het selecteren als het standaard privacy-systeem in /Instellingen/"
-"[Voorkeuren huidig account]/Privacy en wanneer je een bericht aan het "
-"opstellen bent in /Opties/Privacy-systeem\n"
+"[Account-voorkeuren]/Privacy en wanneer je een bericht aan het opstellen "
+"bent in /Opties/Privacy-systeem\n"
 "\n"
 "De plugin gebruikt de GPGME-bibliotheek als een schil om GnuPG.\n"
 "De plugin heeft ook gpgsm, gnupg-agent en dirmngr nodig, geïnstalleerd en "
@@ -13678,24 +13861,24 @@ msgstr ""
 "\n"
 "GPGME auteursrecht 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:426
+#: src/plugins/smime/smime.c:567
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Kon het GPG-protocol niet instellen, %s"
 
-#: src/plugins/smime/smime.c:454
+#: src/plugins/smime/smime.c:603
 msgid "Couldn't open temporary file"
 msgstr "Kon tijdelijk bestand niet openen"
 
-#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
+#: src/plugins/smime/smime.c:615 src/plugins/smime/smime.c:631
 msgid "Couldn't write to temporary file"
 msgstr "Kon niet schrijven naar tijdelijk bestand"
 
-#: src/plugins/smime/smime.c:491
+#: src/plugins/smime/smime.c:643
 msgid "Couldn't close temporary file"
 msgstr "Kon tijdelijk bestand niet sluiten"
 
-#: src/plugins/smime/smime.c:714
+#: src/plugins/smime/smime.c:867
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13703,21 +13886,21 @@ msgstr ""
 "Let op dat e-mail-headers, zoals Onderwerp, niet versleuteld worden door het "
 "S/MIME-systeem."
 
-#: src/plugins/spam_report/spam_report.c:307
+#: src/plugins/spam_report/spam_report.c:312
 msgid "Reporting spam..."
 msgstr "Rapporteer spam..."
 
-#: src/plugins/spam_report/spam_report.c:342
+#: src/plugins/spam_report/spam_report.c:347
 msgid "Report spam online..."
 msgstr "Rapporteer spam online..."
 
-#: src/plugins/spam_report/spam_report.c:353
-#: src/plugins/spam_report/spam_report.c:391
+#: src/plugins/spam_report/spam_report.c:358
+#: src/plugins/spam_report/spam_report.c:396
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "SpamRapport"
 
-#: src/plugins/spam_report/spam_report.c:396
+#: src/plugins/spam_report/spam_report.c:401
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13733,7 +13916,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:421
+#: src/plugins/spam_report/spam_report.c:426
 msgid "Spam reporting"
 msgstr "Spam rapportering"
 
@@ -13745,7 +13928,8 @@ msgstr "Aangezet"
 msgid "Forward to:"
 msgstr "Doorsturen aan:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1583
+#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -13788,15 +13972,15 @@ msgstr ""
 "Claws Mail heeft netwerktoegang nodig om dit bericht aan de Spam-trainer te "
 "voeden."
 
-#: src/plugins/spamassassin/spamassassin.c:561
+#: src/plugins/spamassassin/spamassassin.c:565
 msgid "Failed to get username"
 msgstr "Verkrijgen gebruikersnaam mislukt"
 
-#: src/plugins/spamassassin/spamassassin.c:578
+#: src/plugins/spamassassin/spamassassin.c:582
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "De SpamAssassin-plugin is geladen, maar staat uit in de voorkeuren.\n"
 
-#: src/plugins/spamassassin/spamassassin.c:612
+#: src/plugins/spamassassin/spamassassin.c:616
 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 "
@@ -13903,29 +14087,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:131
-#: src/plugins/tnef_parse/tnef_parse.c:138
+#: src/plugins/tnef_parse/tnef_parse.c:134
+#: src/plugins/tnef_parse/tnef_parse.c:142
 msgid "Failed to write the part data."
 msgstr "Het schrijven van de deel data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:183
+#: src/plugins/tnef_parse/tnef_parse.c:187
 msgid "Failed to parse VCalendar data."
 msgstr "Het verwerken van de VCalendar-data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:222
+#: src/plugins/tnef_parse/tnef_parse.c:226
 msgid "Failed to parse VTask data."
 msgstr "Het verwerken van de VTask data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:274
+#: src/plugins/tnef_parse/tnef_parse.c:278
 msgid "Failed to parse VCard data."
 msgstr "Het verwerken van de VCard data is mislukt."
 
-#: src/plugins/tnef_parse/tnef_parse.c:414
-#: src/plugins/tnef_parse/tnef_parse.c:438
+#: src/plugins/tnef_parse/tnef_parse.c:418
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid "TNEF Parser"
 msgstr "TNEF Verwerker"
 
-#: src/plugins/tnef_parse/tnef_parse.c:443
+#: src/plugins/tnef_parse/tnef_parse.c:447
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13938,115 +14122,115 @@ msgstr ""
 "De plugin gebruikt de Ytnef-bibliotheek, welke valt onder auteursrecht "
 "2002-2007 door Randall Hand <yerase at yerot.com>"
 
-#: src/plugins/vcalendar/common-views.c:62
+#: src/plugins/vcalendar/common-views.c:61
 msgid "_Edit this meeting..."
 msgstr "_Bewerken afspraak..."
 
-#: src/plugins/vcalendar/common-views.c:63
+#: src/plugins/vcalendar/common-views.c:62
 msgid "_Cancel this meeting..."
 msgstr "_Afzeggen afspraak..."
 
-#: src/plugins/vcalendar/common-views.c:65
+#: src/plugins/vcalendar/common-views.c:64
 msgid "_Create new meeting..."
 msgstr "Aanmaken nieuwe afspraak..."
 
-#: src/plugins/vcalendar/common-views.c:67
+#: src/plugins/vcalendar/common-views.c:66
 msgid "_Go to today"
 msgstr "_Ga naar vandaag"
 
-#: src/plugins/vcalendar/day-view.c:591 src/plugins/vcalendar/month-view.c:689
+#: src/plugins/vcalendar/day-view.c:599 src/plugins/vcalendar/month-view.c:688
 msgid "Start"
 msgstr "Start"
 
-#: src/plugins/vcalendar/day-view.c:604 src/plugins/vcalendar/month-view.c:702
+#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:701
 msgid "Show"
 msgstr "Weergeven"
 
-#: src/plugins/vcalendar/month-view.c:109
+#: src/plugins/vcalendar/month-view.c:108
 msgid "Monday"
 msgstr "Maandag"
 
-#: src/plugins/vcalendar/month-view.c:110
+#: src/plugins/vcalendar/month-view.c:109
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: src/plugins/vcalendar/month-view.c:111
+#: src/plugins/vcalendar/month-view.c:110
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: src/plugins/vcalendar/month-view.c:112
+#: src/plugins/vcalendar/month-view.c:111
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: src/plugins/vcalendar/month-view.c:113
+#: src/plugins/vcalendar/month-view.c:112
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: src/plugins/vcalendar/month-view.c:114
+#: src/plugins/vcalendar/month-view.c:113
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: src/plugins/vcalendar/month-view.c:115
+#: src/plugins/vcalendar/month-view.c:114
 msgid "Sunday"
 msgstr "Zondag"
 
-#: src/plugins/vcalendar/month-view.c:118
+#: src/plugins/vcalendar/month-view.c:117
 msgid "January"
 msgstr "Januari"
 
-#: src/plugins/vcalendar/month-view.c:119
+#: src/plugins/vcalendar/month-view.c:118
 msgid "February"
 msgstr "Februari"
 
-#: src/plugins/vcalendar/month-view.c:120
+#: src/plugins/vcalendar/month-view.c:119
 msgid "March"
 msgstr "Maart"
 
-#: src/plugins/vcalendar/month-view.c:121
+#: src/plugins/vcalendar/month-view.c:120
 msgid "April"
 msgstr "April"
 
-#: src/plugins/vcalendar/month-view.c:122
+#: src/plugins/vcalendar/month-view.c:121
 msgid "May"
 msgstr "Mei"
 
-#: src/plugins/vcalendar/month-view.c:123
+#: src/plugins/vcalendar/month-view.c:122
 msgid "June"
 msgstr "Juni"
 
-#: src/plugins/vcalendar/month-view.c:124
+#: src/plugins/vcalendar/month-view.c:123
 msgid "July"
 msgstr "Juli"
 
-#: src/plugins/vcalendar/month-view.c:125
+#: src/plugins/vcalendar/month-view.c:124
 msgid "August"
 msgstr "Augustus"
 
-#: src/plugins/vcalendar/month-view.c:126
+#: src/plugins/vcalendar/month-view.c:125
 msgid "September"
 msgstr "September"
 
-#: src/plugins/vcalendar/month-view.c:127
+#: src/plugins/vcalendar/month-view.c:126
 msgid "October"
 msgstr "Oktober"
 
-#: src/plugins/vcalendar/month-view.c:128
+#: src/plugins/vcalendar/month-view.c:127
 msgid "November"
 msgstr "November"
 
-#: src/plugins/vcalendar/month-view.c:129
+#: src/plugins/vcalendar/month-view.c:128
 msgid "December"
 msgstr "December"
 
-#: src/plugins/vcalendar/month-view.c:790
+#: src/plugins/vcalendar/month-view.c:789
 msgid "Week number"
 msgstr "Weeknummer"
 
-#: src/plugins/vcalendar/month-view.c:875
+#: src/plugins/vcalendar/month-view.c:874
 msgid "Previous month"
 msgstr "Vorige maand"
 
-#: src/plugins/vcalendar/month-view.c:894
+#: src/plugins/vcalendar/month-view.c:893
 msgid "Next month"
 msgstr "Volgende maand"
 
@@ -14121,7 +14305,7 @@ msgstr "Je hebt een Todo item."
 
 #: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
 #: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:712
 msgid "Details follow:"
 msgstr "Details volgen:"
 
@@ -14145,15 +14329,15 @@ msgstr "Je hebt een afspraak doorgestuurd gekregen."
 msgid "(this event recurs)"
 msgstr "(deze gebeurtenis gebeurt opnieuw)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:562
 msgid "(this event is part of a recurring event)"
 msgstr "(deze gebeurtenis is onderdeel van een terugkerende gebeurtenis)"
 
-#: src/plugins/vcalendar/vcalendar.c:714
+#: src/plugins/vcalendar/vcalendar.c:711
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Je hebt antwoord ontvangen op een onbekend afspraak voorstel."
 
-#: src/plugins/vcalendar/vcalendar.c:718
+#: src/plugins/vcalendar/vcalendar.c:715
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -14162,35 +14346,35 @@ msgstr ""
 "Je hebt antwoord ontvangen op een afspraak voorstel.\n"
 "%s heeft %s de uitnodiging met de volgende details:"
 
-#: src/plugins/vcalendar/vcalendar.c:797
+#: src/plugins/vcalendar/vcalendar.c:796
 msgid "Error - could not get the calendar MIME part."
 msgstr "Fout - kon niet het agenda-MIME-deel verkrijgen."
 
-#: src/plugins/vcalendar/vcalendar.c:804
+#: src/plugins/vcalendar/vcalendar.c:803
 msgid "Error - no calendar part found."
 msgstr "Fout - geen agenda deel gevonden."
 
-#: src/plugins/vcalendar/vcalendar.c:818
+#: src/plugins/vcalendar/vcalendar.c:817
 msgid "Error - Unknown calendar component type."
 msgstr "Fout - Onbekend agenda component-type."
 
-#: src/plugins/vcalendar/vcalendar.c:950
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "Verstuur een melding naar de genodigden"
 
-#: src/plugins/vcalendar/vcalendar.c:959
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "Zeg afspraak af"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Weet je zeker dat je deze afspraak wilt afzeggen?"
 
-#: src/plugins/vcalendar/vcalendar.c:1055
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "Geen account gevonden"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -14198,128 +14382,128 @@ msgstr ""
 "Je hebt geen account dat overeenkomt met een genodigde.\n"
 "Wil je toch antwoorden?"
 
-#: src/plugins/vcalendar/vcalendar.c:1058
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "Toch antwoorden"
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Answer"
 msgstr "Antwoord"
 
-#: src/plugins/vcalendar/vcalendar.c:1192
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Edit meeting..."
 msgstr "Pas afspraak aan..."
 
-#: src/plugins/vcalendar/vcalendar.c:1193
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Cancel meeting..."
 msgstr "Zeg afspraak af..."
 
-#: src/plugins/vcalendar/vcalendar.c:1194
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "Launch website"
 msgstr "Ga naar website"
 
-#: src/plugins/vcalendar/vcalendar.c:1198
+#: src/plugins/vcalendar/vcalendar.c:1199
 msgid "You are already busy at this time."
 msgstr "Je bent al bezet op dit moment."
 
-#: src/plugins/vcalendar/vcalendar.c:1237
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1626
+#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
 msgid "Event:"
 msgstr "Gebeurtenis:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
 msgid "Organizer:"
 msgstr "Agenda:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1607
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1611
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1621
 msgid "Location:"
 msgstr "Locatie:"
 
-#: src/plugins/vcalendar/vcalendar.c:1240
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1616
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Summary:"
 msgstr "Samenvatting:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Starting:"
 msgstr "Start:"
 
-#: src/plugins/vcalendar/vcalendar.c:1242
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Ending:"
 msgstr "Einde:"
 
-#: src/plugins/vcalendar/vcalendar.c:1244
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
+#: src/plugins/vcalendar/vcalendar.c:1245
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
 msgid "Attendees:"
 msgstr "Genodigden:"
 
-#: src/plugins/vcalendar/vcalendar.c:1246
+#: src/plugins/vcalendar/vcalendar.c:1247
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nieuwe afspraak..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exporteer agenda..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "_Schrijf je in voor Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "_Hernoem..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "_Ververs abonnementen"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "_Lijst beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Week beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "_Maand beeld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Afspraken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1502
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "in het verleden"
 
-#: src/plugins/vcalendar/vcal_folder.c:1505
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "vandaag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1508
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "morgen"
 
-#: src/plugins/vcalendar/vcal_folder.c:1511
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "deze week"
 
-#: src/plugins/vcalendar/vcal_folder.c:1514
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "later"
 
-#: src/plugins/vcalendar/vcal_folder.c:1518
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14328,21 +14512,21 @@ msgstr ""
 "\n"
 "Dit zijn de dingen gepland %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1615
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Tijdslimiet (%d secondes) voor verbinden met %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1627
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Niet geautoriseerd)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1633
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Fout %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1815
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14355,7 +14539,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1846
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14366,46 +14550,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1877
-#: src/plugins/vcalendar/vcal_folder.c:1880
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kon de doelmap %s niet aanmaken"
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail heeft netwerk toegang nodig om de Webcal-feed te verversen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Kalender voor %s wordt bijgewerkt..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1932
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "nieuw abonnement"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1939
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail heeft netwerk toegang nodig om de abonnering te vernieuwen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Abonneren op Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Voer de Webcal-URL in:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1967
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "Kon de URL niet verwerken."
 
-#: src/plugins/vcalendar/vcal_folder.c:1995
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Wil je echt uitschrijven?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1996
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Verwijder abonnement"
 
@@ -14621,7 +14805,7 @@ msgid "available"
 msgstr "beschikbaar"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:848
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1101
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1105
 msgid "Free/busy retrieval failed"
 msgstr "Vrij/bezet ophalen mislukt"
 
@@ -14633,26 +14817,26 @@ msgstr "Niet iedereen is beschikbaar"
 msgid "Send anyway"
 msgstr "Verstuur toch"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:942
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:943
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Niet iedereen is beschikbaar. Zie tooltips voor meer info..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1083
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Planning voor %s wordt bijgewerkt..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1110
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1114
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1123
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1130
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1127
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1134
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1142
 msgid "Everyone is available."
 msgstr "Iedereen is beschikbaar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1139
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1143
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14660,7 +14844,7 @@ msgstr ""
 "Iedereen lijkt beschikbaar, maar sommige vrij/bezet informatie kon niet "
 "opgehaald worden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1311
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1315
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14668,61 +14852,61 @@ msgstr ""
 "Kon de uitnodiging niet versturen.\n"
 "Controleer de ontvangers."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1389
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1393
 msgid "Save & Send"
 msgstr "Opslaan en verzenden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1390
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1394
 msgid "Check availability"
 msgstr "Controleer beschikbaarheid"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1484
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1488
 msgid "Starts at:"
 msgstr "Begint om:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1490
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1514 src/prefs_matcher.c:768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1518 src/prefs_matcher.c:768
 msgid "on:"
 msgstr "aan:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1508
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1512
 msgid "Ends at:"
 msgstr "Eindigt om:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1549
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1553
 msgid "New meeting"
 msgstr "Nieuwe afspraak"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1551
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1555
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Pas afspraak aan"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1610
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1634
 msgid "Time:"
 msgstr "Tijd:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1757
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1756
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1760
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1767
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Eerstvolgende afspraak: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1772
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14739,121 +14923,121 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Herinner me over %d minuut"
 msgstr[1] "Herinner me over %d minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1915
 msgid "Empty calendar"
 msgstr "Lege agenda"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1912
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1916
 msgid "There is nothing to export."
 msgstr "Er is niets te exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1956
 msgid "Could not export the calendar."
 msgstr "Kon de agenda niet exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1979
 msgid "Export calendar to ICS"
 msgstr "Exporteer agenda nar ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1992
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1996
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Kon agenda niet exporteren naar '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2108
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Could not export the freebusy info."
 msgstr "Kon de vrij/bezet info niet exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2140
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2144
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kon vrij/bezet niet exporteren naar '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:301
 msgid "Reminders"
 msgstr "Herinneringen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
+#: src/plugins/vcalendar/vcal_prefs.c:310
 msgid "Alert me"
 msgstr "Waarschuw me"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
+#: src/plugins/vcalendar/vcal_prefs.c:339
 msgid "minutes before an event"
 msgstr "minuten voor een afspraak"
 
-#: src/plugins/vcalendar/vcal_prefs.c:361
+#: src/plugins/vcalendar/vcal_prefs.c:362
 msgid "Calendar export"
 msgstr "Agenda export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:372
+#: src/plugins/vcalendar/vcal_prefs.c:373
 msgid "Automatically export calendar to"
 msgstr "Automatisch agenda exporteren naar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:381
-#: src/plugins/vcalendar/vcal_prefs.c:500
+#: 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 "Je kunt naar een lokaal bestand of URL exporteren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:383
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Geef een lokaal bestand of URL op (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:414
 msgid "Include Webcal subscriptions in export"
 msgstr "Voeg Webcal-inschrijvingen bij het exporteren in"
 
-#: src/plugins/vcalendar/vcal_prefs.c:423
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Command to run after calendar export"
 msgstr "Opdracht om te starten na het exporteren van de agenda"
 
-#: src/plugins/vcalendar/vcal_prefs.c:452
+#: src/plugins/vcalendar/vcal_prefs.c:453
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registreer Claws' agenda in XFCE's Orage klok"
 
-#: src/plugins/vcalendar/vcal_prefs.c:454
+#: src/plugins/vcalendar/vcal_prefs.c:455
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 "Sta Orage (versie 4.4 of nieuwer) toe om Claws Mail's agaenda in te zien"
 
-#: src/plugins/vcalendar/vcal_prefs.c:467
+#: src/plugins/vcalendar/vcal_prefs.c:468
 msgid "Export as GNOME shell calendar server"
 msgstr "Exporteren voor GNOME-shell calendar-server"
 
-#: src/plugins/vcalendar/vcal_prefs.c:469
+#: src/plugins/vcalendar/vcal_prefs.c:470
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Registreer D-Bus calendar-server interface om Claws Mail's agenda te "
 "exporteren"
 
-#: src/plugins/vcalendar/vcal_prefs.c:479
+#: src/plugins/vcalendar/vcal_prefs.c:480
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: src/plugins/vcalendar/vcal_prefs.c:491
+#: src/plugins/vcalendar/vcal_prefs.c:492
 msgid "Automatically export free/busy status to"
 msgstr "Automatisch exporteren van vrij/bezet status naar"
 
-#: src/plugins/vcalendar/vcal_prefs.c:502
+#: src/plugins/vcalendar/vcal_prefs.c:503
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Geef een lokaal bestand of URL (http://server/path/file.ifb) op"
 
-#: src/plugins/vcalendar/vcal_prefs.c:532
+#: src/plugins/vcalendar/vcal_prefs.c:533
 msgid "Command to run after free/busy status export"
 msgstr "Opdracht om te starten na het exporteren van vrij/bezet status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:559
+#: src/plugins/vcalendar/vcal_prefs.c:560
 msgid "Get free/busy status of others from"
 msgstr "Haal vrij/bezet status van anderen van"
 
-#: src/plugins/vcalendar/vcal_prefs.c:567
+#: src/plugins/vcalendar/vcal_prefs.c:568
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14862,9 +15046,9 @@ msgstr ""
 "Geef een lokaal bestand of URL (http://server/path/file.ifb) op. Gebruik %u "
 "voor het linkerdeel van het e-mailadres, %d voor het domein"
 
-#: src/plugins/vcalendar/vcal_prefs.c:581
-msgid "SSL/TLS options"
-msgstr "SSL/TLS-opties"
+#: src/plugins/vcalendar/vcal_prefs.c:582
+msgid "TLS options"
+msgstr "TLS-opties"
 
 #: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
@@ -14878,95 +15062,95 @@ msgstr "APOP-timestamp in de begroeting is ongeldig\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Timestamp syntax in de begroeting (geen ASCII) is ongeldig\n"
 
-#: src/pop.c:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "POP-protocolfout\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ongeldig UIDL antwoord: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Verwijderen verlopen bericht %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Bericht %d [%s] wordt overgeslagen (%d bytes)\n"
 
-#: src/pop.c:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "postvak zit op slot\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Sessie verlopen\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "opdracht wordt niet ondersteund\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "er is een fout opgetreden in de POP-sessie\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "TOP-opdracht wordt niet ondersteund\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2914
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2929
-#: src/wizard.c:1509
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1510
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Lokaal mbox-bestand"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Niets (alleen SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Instellen als standaardaccount"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "E-mailadres"
 
-#: src/prefs_account.c:1294 src/wizard.c:1532
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Automatische instellingen"
 
-#: src/prefs_account.c:1296 src/wizard.c:1533
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14974,81 +15158,81 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail is\n"
 "gecompileerd zonder ondersteuning voor IMAP en Nieuws."
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Deze server vereist authenticatie"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Authenticatie bij verbinding maken"
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Lokaal postvak"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "SMTP-server (zenden)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Gebruik mail opdracht i.p.v. SMTP"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "opdracht voor versturen berichten"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Standaard Inbox"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ongefilterde berichten gaan in deze map"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "Authenticatie voor POP-verbinding"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "Selecteren"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Verwijder reeds ontvangen berichten van de server"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Verwijder na"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagen en 0 uur: verwijder meteen"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Limiet op grootte"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15057,95 +15241,95 @@ msgstr ""
 "opgehaald. Als je zo'n bericht selecteert, kun je kiezen om het helemaal op "
 "te halen of te verwijderen."
 
-#: src/prefs_account.c:1715 src/prefs_account.c:2944
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal artikelen dat zal worden opgehaald"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(gewoonlijk leeg)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Geef alleen geabonneerde mappen weer"
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreedte-efficiente methode (vermijdt ophalen van tags)"
 
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:1831
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Deze methode gebruikt minder bandbreedte, maar kan langzamer zijn met "
 "bepaalde servers."
 
-#: src/prefs_account.c:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatisch controleren"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Globale instellingen gebruiken"
 
 # TPTD: check
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Controleer op nieuwe berichten elke"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filter de berichten bij het ophalen met behulp van plugins"
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account.c:1963 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:633 src/prefs_matcher.c:2009 src/prefs_matcher.c:2037
+#: src/prefs_account.c:1996 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account.c:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "E-mailadres van account waarmee verzonden wordt in Bericht-ID"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Voeg een header van de gebruikers-agent toe"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-authenticatie (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15153,221 +15337,220 @@ msgstr ""
 "Als je deze velden leeg laat, worden dezelfde\n"
 "gebruikersnaam en wachtwoord gebruikt als bij ontvangen."
 
-#: src/prefs_account.c:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Authenticatie met POP voor het verzenden"
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "Tijdslimiet voor POP-authenticatie"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Autorisatie"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Selecteer de OAuth2 email-provider"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "Client-ID"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "Client-geheim"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Autorisatie-code verkrijgen"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
 msgstr "Open externe browser met aanvraag"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Kopieer koppeling"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Autorisatie-code"
 
-#: src/prefs_account.c:2323
-msgid "Paste complete URL from browser or the provided auth token"
+#: src/prefs_account.c:2361
+msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
 "Plak de complete URL vanuit de browser of de opgegeven autorisatie-code"
 
-#: src/prefs_account.c:2330
-#| msgid "No authentication"
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Autorisatie afronden"
 
-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Autoriseren"
 
-#: src/prefs_account.c:2420 src/prefs_account.c:2466
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Ondertekening"
 
-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "Voeg automatisch ondertekening in"
 
-#: src/prefs_account.c:2428
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Scheidingsteken van ondertekening"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Opdracht-uitvoer"
 
-#: src/prefs_account.c:2486
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Automatisch volgende adressen instellen"
 
-#: src/prefs_account.c:2535
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "Woordenlijsten voor spellingcontrole"
 
-#: src/prefs_account.c:2545 src/prefs_folder_item.c:1101
-#: src/prefs_spelling.c:162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Standaard woordenlijst"
 
-#: src/prefs_account.c:2557 src/prefs_folder_item.c:1132
-#: src/prefs_spelling.c:171
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Standaard alternatieve woordenlijst"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:4108
-#: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1516
-#: src/prefs_folder_item.c:1891 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:324 src/prefs_wrapping.c:152
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: 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 "Opstellen"
 
-#: src/prefs_account.c:2657 src/prefs_folder_item.c:1544 src/prefs_quote.c:134
-#: src/toolbar.c:490
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/toolbar.c:500
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/prefs_account.c:2672 src/prefs_filtering_action.c:183
-#: src/prefs_folder_item.c:1572 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2711 src/prefs_filtering_action.c:183
+#: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/prefs_account.c:2719
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Standaard privacy-systeem"
 
-#: src/prefs_account.c:2748 src/prefs_folder_item.c:1168
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Berichten altijd ondertekenen"
 
-#: src/prefs_account.c:2750 src/prefs_folder_item.c:1198
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Berichten altijd versleutelen"
 
-#: src/prefs_account.c:2752
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 "Berichten altijd ondertekenen bij het reageren op een ondertekend bericht"
 
-#: src/prefs_account.c:2755
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Berichten altijd versleutelen bij het reageren op een versleuteld bericht"
 
-#: src/prefs_account.c:2758
+#: src/prefs_account.c:2797
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Versleutel verzonden berichten behalve met de sleutel van de ontvanger ook "
 "met je eigen sleutel"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Sla verzonden versleutelde berichten onversleuteld op"
 
-#: src/prefs_account.c:2918 src/prefs_account.c:2933 src/prefs_account.c:2947
-msgid "Don't use SSL/TLS"
-msgstr "Gebruik geen SSL/TLS"
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+msgid "Don't use TLS"
+msgstr "Gebruik geen TLS"
 
-#: src/prefs_account.c:2921 src/prefs_account.c:2936 src/prefs_account.c:2956
-#: src/prefs_account.c:2967
-msgid "Use SSL/TLS"
-msgstr "Gebruik SSL/TLS"
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
+msgid "Use TLS"
+msgstr "Gebruik TLS"
 
-#: src/prefs_account.c:2924 src/prefs_account.c:2939 src/prefs_account.c:2970
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Gebruik STARTTLS voor starten beveiligde sessie"
 
-#: src/prefs_account.c:2960
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account.c:2964
-msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
-msgstr "Gebruik geen SSL/TLS (maar, als het noodzakelijk is, gebruik STARTTLS)"
+#: src/prefs_account.c:3003
+msgid "Don't use TLS (but, if necessary, use STARTTLS)"
+msgstr "Gebruik geen TLS (maar, als het noodzakelijk is, gebruik STARTTLS)"
 
-#: src/prefs_account.c:2975
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Client-certificaten"
 
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Certificaat om te ontvangen"
 
-#: src/prefs_account.c:2988 src/prefs_account.c:2990 src/prefs_account.c:3016
-#: src/prefs_account.c:3018
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Client-certificaat-bestand als een PKCS12- of PEM-bestand"
 
-#: src/prefs_account.c:3011
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Certificaat om te verzenden"
 
-#: src/prefs_account.c:3051
-msgid "Automatically accept valid SSL/TLS certificates"
-msgstr "Geldige SSL/TLS-certificaten automatisch accepteren"
+#: src/prefs_account.c:3090
+msgid "Automatically accept valid TLS certificates"
+msgstr "Geldige TLS-certificaten automatisch accepteren"
 
-#: src/prefs_account.c:3054
-msgid "Use non-blocking SSL/TLS"
-msgstr "Gebruik niet-blokkerende SSL/TLS"
+#: src/prefs_account.c:3093
+msgid "Use non-blocking TLS"
+msgstr "Gebruik niet-blokkerende TLS"
 
-#: src/prefs_account.c:3066
-msgid "Turn this off if you have SSL/TLS connection problems"
-msgstr "Zet dit uit als je problemen hebt met SSL/TLS-verbindingen"
+#: src/prefs_account.c:3105
+msgid "Turn this off if you have TLS connection problems"
+msgstr "Zet dit uit als je problemen hebt met TLS-verbindingen"
 
-#: src/prefs_account.c:3158 src/prefs_proxy.c:73
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Proxy-server gebruiken"
 
-#: src/prefs_account.c:3167
+#: src/prefs_account.c:3206
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Gebruik de standaard instellingen"
 
-#: src/prefs_account.c:3169
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Globale proxy-instellingen gebruiken"
 
-#: src/prefs_account.c:3206 src/prefs_proxy.c:115 src/wizard.c:1118
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Gebruik authenticatie"
 
-#: src/prefs_account.c:3211 src/prefs_proxy.c:123
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account.c:3240
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Proxy-server gebruiken voor verzenden"
 
-#: src/prefs_account.c:3242
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15376,27 +15559,27 @@ msgstr ""
 "naar de ingestelde uitgaande server, en wordt de ingestelde proxy-server "
 "niet gebruikt."
 
-#: src/prefs_account.c:3352
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "SMTP-poort"
 
-#: src/prefs_account.c:3359
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "POP-poort"
 
-#: src/prefs_account.c:3366
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "IMAP-poort"
 
-#: src/prefs_account.c:3373
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "NNTP-poort"
 
-#: src/prefs_account.c:3379
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: src/prefs_account.c:3382
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15404,237 +15587,273 @@ msgstr ""
 "De domeinnaam wordt gebruikt in de aangemaakte Bericht-ID, en wanneer er "
 "wordt verbonden met SMTP-servers."
 
-#: src/prefs_account.c:3396
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Gebruik opdracht om te communiceren met server"
 
-#: src/prefs_account.c:3405
+#: src/prefs_account.c:3445
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markeer dubbel geplaatste berichten als gelezen en kleur:"
 
-#: src/prefs_account.c:3454
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Plaats verzonden berichten in"
 
-#: src/prefs_account.c:3456
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Plaats berichten in wachtrij in"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Plaats kladberichten in"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Plaats verwijderde berichten in"
 
-#: src/prefs_account.c:3517
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "Je hebt geen accountnaam opgegeven."
 
-#: src/prefs_account.c:3521
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "Je hebt geen e-mailadres opgegeven."
 
-#: src/prefs_account.c:3529
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "Je hebt geen SMTP-server opgegeven."
 
-#: src/prefs_account.c:3534
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "Je hebt geen gebruikers-ID opgegeven."
 
-#: src/prefs_account.c:3539
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "Je hebt geen POP-server opgegeven."
 
-#: src/prefs_account.c:3559
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "De standaard Inbox-map bestaat niet."
 
-#: src/prefs_account.c:3565
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "Je hebt geen IMAP-server opgegeven."
 
-#: src/prefs_account.c:3570
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "Je hebt geen NNTP-server opgegeven."
 
-#: src/prefs_account.c:3576
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
-#: src/prefs_account.c:3582
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "je hebt geen mail-opdrachtregel opgegeven."
 
-#: src/prefs_account.c:3592
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "Gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3597
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "Wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3676
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3633
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP-wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3725
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "geen domein opgegeven."
 
-#: src/prefs_account.c:3730
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "verzonden-map is niet geselecteerd."
 
-#: src/prefs_account.c:3735
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "wachtrij-map is niet geselecteerd."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "concept-map is niet geselecteerd."
 
-#: src/prefs_account.c:3745
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "prullenbak-map is niet geselecteerd."
 
-#: src/prefs_account.c:4054
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account.c:4090
-#| msgid "Author"
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Verstuur"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4126 src/prefs_folder_item.c:1907 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: src/prefs_account.c:4144
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:4274
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account.c:4629
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account.c:4631
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
-msgstr "%s - accountvoorkeuren"
+msgstr "%s - Account-voorkeuren"
 
-#: src/prefs_account.c:4743 src/wizard.c:1399
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Mislukt (verkeerd adres)"
 
-#: src/prefs_account.c:4828
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Selecteer bestand met ondertekening"
 
-#: src/prefs_account.c:4846 src/prefs_account.c:4863 src/wizard.c:1066
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Selecteer certificaat-bestand"
 
-#: src/prefs_account.c:4959
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:5279
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin niet geladen)"
 
-#: src/prefs_actions.c:224
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Autorisatie afgerond"
+
+#: src/prefs_account.c:6139
+msgid "Your OAuth2 authorisation code has been received by Claws Mail"
+msgstr "De OAuth2 autorisatie-code is ontvangen door Claws Mail"
+
+#: src/prefs_account.c:6142
+msgid "Authorisation NOT completed"
+msgstr "Autorisatie NIET afgerond"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "De OAuth2 autorisatie-code is niet ontvangen door Claws Mail"
+
+#: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Acties instellen"
 
-#: src/prefs_actions.c:251
+#: src/prefs_actions.c:253
 msgid "Menu name"
 msgstr "Menunaam"
 
-#: src/prefs_actions.c:280
+#: src/prefs_actions.c:282
 msgid "Shell command"
 msgstr "Voer opdracht uit"
 
-#: src/prefs_actions.c:290
+#: src/prefs_actions.c:292
 msgid "Filter action"
 msgstr "Filter actie"
 
-#: src/prefs_actions.c:296
+#: src/prefs_actions.c:298
 msgid "Edit filter action"
 msgstr "Bewerk filter actie"
 
-#: src/prefs_actions.c:324
+#: src/prefs_actions.c:326
 msgid "Append the new action above to the list"
 msgstr "Plaats de nieuwe actie bovenaan de lijst"
 
-#: src/prefs_actions.c:332
+#: src/prefs_actions.c:334
 msgid "Replace the selected action in list with the action above"
 msgstr "Vervang de geselecteerde actie in de lijst met bovenstaande actie"
 
-#: src/prefs_actions.c:340
+#: src/prefs_actions.c:342
 msgid "Delete the selected action from the list"
 msgstr "Verwijder de geselecteerde actie van de lijst"
 
-#: src/prefs_actions.c:348 src/prefs_filtering.c:485 src/prefs_template.c:330
+#: src/prefs_actions.c:350 src/prefs_filtering.c:485 src/prefs_template.c:330
 msgid "Clear all the input fields in the dialog"
 msgstr "Wis alle invoervelden in de dialoog"
 
-#: src/prefs_actions.c:356
-msgid "Show information on configuring actions"
-msgstr "Geef informatie weer over configureren van acties"
+#: src/prefs_actions.c:358
+msgid "Show information on configuring actions"
+msgstr "Geef informatie weer over configureren van acties"
+
+#: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:356
+msgid "_Top"
+msgstr "_Bovenaan"
+
+#: src/prefs_actions.c:389
+msgid "Move the selected action to the top"
+msgstr "Verplaats de geselecteerde actie naar bovenaan"
 
-#: src/prefs_actions.c:387
+#: src/prefs_actions.c:399
 msgid "Move the selected action up"
 msgstr "Verplaats de geselecteerde actie naar boven"
 
-#: src/prefs_actions.c:395
+#: src/prefs_actions.c:407
 msgid "Move selected action down"
 msgstr "Verplaats de geselecteerde actie naar onderen"
 
-#: src/prefs_actions.c:528 src/prefs_filtering_action.c:678
-#: src/prefs_filtering.c:820 src/prefs_filtering.c:822
-#: src/prefs_filtering.c:823 src/prefs_filtering.c:933 src/prefs_matcher.c:918
+#: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
+msgid "_Bottom"
+msgstr "_Onderaan"
+
+#: src/prefs_actions.c:417
+msgid "Move the selected action to the bottom"
+msgstr "Verplaats de geselecteerde actie naar onderaan"
+
+#: src/prefs_actions.c:550 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:822 src/prefs_filtering.c:824
+#: src/prefs_filtering.c:825 src/prefs_filtering.c:935 src/prefs_matcher.c:918
 #: src/prefs_template.c:465
 msgid "(New)"
 msgstr "(Nieuw)"
 
-#: src/prefs_actions.c:593
+#: src/prefs_actions.c:615
 msgid "Menu name is not set."
 msgstr "Menunaam is niet ingevoerd."
 
-#: src/prefs_actions.c:598
+#: src/prefs_actions.c:620
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Een menunaam mag niet met een '/' beginnen."
 
-#: src/prefs_actions.c:603
+#: src/prefs_actions.c:625
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dubbele punt ':' is niet toegestaan in de menunaam."
 
-#: src/prefs_actions.c:622
+#: src/prefs_actions.c:644
 msgid "Menu name is too long."
 msgstr "Menunaam is te lang."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:653
 msgid "Command-line not set."
 msgstr "Opdrachtregel is niet ingevoerd."
 
-#: src/prefs_actions.c:636
+#: src/prefs_actions.c:658
 msgid "Menu name and command are too long."
 msgstr "Menunaam en opdrachtregel zijn te lang."
 
-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:664
 #, c-format
 msgid ""
 "The command\n"
@@ -15645,148 +15864,148 @@ msgstr ""
 "%s\n"
 "bevat een syntaxfout."
 
-#: src/prefs_actions.c:700
+#: src/prefs_actions.c:722
 msgid "Delete action"
 msgstr "Verwijder actie"
 
-#: src/prefs_actions.c:701
+#: src/prefs_actions.c:723
 msgid "Do you really want to delete this action?"
 msgstr "Wil je werkelijk deze actie verwijderen?"
 
-#: src/prefs_actions.c:721
+#: src/prefs_actions.c:744
 msgid "Delete all actions"
 msgstr "Verwijder alle acties"
 
-#: src/prefs_actions.c:722
+#: src/prefs_actions.c:745
 msgid "Do you really want to delete all the actions?"
 msgstr "Wil je werkelijk alle acties verwijderen?"
 
-#: src/prefs_actions.c:885 src/prefs_actions.c:916 src/prefs_filtering.c:1485
-#: src/prefs_filtering.c:1507 src/prefs_matcher.c:2160 src/prefs_template.c:565
+#: src/prefs_actions.c:913 src/prefs_actions.c:944 src/prefs_filtering.c:1491
+#: src/prefs_filtering.c:1514 src/prefs_matcher.c:2165 src/prefs_template.c:565
 #: src/prefs_template.c:590
 msgid "Entry not saved"
 msgstr "Ingang niet opgeslagen"
 
-#: src/prefs_actions.c:886 src/prefs_actions.c:917 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1508 src/prefs_template.c:566 src/prefs_template.c:591
+#: 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 "Deze ingang is nie opgeslagen. Toch afsluiten?"
 
-#: src/prefs_actions.c:887 src/prefs_actions.c:892 src/prefs_actions.c:918
-#: src/prefs_filtering.c:1465 src/prefs_filtering.c:1487
-#: src/prefs_filtering.c:1509 src/prefs_matcher.c:2163 src/prefs_template.c:567
+#: 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
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
 #: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "Ga _door met bewerken"
 
-#: src/prefs_actions.c:890
+#: src/prefs_actions.c:918
 msgid "Actions list not saved"
 msgstr "Actielijst is niet bewaard"
 
-#: src/prefs_actions.c:891
+#: src/prefs_actions.c:919
 msgid "The actions list has been modified. Close anyway?"
 msgstr "De actielijst is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_actions.c:961
+#: src/prefs_actions.c:989
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Menunaam:</span>"
 
-#: src/prefs_actions.c:962
+#: src/prefs_actions.c:990
 msgid "Use / in menu name to make submenus."
 msgstr "Gebruik '/' in een menunaam om submenus te maken."
 
-#: src/prefs_actions.c:964
+#: src/prefs_actions.c:992
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Opdrachtregel:</span>"
 
-#: src/prefs_actions.c:965
+#: src/prefs_actions.c:993
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Begin met:</span>"
 
-#: src/prefs_actions.c:966
+#: src/prefs_actions.c:994
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "om de berichtinhoud of selectie naar de standaard invoer van de opdracht te "
 "sturen"
 
-#: src/prefs_actions.c:967
+#: src/prefs_actions.c:995
 msgid "to send user provided text to command's standard input"
 msgstr ""
 "om door de gebruiker opgegeven tekst naar de standaard invoer van de "
 "opdracht te sturen"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:996
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "om door de gebruiker opgegeven, maar verborgen, tekst naar de standaard "
 "invoer van de opdracht te sturen"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:997
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Eindig met:</span>"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:998
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "om de berichtinhoud of selectie te vervangen met de standaard uitvoer van de "
 "opdracht"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:999
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 "de standaard uitvoer van de opdracht in te voegen, zonder de oude tekst te "
 "vervangen"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:1000
 msgid "to run command asynchronously"
 msgstr "om de opdracht asynchroon uit te voeren"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:1001
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Gebruik:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:1002
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr ""
 "voor het bestand met daarin het geselecteerde bericht in RFC822/2822-format "
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:1003
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "voor de lijst van bestanden van de geselecteerde berichten in RFC822/2822-"
 "format"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:1004
 msgid "for the file of the selected decoded message MIME part"
 msgstr "voor het bestand van het geselecteerde berichtonderdeel"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:1005
 msgid "for a user provided argument"
 msgstr "voor een door de gebruiker opgegeven argument"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:1006
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "voor een door de gebruiker opgegeven verborgen argument (bijv. wachtwoord)"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:1007
 msgid "for the text selection"
 msgstr "voor de tekst selectie"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:1008
 msgid "apply filtering actions between {} to selected messages"
 msgstr "voer de filteracties tussen de {} uit op de geselecteerde berichten"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:1009
 msgid "for a literal %"
 msgstr "letterlijke %"
 
-#: src/prefs_actions.c:991 src/prefs_themes.c:1092
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
 msgid "Actions"
 msgstr "Acties"
 
-#: src/prefs_actions.c:992
+#: src/prefs_actions.c:1020
 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."
@@ -15794,29 +16013,41 @@ msgstr ""
 "Met 'Acties' kunt externe programma's uitvoeren om berichten of gedeelten "
 "daarvan te verwerken."
 
-#: src/prefs_actions.c:1079 src/prefs_filtering.c:1683
+#: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
 #: src/prefs_template.c:1107
 msgid "D_uplicate"
 msgstr "D_ubbele"
 
-#: src/prefs_actions.c:1197
+#: src/prefs_actions.c:1225
 msgid "Current actions"
 msgstr "Huidige acties"
 
-#: src/prefs_actions.c:1296 src/prefs_filtering.c:1060
-#: src/prefs_filtering.c:1118
+#: src/prefs_actions.c:1312
+msgid "Entry was modified"
+msgstr "Ingang is gewijzigd"
+
+#: src/prefs_actions.c:1313
+msgid ""
+"Opening the filter action dialog will clear current modifications of the "
+"command-line."
+msgstr ""
+"Openen van het dialoogvenster van de filteractie zal mogelijke huidige "
+"wijzigingen wissen van de opdrachtregel."
+
+#: src/prefs_actions.c:1324 src/prefs_filtering.c:1062
+#: src/prefs_filtering.c:1120
 msgid "Action string is not valid."
 msgstr "Actie-regel is niet geldig."
 
-#: src/prefs_common.c:239 src/prefs_quote.c:69
+#: src/prefs_common.c:238 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hallo,\\n"
 
-#: src/prefs_common.c:317
+#: src/prefs_common.c:316
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Op %d\\n%f schreef:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:323 src/prefs_quote.c:85
+#: 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"
@@ -15824,7 +16055,7 @@ msgstr ""
 "\\n\\nBegin doorgestuurd bericht:\\n\\n?d{Datum: %d\\n}?f{Van: %f\\n}?t{Aan: "
 "%t\\n}?c{Cc: %c\\n}?n{Nieuwsgroepen: %n\\n}?s{Onderwerp: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:458
+#: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -15873,8 +16104,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "Waarschuwen wanneer een bestand wordt ingevoegd groter dan"
 
 #: src/prefs_compose_writing.c:205
-msgid "KB into message body "
-msgstr "KB in inhoud van bericht "
+msgid "KiB into message body"
+msgstr "KiB in inhoud van bericht"
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -15909,11 +16140,11 @@ msgstr "Bij het laten vallen van bestanden in het opstelvenster"
 msgid "Ask"
 msgstr "Vraag"
 
-#: src/prefs_compose_writing.c:240 src/toolbar.c:522
+#: src/prefs_compose_writing.c:240 src/toolbar.c:533
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/prefs_compose_writing.c:241 src/toolbar.c:523
+#: src/prefs_compose_writing.c:241 src/toolbar.c:534
 msgid "Attach"
 msgstr "Bijvoegen"
 
@@ -15926,69 +16157,73 @@ msgid "Custom header configuration"
 msgstr "Aangepaste header instellen"
 
 #: src/prefs_customheader.c:494 src/prefs_display_header.c:588
-#: src/prefs_matcher.c:1632 src/prefs_matcher.c:1647
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1649
 msgid "Header name is not set."
 msgstr "Header-naam niet ingevoerd."
 
 #: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Een dubbele punt (:) is niet toegestaan voor een aangepaste header."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Deze header-naam is niet toegestaan voor een aangepaste header."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Kies een PNG-bestand"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Kies een XBM-bestand"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Kies een tekst-bestand"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Dit bestand is geen afbeelding."
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "De gekozen afbeelding heeft niet de goede afmetingen (48x48)"
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "De afbeelding is te groot, het mag maximaal 725 bytes zijn."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "De afbeelding heeft niet het goede format (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "De afbeelding heeft niet het goede format (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Kon 'compface' niet aanroepen. Zorg ervoor dat het in je $PATH voorkomt."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "'Compface' fout: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Dit bestand bevat regeleinden."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Verwijder header"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Wil je deze header werkelijk verwijderen?"
 
-#: src/prefs_customheader.c:865
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Huidige aangepaste headers"
 
@@ -16050,7 +16285,7 @@ msgstr ""
 "de 'Als tekst weergeven'-optie worden weergegeven, dit te laten doen door "
 "middel van een script"
 
-#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:173
+#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:172
 #: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Berichtweergave"
@@ -16074,8 +16309,8 @@ msgstr "Verberg"
 msgid "Message flags"
 msgstr "Bericht vlaggen"
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:641
-#: src/prefs_summary_column.c:77 src/summaryview.c:2878 src/toolbar.c:505
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Markeren"
 
@@ -16096,11 +16331,11 @@ msgid "Mark as ham"
 msgstr "Markeer als ham"
 
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
+#: src/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2510
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
 msgid "Color label"
 msgstr "Kleurlabel"
 
@@ -16115,8 +16350,8 @@ msgstr "Herverwijzen"
 
 #: 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:644 src/prefs_summary_column.c:86
-#: src/summaryview.c:469
+#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/summaryview.c:470
 msgid "Score"
 msgstr "Score"
 
@@ -16130,7 +16365,7 @@ msgstr "Stel Score in"
 
 #: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
 #: src/prefs_filtering_action.c:190 src/prefs_matcher.c:643
-#: src/prefs_summary_column.c:88 src/summaryview.c:471
+#: src/prefs_summary_column.c:88 src/summaryview.c:472
 msgid "Tags"
 msgstr "Tags"
 
@@ -16158,7 +16393,7 @@ msgstr "Stop filter"
 msgid "Action configuration"
 msgstr "Acties instellen"
 
-#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1874
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1882
 #: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr "Regel"
@@ -16199,25 +16434,25 @@ msgstr "Vlagnaam niet ingevoerd."
 msgid "No action was defined."
 msgstr "Geen acties gedefinieerd."
 
-#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2207
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2213
 #: src/quote_fmt.c:78
 msgid "literal %"
 msgstr "letterlijke %"
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2216
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2222
 msgid "filename (should not be modified)"
 msgstr "bestandsnaam (dient niet veranderd te worden)"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2217
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2223
 #: src/quote_fmt.c:86
 msgid "new line"
 msgstr "nieuwe regel"
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2218
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2224
 msgid "escape character for quotes"
 msgstr "escape-teken voor aanhalingstekens"
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2219
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2225
 msgid "quote character"
 msgstr "aanhalingsteken"
 
@@ -16261,8 +16496,8 @@ msgid "Filtering/Processing configuration"
 msgstr "Filteren/Verwerken instellen"
 
 # TPTD: Check this
-#: src/prefs_filtering.c:265 src/prefs_filtering.c:851
-#: src/prefs_filtering.c:967
+#: src/prefs_filtering.c:265 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:969
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alle"
@@ -16309,7 +16544,7 @@ msgstr "Verplaats de geselecteerde regel naar boven"
 
 #: src/prefs_filtering.c:544
 msgid "Move the selected rule down"
-msgstr "Verplaats e geselecteerde regel naar onderen"
+msgstr "Verplaats de geselecteerde regel naar onderen"
 
 #: src/prefs_filtering.c:547
 msgid "Page dow_n"
@@ -16323,51 +16558,51 @@ msgstr "Verplaats de geselecteerde regel één pagina naar beneden"
 msgid "Move the selected rule to the bottom"
 msgstr "Verplaats de geselecteerde regel naar benedenaan"
 
-#: src/prefs_filtering.c:1024 src/prefs_filtering.c:1110
+#: src/prefs_filtering.c:1026 src/prefs_filtering.c:1112
 msgid "Condition string is not valid."
 msgstr "Voorwaarde-regel is niet geldig."
 
-#: src/prefs_filtering.c:1097
+#: src/prefs_filtering.c:1099
 msgid "Condition string is empty."
 msgstr "Voorwaarde-regel is leeg."
 
-#: src/prefs_filtering.c:1103
+#: src/prefs_filtering.c:1105
 msgid "Action string is empty."
 msgstr "Actie-regel is leeg."
 
-#: src/prefs_filtering.c:1192
+#: src/prefs_filtering.c:1194
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filtering.c:1193
+#: src/prefs_filtering.c:1195
 msgid "Do you really want to delete this rule?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1214
 msgid "Delete all rules"
 msgstr "Verwijder alle regels"
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1215
 msgid "Do you really want to delete all the rules?"
 msgstr "Wil je alle regels werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1463
+#: src/prefs_filtering.c:1467
 msgid "Filtering rules not saved"
 msgstr "Filterregels niet bewaard"
 
-#: src/prefs_filtering.c:1464
+#: src/prefs_filtering.c:1468
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "De lijst met filterregels is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_filtering.c:1686
+#: src/prefs_filtering.c:1694
 msgid "Move one page up"
 msgstr "Ga een pagina naar boven"
 
-#: src/prefs_filtering.c:1687
+#: src/prefs_filtering.c:1695
 msgid "Move one page down"
 msgstr "Ga een pagina naar beneden"
 
-#: src/prefs_filtering.c:1842
+#: src/prefs_filtering.c:1850
 msgid "Enable"
 msgstr "Activeren"
 
@@ -16387,17 +16622,17 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Verborgen kolommen"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
-#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Weergegeven kolommen"
 
-#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:462
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1015
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:474
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1016
 msgid " Use default "
 msgstr " Gebruik de standaard "
 
-#: src/prefs_folder_item.c:214
+#: src/prefs_folder_item.c:216
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -16408,7 +16643,7 @@ msgstr ""
 "Je kunt deze voorkeuren echter wel instellen voor de hele mappenboom door "
 "gebruik te maken van \"Pas toe op submappen\"."
 
-#: src/prefs_folder_item.c:294 src/prefs_folder_item.c:900
+#: src/prefs_folder_item.c:300 src/prefs_folder_item.c:936
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -16416,40 +16651,40 @@ msgstr ""
 "Pas toe op\n"
 "submappen"
 
-#: src/prefs_folder_item.c:317
+#: src/prefs_folder_item.c:323
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/prefs_folder_item.c:319
+#: src/prefs_folder_item.c:325
 msgid "Outbox"
 msgstr "Uitbox"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "Map-type"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:360
 msgid "Simplify Subject RegExp"
 msgstr "Verkorte onderwerpweergave RegExp"
 
-#: src/prefs_folder_item.c:384
+#: src/prefs_folder_item.c:387
 msgid "Test string"
 msgstr "Test string"
 
-#: src/prefs_folder_item.c:405
+#: src/prefs_folder_item.c:408
 msgid "Result"
 msgstr "Resultaat"
 
 # TPTD: ugly
-#: src/prefs_folder_item.c:423
+#: src/prefs_folder_item.c:426
 msgid "Folder chmod"
 msgstr "Map-chmod"
 
-#: src/prefs_folder_item.c:451
+#: src/prefs_folder_item.c:454
 msgid "Folder color"
 msgstr "Mapkleur"
 
-#: src/prefs_folder_item.c:462 src/prefs_folder_item.c:1745
+#: src/prefs_folder_item.c:464 src/prefs_folder_item.c:468
 msgid "Pick color for folder"
 msgstr "Selecteer kleur voor map"
 
@@ -16473,11 +16708,11 @@ msgstr ""
 "Zet deze optie aan als e-mail direct afgeleverd wordt in deze map door "
 "filteren op de IMAP-server of door een externe applicatie"
 
-#: src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:524
 msgid "Select the HTML part of multipart messages"
 msgstr "Selecteer het HTML-gedeelte van meerdelige berichten"
 
-#: src/prefs_folder_item.c:538
+#: src/prefs_folder_item.c:539
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -16485,68 +16720,82 @@ msgstr ""
 "\"Standaard\" volgt de globale voorkeuren (gevonden in /Voorkeuren/"
 "Berichtweergave/Tekstopties)"
 
-#: src/prefs_folder_item.c:546
+#: src/prefs_folder_item.c:549
+#| msgid "Show \"no unread (or new) message\" dialog"
+msgid "Skip folder when searching for unread or new messages"
+msgstr "Map overslaan bij het zoeken naar ongelezen of nieuwe berichten"
+
+#: src/prefs_folder_item.c:551
+msgid ""
+"Turn this option on if you want this folder to be ignored when searching for "
+"unread or new messages"
+msgstr ""
+"Schakel deze optie aan als je wilt dat deze map wordt genegeerd bij het "
+"zoeken naar ongelezen of nieuwe berichten"
+
+#: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
 msgstr "Synchroniseer voor offline gebruik"
 
-#: src/prefs_folder_item.c:564
+#: src/prefs_folder_item.c:582
 msgid "Fetch message bodies from the last"
 msgstr "Haal berichttekst op van de laatste"
 
-#: src/prefs_folder_item.c:569
+#: src/prefs_folder_item.c:587
 msgid "0: all bodies"
 msgstr "0: alle berichtteksten"
 
-#: src/prefs_folder_item.c:576
+#: src/prefs_folder_item.c:594
 msgid "Remove older messages bodies"
 msgstr "Verwijder oude berichtteksten"
 
-#: src/prefs_folder_item.c:593
+#: src/prefs_folder_item.c:612
 msgid "Discard folder cache"
 msgstr "Cache van de map weggooien"
 
-#: src/prefs_folder_item.c:907
+#: src/prefs_folder_item.c:943
 msgid "Request Return Receipt"
 msgstr "Vraag om ontvangstbevestiging"
 
-#: src/prefs_folder_item.c:918
+#: src/prefs_folder_item.c:954
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Bewaar kopie van uitgaande post in deze map inplaats van Verzonden"
 
-#: src/prefs_folder_item.c:929 src/prefs_folder_item.c:979
-#: src/prefs_folder_item.c:1004 src/prefs_folder_item.c:1029
+#: src/prefs_folder_item.c:965 src/prefs_folder_item.c:990
+#: src/prefs_folder_item.c:1040 src/prefs_folder_item.c:1065
+#: src/prefs_folder_item.c:1090
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Standaard %s"
 
-#: src/prefs_folder_item.c:954
+#: src/prefs_folder_item.c:1015
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "Standaard %s voor antwoorden"
 
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1114
 msgid "Default account"
 msgstr "Standaard account"
 
-#: src/prefs_folder_item.c:1185 src/prefs_folder_item.c:1215
+#: src/prefs_folder_item.c:1247 src/prefs_folder_item.c:1278
 msgid "\"Default\" will follow the applicable account preference"
 msgstr "\"Standaard\" volgt de voorkeuren van het betreffende account"
 
-#: src/prefs_folder_item.c:1758
+#: src/prefs_folder_item.c:1824
 msgid "Discard cache"
 msgstr "Cache weggooien"
 
-#: src/prefs_folder_item.c:1759
+#: src/prefs_folder_item.c:1825
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Wil je werkelijk de lokale cache voor deze map verwijderen?"
 
-#: src/prefs_folder_item.c:1874
+#: src/prefs_folder_item.c:1940
 msgid "General"
 msgstr "Algemeen"
 
-#: src/prefs_folder_item.c:1953
+#: src/prefs_folder_item.c:2019
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Eigenschappen voor map %s"
@@ -16555,7 +16804,7 @@ msgstr "Eigenschappen voor map %s"
 msgid "Folder and Message Lists"
 msgstr "Mappen- en berichtenlijst"
 
-#: src/prefs_fonts.c:96 src/prefs_matcher.c:2081
+#: src/prefs_fonts.c:96 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "Bericht"
 
@@ -16579,8 +16828,8 @@ msgstr "Gebruik ander lettertype bij het afdrukken"
 msgid "Message Printing"
 msgstr "Bericht afdrukken"
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:752 src/prefs_summaries.c:869
-#: src/prefs_themes.c:422
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Beeld"
 
@@ -16588,48 +16837,48 @@ msgstr "Beeld"
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:910 src/toolbar.c:260 src/toolbar.c:528
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: src/prefs_image_viewer.c:77
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Bijgevoegde afbeeldingen automatisch weergeven"
 
-#: src/prefs_image_viewer.c:81
+#: src/prefs_image_viewer.c:80
 msgid "Resize attached images by default"
 msgstr "Herschaal bijgevoegde afbeeldingen automatisch"
 
-#: src/prefs_image_viewer.c:84
+#: src/prefs_image_viewer.c:83
 msgid "Clicking image toggles scaling"
 msgstr "Klikken op de afbeelding verandert schalen"
 
-#: src/prefs_image_viewer.c:93
+#: src/prefs_image_viewer.c:92
 msgid "Fit image"
 msgstr "Afbeelding passend maken"
 
-#: src/prefs_image_viewer.c:97
+#: src/prefs_image_viewer.c:96
 msgid "Right-clicking image toggles fitting height/width"
 msgstr ""
 "Rechts-klikken op de afbeelding verandert op hoogte/breedte passend maken"
 
-#: src/prefs_image_viewer.c:100
+#: src/prefs_image_viewer.c:99
 msgid "Height"
 msgstr "Hoogte"
 
-#: src/prefs_image_viewer.c:106
+#: src/prefs_image_viewer.c:105
 msgid "Width"
 msgstr "Breedte"
 
-#: src/prefs_image_viewer.c:111
+#: src/prefs_image_viewer.c:110
 msgid "Display images inline"
 msgstr "Afbeeldingen in het bericht weergeven"
 
-#: src/prefs_image_viewer.c:115
+#: src/prefs_image_viewer.c:114
 msgid "Print images"
 msgstr "Druk afbeeldingen af"
 
-#: src/prefs_image_viewer.c:174
+#: src/prefs_image_viewer.c:173
 msgid "Image Viewer"
 msgstr "Afbeeldingweergever"
 
@@ -16750,7 +16999,7 @@ msgstr "Foutmeldingen"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeldingen voor filteren/verwerken log"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:785
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:143 src/prefs_other.c:785
 msgid "Other"
 msgstr "Diversen"
 
@@ -16803,12 +17052,12 @@ msgid "bytes"
 msgstr "bytes"
 
 #: src/prefs_matcher.c:363
-msgid "kilobytes"
-msgstr "kilobytes"
+msgid "kibibytes"
+msgstr "kibibytes"
 
 #: src/prefs_matcher.c:364
-msgid "megabytes"
-msgstr "megabytes"
+msgid "mebibytes"
+msgstr "mebibytes"
 
 #: src/prefs_matcher.c:368
 msgid "contains"
@@ -16834,11 +17083,11 @@ msgstr "berichtinhoud"
 msgid "whole message"
 msgstr "hele bericht"
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6534
+#: src/prefs_matcher.c:402 src/summaryview.c:6551
 msgid "Marked"
 msgstr "Gemarkeerd"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6532
+#: src/prefs_matcher.c:403 src/summaryview.c:6549
 msgid "Deleted"
 msgstr "Verwijderd"
 
@@ -16846,12 +17095,12 @@ msgstr "Verwijderd"
 msgid "Replied"
 msgstr "Beantwoord"
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6526
+#: src/prefs_matcher.c:405 src/summaryview.c:6543
 msgid "Forwarded"
 msgstr "Doorgestuurd"
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6516 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2342
+#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Spam"
 
@@ -16859,7 +17108,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Heeft bijlage"
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6552
+#: src/prefs_matcher.c:409 src/summaryview.c:6569
 msgid "Signed"
 msgstr "Ondertekend"
 
@@ -16943,7 +17192,7 @@ msgstr "Zin"
 msgid "Flags"
 msgstr "Vlaggen"
 
-#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:378
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "Kleurlabels"
 
@@ -16967,8 +17216,8 @@ msgstr ""
 "Gebruik kiezer rechts om de header-naam te kiezen. Type de naam van de "
 "header wanneer het niet beschikbaar is in de lijst."
 
-#: src/prefs_matcher.c:715 src/prefs_matcher.c:1653 src/prefs_matcher.c:1668
-#: src/prefs_matcher.c:2577
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1655 src/prefs_matcher.c:1670
+#: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
@@ -16993,32 +17242,32 @@ msgstr "elke"
 msgid "of above rules"
 msgstr "van bovenstaande regels"
 
-#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1637
+#: src/prefs_matcher.c:1561 src/prefs_matcher.c:1639
 msgid "Search pattern is not set."
 msgstr "Zoekcriteria niet ingevoerd."
 
-#: src/prefs_matcher.c:1574
+#: src/prefs_matcher.c:1575
 msgid "Invalid hour."
 msgstr "Ongeldig uur."
 
-#: src/prefs_matcher.c:1583
+#: src/prefs_matcher.c:1585
 msgid "Test command is not set."
 msgstr "Test-opdrachtregel is niet ingevoerd."
 
-#: src/prefs_matcher.c:1654
+#: src/prefs_matcher.c:1656
 msgid "all addresses in all headers"
 msgstr "alle adressen in alle headers"
 
-#: src/prefs_matcher.c:1657
+#: src/prefs_matcher.c:1659
 msgid "any address in any header"
 msgstr "elk adres in elke header"
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "de adres(sen) in header '%s'"
 
-#: src/prefs_matcher.c:1660
+#: src/prefs_matcher.c:1662
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -17031,87 +17280,87 @@ msgstr ""
 "Als je %s wilt vergelijken met alle ingangen in het adresboek, dan dien je "
 "'%s' te selecteren van de boek/map-keuzelijst."
 
-#: src/prefs_matcher.c:1879
+#: src/prefs_matcher.c:1884
 msgid "Headers part"
 msgstr "Header-deel"
 
-#: src/prefs_matcher.c:1883
+#: src/prefs_matcher.c:1888
 msgid "Headers values"
 msgstr "Header-waardes"
 
-#: src/prefs_matcher.c:1887
+#: src/prefs_matcher.c:1892
 msgid "Body part"
 msgstr "Berichtinhoud"
 
-#: src/prefs_matcher.c:1891
+#: src/prefs_matcher.c:1896
 msgid "Whole message"
 msgstr "Hele bericht"
 
-#: src/prefs_matcher.c:2008 src/prefs_matcher.c:2054
+#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
 msgid "in"
 msgstr "in"
 
-#: src/prefs_matcher.c:2010
+#: src/prefs_matcher.c:2015
 msgid "content is"
 msgstr "inhoud is"
 
-#: src/prefs_matcher.c:2014
+#: src/prefs_matcher.c:2019
 msgid "Date is"
 msgstr "Datum is"
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2030
 msgid "Age is"
 msgstr "Leeftijd is"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2035
 msgid "Flag"
 msgstr "Vlag"
 
-#: src/prefs_matcher.c:2031 src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
 msgstr "is"
 
-#: src/prefs_matcher.c:2036
+#: src/prefs_matcher.c:2041
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2049
 msgid "Label"
 msgstr "Label"
 
-#: src/prefs_matcher.c:2049
+#: src/prefs_matcher.c:2054
 msgid "Value:"
 msgstr "Waarde:"
 
-#: src/prefs_matcher.c:2064
+#: src/prefs_matcher.c:2069
 msgid "Score is"
 msgstr "Score is"
 
-#: src/prefs_matcher.c:2065
+#: src/prefs_matcher.c:2070
 msgid "points"
 msgstr "punten"
 
-#: src/prefs_matcher.c:2075
+#: src/prefs_matcher.c:2080
 msgid "Size is"
 msgstr "Grootte is"
 
-#: src/prefs_matcher.c:2080
+#: src/prefs_matcher.c:2085
 msgid "Scope:"
 msgstr "Breedte:"
 
-#: src/prefs_matcher.c:2082
+#: src/prefs_matcher.c:2087
 msgid "tags"
 msgstr "tags"
 
-#: src/prefs_matcher.c:2087
+#: src/prefs_matcher.c:2092
 msgid "type is"
 msgstr "type is"
 
-#: src/prefs_matcher.c:2091
+#: src/prefs_matcher.c:2096
 msgid "Program returns"
 msgstr "Programma komt terug"
 
-#: src/prefs_matcher.c:2161
+#: src/prefs_matcher.c:2166
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -17119,11 +17368,11 @@ msgstr ""
 "Deze ingang is niet opgeslagen.\n"
 "Toch sluiten?"
 
-#: src/prefs_matcher.c:2228
+#: src/prefs_matcher.c:2234
 msgid "Match Type: 'Test'"
 msgstr "Zoek Type: 'Test'"
 
-#: src/prefs_matcher.c:2229
+#: src/prefs_matcher.c:2235
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -17136,7 +17385,7 @@ msgstr ""
 "\n"
 "De volgende speciale tekens kunnen gebruikt worden:"
 
-#: src/prefs_matcher.c:2328
+#: src/prefs_matcher.c:2334
 msgid "Current condition rules"
 msgstr "Huidige voorwaarden"
 
@@ -17253,120 +17502,119 @@ msgstr ""
 msgid "Configuration warning"
 msgstr "Waarschuwing over de configuratie"
 
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:145
 msgid "Message view"
 msgstr "Berichtweergave"
 
-#: src/prefs_msg_colors.c:160
+#: src/prefs_msg_colors.c:152
 msgid "Enable coloration of message text"
 msgstr "Kleurmarkering in berichten activeren"
 
-#: src/prefs_msg_colors.c:168
+#: src/prefs_msg_colors.c:160
 msgid "Quote"
 msgstr "Citaat"
 
-#: src/prefs_msg_colors.c:180
+#: src/prefs_msg_colors.c:172
 msgid "Cycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_msg_colors.c:184
+#: src/prefs_msg_colors.c:176
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr ""
 "Als er meer dan drie citatie-niveaus zijn zullen de kleuren worden "
 "hergebruikt"
 
-#: src/prefs_msg_colors.c:190
+#: src/prefs_msg_colors.c:182
 msgid "1st Level"
 msgstr "1e niveau"
 
-#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:232
+#: src/prefs_msg_colors.c:188 src/prefs_msg_colors.c:206
+#: src/prefs_msg_colors.c:224
 msgid "Text"
 msgstr "Tekst"
 
-#: src/prefs_msg_colors.c:200
+#: src/prefs_msg_colors.c:192
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Selecteer kleur voor tekst van 1e niveau"
 
-#: src/prefs_msg_colors.c:208
+#: src/prefs_msg_colors.c:200
 msgid "2nd Level"
 msgstr "2e niveau"
 
-#: src/prefs_msg_colors.c:218
+#: src/prefs_msg_colors.c:210
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Selecteer kleur voor tekst van 2e niveau"
 
-#: src/prefs_msg_colors.c:226
+#: src/prefs_msg_colors.c:218
 msgid "3rd Level"
 msgstr "3e niveau"
 
-#: src/prefs_msg_colors.c:236
+#: src/prefs_msg_colors.c:228
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Selecteer kleur voor tekst van 3e niveau"
 
-#: src/prefs_msg_colors.c:245
+#: src/prefs_msg_colors.c:237
 msgid "Enable coloration of text background"
 msgstr "Gebruik van achtergrondkleur activeren"
 
-#: src/prefs_msg_colors.c:254
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:247
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Selecteer kleur voor achtergrond van 1e niveau"
 
-#: src/prefs_msg_colors.c:267
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:261
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Selecteer kleur voor achtergrond van 2e niveau"
 
-#: src/prefs_msg_colors.c:280
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:275
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Selecteer kleur voor achtergrond van 3e niveau"
 
-#: src/prefs_msg_colors.c:292
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:288
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for links"
 msgstr "Selecteer kleur voor koppelingen"
 
-#: src/prefs_msg_colors.c:296
+#: src/prefs_msg_colors.c:292
 msgid "URI link"
 msgstr "URI koppeling"
 
-#: src/prefs_msg_colors.c:304
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:301
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for signatures"
 msgstr "Selecteer kleur voor ondertekeningen"
 
 #. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
 #. versions of the same text file
-#: src/prefs_msg_colors.c:314
+#: src/prefs_msg_colors.c:311
 msgid "Patch messages and attachments"
 msgstr "Patchberichten en bijvoegsels"
 
-#: src/prefs_msg_colors.c:322
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:320
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for inserted lines"
 msgstr "Selecteer kleur voor ingevoegde regels"
 
-#: src/prefs_msg_colors.c:324
+#: src/prefs_msg_colors.c:322
 msgid "Inserted lines"
 msgstr "Ingevoegde regels"
 
-#: src/prefs_msg_colors.c:331
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:330
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for removed lines"
 msgstr "Selecteer kleur voor verwijderde regels"
 
-#: src/prefs_msg_colors.c:334
+#: src/prefs_msg_colors.c:333
 msgid "Removed lines"
 msgstr "Verwijderde regels"
 
-#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
 #: src/prefs_msg_colors.c:342
-msgctxt "Tooltip"
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for hunk lines"
 msgstr "Selecteer kleur voor \"hunk\"-regels"
 
@@ -17375,36 +17623,40 @@ msgstr "Selecteer kleur voor \"hunk\"-regels"
 msgid "Hunk lines"
 msgstr "\"Hunk\"-regels"
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
 msgid "Folder list"
 msgstr "Mappenlijst"
 
-#: src/prefs_msg_colors.c:355
-msgctxt "Tooltip"
-msgid ""
-"Pick color for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
-msgstr ""
-"Selecteer de kleur voor de doelmap. Een doelmap wordt gebruikt als de optie "
-"'Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt' "
-"uitgeschakeld is"
+#: src/prefs_msg_colors.c:356
+msgctxt "Tooltip and Dialog title"
+msgid "Pick color for Target folder."
+msgstr "Selecteer kleur voor doelmap."
 
-#: src/prefs_msg_colors.c:360
+#: src/prefs_msg_colors.c:357
 msgid "Target folder"
 msgstr "Doelmap"
 
-#: src/prefs_msg_colors.c:367
+#: src/prefs_msg_colors.c:359
 msgctxt "Tooltip"
+msgid ""
+"Target folder is used when the option 'Execute immediately when moving or "
+"deleting messages' is turned off"
+msgstr ""
+"Doelmap wordt gebruikt als de optie 'Meteen uitvoeren wanneer een bericht "
+"verplaatst of verwijderd wordt' uitgeschakeld is"
+
+#: src/prefs_msg_colors.c:370
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for folders containing new messages"
 msgstr "Selecteer kleur voor mappen met nieuwe berichten"
 
-#: src/prefs_msg_colors.c:371
+#: src/prefs_msg_colors.c:373
 msgid "Folder containing new messages"
 msgstr "Map met nieuwe berichten"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:396 src/prefs_msg_colors.c:428
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:435
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -17412,85 +17664,18 @@ msgstr "Selecteer kleur voor 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:400 src/prefs_msg_colors.c:432
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:439
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Selecteer label voor 'color %d'"
 
-#: src/prefs_msg_colors.c:527
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text"
-msgstr "Selecteer kleur voor tekst van 1e niveau"
-
-#: src/prefs_msg_colors.c:529
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text"
-msgstr "Selecteer kleur voor tekst van 2e niveau"
-
-#: src/prefs_msg_colors.c:531
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text"
-msgstr "Selecteer kleur voor tekst van 3e niveau"
-
-#: src/prefs_msg_colors.c:533
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text background"
-msgstr "Selecteer kleur voor achtergrond van 1e niveau"
-
-#: src/prefs_msg_colors.c:535
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text background"
-msgstr "Selecteer kleur voor achtergrond van 2e niveau"
-
-#: src/prefs_msg_colors.c:537
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text background"
-msgstr "Selecteer kleur voor achtergrond van 3e niveau"
-
-#: src/prefs_msg_colors.c:539
-msgctxt "Dialog title"
-msgid "Pick color for links"
-msgstr "Selecteer kleur voor koppelingen"
-
-#: src/prefs_msg_colors.c:541
-msgctxt "Dialog title"
-msgid "Pick color for target folder"
-msgstr "Selecteer kleur voor doelmap"
-
-#: src/prefs_msg_colors.c:543
-msgctxt "Dialog title"
-msgid "Pick color for signatures"
-msgstr "Selecteer kleur voor ondertekeningen"
-
-#: src/prefs_msg_colors.c:545
-msgctxt "Dialog title"
-msgid "Pick color for folder"
-msgstr "Selecteer kleur voor map"
-
-#: src/prefs_msg_colors.c:547
-msgctxt "Dialog title"
-msgid "Pick color for inserted lines"
-msgstr "Selecteer kleur voor ingevoegde regels"
-
-#: src/prefs_msg_colors.c:549
-msgctxt "Dialog title"
-msgid "Pick color for removed lines"
-msgstr "Selecteer kleur voor verwijderde regels"
-
-#: src/prefs_msg_colors.c:551
-msgctxt "Dialog title"
-msgid "Pick color for hunk lines"
-msgstr "Selecteer kleur voor \"hunk\"-regels"
-
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:574
+#: src/prefs_msg_colors.c:411 src/prefs_msg_colors.c:448
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "Selecteer kleur voor 'color %d'"
 
-#: src/prefs_msg_colors.c:753
+#: src/prefs_msg_colors.c:582
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -17499,17 +17684,8 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Kies thema sneltoetsen"
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Selecteer thema:"
-
-#: src/prefs_other.c:138
-msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
-msgstr ""
-"Je kunt ook altijd sneltoetsen van menu-items veranderen door\n"
-"met de muis op dat item te gaan staan, en dan de gewenste toets in te "
-"drukken."
+msgid "Select preset keyboard shortcuts:"
+msgstr "Kies voor-ingestelde sneltoetsen:"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
@@ -17541,7 +17717,7 @@ msgstr "Schakel gebruik van sneltoetsen in"
 
 #: src/prefs_other.c:519
 msgid " Choose preset keyboard shortcuts... "
-msgstr "Kies vooringestelde sneltoetsen... "
+msgstr " Kies vooringestelde sneltoetsen... "
 
 #: src/prefs_other.c:529
 msgid "Metadata handling"
@@ -17614,31 +17790,31 @@ msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniseer offline mappen zo snel mogelijk"
 
 #: src/prefs_other.c:604
-msgid "Master passphrase"
+msgid "Primary passphrase"
 msgstr "Hoofdwachtwoord"
 
 #: src/prefs_other.c:607
-msgid "Use a master passphrase"
+msgid "Use a primary passphrase"
 msgstr "Gebruik een hoofdwachtwoord"
 
 #: src/prefs_other.c:610
 msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
+"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 ""
 "Wanneer aangevinkt zullen je account-wachtwoorden beveiligd worden met een "
 "hoofdwachtwoord. Als er geen hoofdwachtwoord is ingesteld, dan wordt je "
 "gevraagd om deze in te stellen."
 
 #: src/prefs_other.c:615
-msgid "Change master passphrase"
-msgstr "Wijzigen hoofdwachtwoord"
+msgid "Change primary passphrase"
+msgstr "Wijzig hoofdwachtwoord"
 
 #: src/prefs_other.c:786
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: src/prefs_proxy.c:234 src/prefs_receive.c:415 src/prefs_send.c:411
+#: src/prefs_proxy.c:236 src/prefs_receive.c:415 src/prefs_send.c:411
 msgid "Mail Handling"
 msgstr "E-mailverwerking"
 
@@ -17879,261 +18055,269 @@ msgstr ""
 "Specificeer de Inhoud-Overdracht-Codering (Content-Transfer-Encoding) die "
 "gebruikt moet worden als de inhoud van het bericht niet-ASCII tekens bevat"
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Verzenden"
 
-#: src/prefs_spelling.c:80
-msgid "Pick color for misspelled word"
-msgstr "Kleur voor foutief gespeld woord"
-
-#: src/prefs_spelling.c:128
+#: src/prefs_spelling.c:115
 msgid "Enable spell checker"
 msgstr "Inschakelen spellingcontrole"
 
-#: src/prefs_spelling.c:133
+#: src/prefs_spelling.c:120
 msgid "Enable alternate dictionary"
 msgstr "Inschakelen mogelijkheid voor alternatieve woordenlijst"
 
-#: src/prefs_spelling.c:138
+#: src/prefs_spelling.c:125
 msgid "Faster switching with last used dictionary"
 msgstr "Sneller overschakelen met het laatst gebruikte woordenboek"
 
-#: src/prefs_spelling.c:140
+#: src/prefs_spelling.c:127
 msgid "Automatic spell checking"
 msgstr "Automatisch controleren"
 
-#: src/prefs_spelling.c:148
+#: src/prefs_spelling.c:135
 msgid "Re-check message when changing dictionary"
 msgstr "Controleer berichten opnieuw na veranderen van woordenboek"
 
-#: src/prefs_spelling.c:152
+#: src/prefs_spelling.c:139
 msgid "Dictionary"
 msgstr "Woordenlijst"
 
-#: src/prefs_spelling.c:181
+#: src/prefs_spelling.c:168
 msgid "Check with both dictionaries"
 msgstr "Controleer met beide woordenlijsten"
 
-#: src/prefs_spelling.c:187
+#: src/prefs_spelling.c:174
 msgid "Get more dictionaries..."
 msgstr "Haal meer woordenlijsten op..."
 
-#: src/prefs_spelling.c:196
+#: src/prefs_spelling.c:182
 msgid "Misspelled word color"
 msgstr "Kleur voor foutief gespeld woord"
 
-#: src/prefs_spelling.c:208
+#: src/prefs_spelling.c:192
+msgid "Pick color for misspelled word"
+msgstr "Selecteer kleur voor foutief gespeld woord"
+
+#: src/prefs_spelling.c:197
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr ""
 "Selecteer kleur voor foutief gespeld woord. Gebruik zwart voor onderstrepen"
 
-#: src/prefs_spelling.c:325
+#: src/prefs_spelling.c:309
 msgid "Spell Checking"
 msgstr "Spellingcontrole"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:164
 msgid "the abbreviated weekday name"
 msgstr "afkorting naam van de dag"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:165
 msgid "the full weekday name"
 msgstr "volledige naam van dag"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:166
 msgid "the abbreviated month name"
 msgstr "afkorting naam van de dag"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:167
 msgid "the full month name"
 msgstr "volledige naam van maand"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:168
 msgid "the preferred date and time for the current locale"
 msgstr "voorkeursdatum en -tijd voor huidige locale"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:169
 msgid "the century number (year/100)"
 msgstr "eeuw (jaar/100)"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:170
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:171
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "uur (24-uurs klok)"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:172
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "uur (12-uurs klok)"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:173
 msgid "the day of the year as a decimal number"
 msgstr "dagnummer van het jaar (1-366)"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:174
 msgid "the month as a decimal number"
 msgstr "maandnummer (1-12)"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:175
 msgid "the minute as a decimal number"
 msgstr "minuut"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:176
 msgid "either AM or PM"
 msgstr "of AM of PM"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:177
 msgid "the second as a decimal number"
 msgstr "seconde"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:178
 msgid "the day of the week as a decimal number"
 msgstr "dagnummer van de week (0-6, 0=zondag)"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:179
 msgid "the preferred date for the current locale"
 msgstr "voorkeursdatum voor huidige locale"
 
-#: src/prefs_summaries.c:183
+#: src/prefs_summaries.c:180
 msgid "the last two digits of a year"
 msgstr "laatste twee decimalen van een jaar"
 
-#: src/prefs_summaries.c:184
+#: src/prefs_summaries.c:181
 msgid "the year as a decimal number"
 msgstr "laatste decimaal van een jaar"
 
-#: src/prefs_summaries.c:185
+#: src/prefs_summaries.c:182
 msgid "the time zone or name or abbreviation"
 msgstr "tijdzone of naam of afkorting"
 
-#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
-#: src/prefs_summaries.c:486
+#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
+#: src/prefs_summaries.c:488
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_summaries.c:231
+#: src/prefs_summaries.c:228
 msgid "Specifier"
 msgstr "Teken"
 
-#: src/prefs_summaries.c:273
+#: src/prefs_summaries.c:270
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_summaries.c:400
+#: src/prefs_summaries.c:398
 msgid "Display message count next to folder name"
 msgstr "Geef aantal berichten weer naast mapnaam"
 
-#: src/prefs_summaries.c:410
+#: src/prefs_summaries.c:408
 msgid "Unread messages"
 msgstr "Ongelezen berichten"
 
-#: src/prefs_summaries.c:411
+#: src/prefs_summaries.c:409
 msgid "Unread and Total messages"
 msgstr "Ongelezen en Totaal aantal berichten"
 
-#: src/prefs_summaries.c:417
+#: src/prefs_summaries.c:415
 msgid "Open last opened folder at start-up"
 msgstr "Open de laatst geopende map bij het opstarten"
 
-#: src/prefs_summaries.c:424
+#: src/prefs_summaries.c:419
+msgid ""
+"Run processing rules before marking all messages in a folder as read or "
+"unread"
+msgstr ""
+"Draai verwerkingsregels voordat alle berichten in een map als gelezen of "
+"ongelezen worden gemarkeerd"
+
+#: src/prefs_summaries.c:426
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Inkorten van nieuwsgroep namen langer dan"
 
-#: src/prefs_summaries.c:437
+#: src/prefs_summaries.c:439
 msgid "letters"
 msgstr "tekens"
 
-#: src/prefs_summaries.c:445
+#: src/prefs_summaries.c:447
 msgid "Message list"
 msgstr "Berichtenlijst"
 
-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:464
 msgid "Lock column headers"
 msgstr "Kolomkoppen vastzetten"
 
-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:470
 msgid "Displayed in From column"
 msgstr "Weergegeven in Van-kolom"
 
-#: src/prefs_summaries.c:479
+#: src/prefs_summaries.c:481
 msgid "Name and Address"
 msgstr "Naam en adres"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:507
 msgid "Date format help"
 msgstr "Help bij datumformat"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:513
 msgid "Set message selection when entering a folder"
 msgstr "Stel standaard selectie in bij het binnen gaan van een map"
 
-#: src/prefs_summaries.c:520
+#: src/prefs_summaries.c:522
 msgid "Open message when selected"
 msgstr "Bij selecteren het bericht openen"
 
-#: src/prefs_summaries.c:525
+#: src/prefs_summaries.c:527
 msgid "When opening a folder"
 msgstr "Bij het binnen gaan van een map"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:529
 msgid "When displaying search results"
 msgstr "Wanneer de zoekresultaten weergegeven worden"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:531
 msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 "Bij het selecteren van het vorige of volgende bericht m.b.v. sneltoetsen"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:533
 msgid "When deleting or moving messages"
 msgstr "Wanneer berichten worden verwijderd of verplaatst"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:535
 msgid "When using directional keys"
 msgstr "Wanneer de pijltjestoetsen gebruikt worden"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:537
 msgid "Mark message as read"
 msgstr "Markeer berichten als gelezen"
 
-#: src/prefs_summaries.c:538
+#: src/prefs_summaries.c:540
 msgid "when selected, after"
 msgstr "bij selecteren, na"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:559
 msgid "only when opened in a new window, or replied to"
 msgstr "alleen als ze geopend worden in een nieuw venster, of beantwoord zijn"
 
-#: src/prefs_summaries.c:567
+#: src/prefs_summaries.c:569
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Toon 'Geen ongelezen (nieuwe) berichten'-dialoogvenster"
 
-#: src/prefs_summaries.c:577
+#: src/prefs_summaries.c:579
 msgid "Assume 'Yes'"
 msgstr "Veronderstel 'Ja'"
 
-#: src/prefs_summaries.c:578
+#: src/prefs_summaries.c:580
 msgid "Assume 'No'"
 msgstr "Veronderstel 'Nee'"
 
-#: src/prefs_summaries.c:584
+#: src/prefs_summaries.c:586
 msgid "Display sender using address book"
 msgstr "Toon afzender mbv. adresboek"
 
-#: src/prefs_summaries.c:588
+#: src/prefs_summaries.c:590
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 "Maak discussie-draden aan, aan de hand van het onderwerp bovenop het gebruik "
 "van de standaard headers"
 
-#: src/prefs_summaries.c:592
+#: src/prefs_summaries.c:594
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:596
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -18141,56 +18325,56 @@ msgstr ""
 "Indien uitgeschakeld, stelt verplaatsen, kopiëren en verwijderen van "
 "berichten uit totdat je 'Gereedschap/Uitvoeren' kiest"
 
-#: src/prefs_summaries.c:599
+#: src/prefs_summaries.c:601
 msgid "Confirm when marking all messages as read or unread"
 msgstr ""
 "Bevestigen om alle berichten in een map als gelezen of ongelezen te markeren"
 
-#: src/prefs_summaries.c:602
+#: src/prefs_summaries.c:604
 msgid "Confirm when changing color labels"
 msgstr "Bevestigen voor veranderen kleurlabels"
 
-#: src/prefs_summaries.c:606
+#: src/prefs_summaries.c:608
 msgid "Show tooltips"
 msgstr "Geef tooltips weer"
 
-#: src/prefs_summaries.c:616 src/quote_fmt.c:541
+#: src/prefs_summaries.c:618 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
-#: src/prefs_summaries.c:618
+#: src/prefs_summaries.c:620
 msgid "New folders"
 msgstr "Nieuwe mappen"
 
-#: src/prefs_summaries.c:624
+#: src/prefs_summaries.c:626
 msgid "Sort by"
 msgstr "Sorteren op"
 
-#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Nummer"
 
-#: src/prefs_summaries.c:635
+#: src/prefs_summaries.c:637
 msgid "Thread date"
 msgstr "Datum van draad"
 
-#: src/prefs_summaries.c:646
+#: src/prefs_summaries.c:648
 msgid "Don't sort"
 msgstr "Niet sorteren"
 
-#: src/prefs_summaries.c:661
+#: src/prefs_summaries.c:663
 msgid "Thread view"
 msgstr "Boomvorm"
 
-#: src/prefs_summaries.c:664
+#: src/prefs_summaries.c:666
 msgid "Collapse all threads"
 msgstr "Berichtenboom inklappen"
 
-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:672
 msgid "Hide read messages"
 msgstr "Gelezen berichten verbergen"
 
-#: src/prefs_summaries.c:870
+#: src/prefs_summaries.c:877
 msgid "Summaries"
 msgstr "Samenvattingen"
 
@@ -18365,29 +18549,29 @@ msgstr "Huidige sjablonen"
 msgid "Template"
 msgstr "Sjabloon"
 
-#: src/prefs_themes.c:401 src/prefs_themes.c:841
+#: src/prefs_themes.c:405 src/prefs_themes.c:939
 msgid "Default internal theme"
 msgstr "Standaard intern thema"
 
-#: src/prefs_themes.c:423
+#: src/prefs_themes.c:427
 msgid "Themes"
 msgstr "Thema's"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:504
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Verwijder systeemthema '%s'"
 
-#: src/prefs_themes.c:502
+#: src/prefs_themes.c:506
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Verwijder thema '%s'"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:511
 msgid "Are you sure you want to remove this theme?"
 msgstr "Wil je dit thema werkelijk verwijderen?"
 
-#: src/prefs_themes.c:517
+#: src/prefs_themes.c:521
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18396,24 +18580,24 @@ msgstr ""
 "Bestand %s mislukt\n"
 "tijdens verwijderen thema."
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:525
 msgid "Removing theme directory failed."
 msgstr "Verwijderen van thema-map mislukt."
 
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:528
 msgid "Theme removed successfully"
 msgstr "Thema verwijderd"
 
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:548
 msgid "Select theme folder"
 msgstr "Selecteer thema-map"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:563
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Installeer thema '%s'"
 
-#: src/prefs_themes.c:562
+#: src/prefs_themes.c:566
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18421,15 +18605,15 @@ msgstr ""
 "Deze map lijkt niet een thema-map te zijn.\n"
 "Toch installeren?"
 
-#: src/prefs_themes.c:572
+#: src/prefs_themes.c:576
 msgid "Do you want to install theme for all users?"
 msgstr "Wil je dit thema voor alle gebruikers installeren?"
 
-#: src/prefs_themes.c:592
+#: src/prefs_themes.c:596
 msgid "Theme exists"
 msgstr "Thema bestaat"
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:597
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18441,25 +18625,25 @@ msgstr ""
 "\n"
 "Wil je het vervangen?"
 
-#: src/prefs_themes.c:600
+#: src/prefs_themes.c:604
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Kon het oude thema in '%s' niet verwijderen."
 
-#: src/prefs_themes.c:609
+#: src/prefs_themes.c:613
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Kon de doelmap %s niet aanmaken."
 
-#: src/prefs_themes.c:623
+#: src/prefs_themes.c:627
 msgid "Theme installed successfully."
 msgstr "Thema geïnstalleerd."
 
-#: src/prefs_themes.c:630
+#: src/prefs_themes.c:634
 msgid "Failed installing theme"
 msgstr "Installatie thema mislukt"
 
-#: src/prefs_themes.c:633
+#: src/prefs_themes.c:637
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18468,74 +18652,82 @@ msgstr ""
 "Bestand %s mislukt\n"
 "tijdens installatie thema."
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:686
+msgid "View all theme icons"
+msgstr "Bekijk alle thema-pictogrammen"
+
+#: src/prefs_themes.c:901
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d themas beschikbaar (%d gebruiker, %d systeem, 1 intern)"
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:942
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Intern thema heeft %d pictogrammen"
 
-#: src/prefs_themes.c:850
+#: src/prefs_themes.c:948
 msgid "No info file available for this theme"
 msgstr "Geen info-bestand beschikbaar voor dit thema"
 
-#: src/prefs_themes.c:868
+#: src/prefs_themes.c:966
 msgid "Error: couldn't get theme status"
 msgstr "Fout: kan status van thema niet achterhalen"
 
-#: src/prefs_themes.c:898
+#: src/prefs_themes.c:996
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d bestanden (%d pictogrammen), grootte: %s"
 
-#: src/prefs_themes.c:956
+#: src/prefs_themes.c:1055
 msgid "Selector"
 msgstr "Selecteer"
 
-#: src/prefs_themes.c:967
+#: src/prefs_themes.c:1066
 msgid "Install new..."
 msgstr "Installeer nieuwe..."
 
-#: src/prefs_themes.c:972
+#: src/prefs_themes.c:1071
 msgid "Get more..."
 msgstr "Haal er meer..."
 
-#: src/prefs_themes.c:984
+#: src/prefs_themes.c:1083
 msgid "Information"
 msgstr "Informatie"
 
-#: src/prefs_themes.c:999
+#: src/prefs_themes.c:1098
 msgid "Author"
 msgstr "Auteur"
 
-#: src/prefs_themes.c:1005
+#: src/prefs_themes.c:1104
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1043
+#: src/prefs_themes.c:1142
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/prefs_themes.c:1107
+#: src/prefs_themes.c:1205
+msgid "View all"
+msgstr "Bekijk alles"
+
+#: src/prefs_themes.c:1210
 msgid "SVG rendering"
 msgstr "SVG rendering"
 
-#: src/prefs_themes.c:1114
+#: src/prefs_themes.c:1217
 msgid "Enable alpha channel"
 msgstr "Inschakelen alpha-channel"
 
-#: src/prefs_themes.c:1115
+#: src/prefs_themes.c:1218
 msgid "Force scaling"
 msgstr "Forceer schalen"
 
-#: src/prefs_themes.c:1121
+#: src/prefs_themes.c:1224
 msgid "Pixels per inch (PPI)"
 msgstr "Pixels per inch (PPI)"
 
-#: src/prefs_toolbar.c:186
+#: src/prefs_toolbar.c:187
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -18543,71 +18735,71 @@ msgstr ""
 "Geselecteerde actie is al ingesteld.\n"
 "Kies een andere actie van de lijst"
 
-#: src/prefs_toolbar.c:187
+#: src/prefs_toolbar.c:188
 msgid "Item has no icon defined."
 msgstr "Item heeft geen pictogram ingesteld."
 
-#: src/prefs_toolbar.c:188
+#: src/prefs_toolbar.c:189
 msgid "Item has no text defined."
 msgstr "Item heeft geen tekst ingesteld."
 
-#: src/prefs_toolbar.c:896
+#: src/prefs_toolbar.c:897
 msgid "Toolbar item"
 msgstr "Werkbalk item"
 
-#: src/prefs_toolbar.c:913
+#: src/prefs_toolbar.c:914
 msgid "Item type"
 msgstr "Item-type"
 
-#: src/prefs_toolbar.c:921
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr "Interne Functie"
 
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr "Gebruikers Actie"
 
-#: src/prefs_toolbar.c:924 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:283
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:930
 msgid "Event executed on click"
 msgstr "Gebeurtenis uitgevoerd na klikken"
 
-#: src/prefs_toolbar.c:948
+#: src/prefs_toolbar.c:949
 msgid "Toolbar text"
 msgstr "Tekst van werkbalk"
 
-#: src/prefs_toolbar.c:961 src/prefs_toolbar.c:1336
+#: src/prefs_toolbar.c:962 src/prefs_toolbar.c:1338
 msgid "Icon"
 msgstr "Pictogram"
 
-#: src/prefs_toolbar.c:1215 src/prefs_toolbar.c:1229 src/prefs_toolbar.c:1243
+#: src/prefs_toolbar.c:1216 src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244
 msgid "Toolbars"
 msgstr "Werkbalken"
 
-#: src/prefs_toolbar.c:1216
+#: src/prefs_toolbar.c:1217
 msgid "Main Window"
 msgstr "Hoofdvenster"
 
-#: src/prefs_toolbar.c:1230
+#: src/prefs_toolbar.c:1231
 msgid "Message Window"
 msgstr "Berichtvenster"
 
-#: src/prefs_toolbar.c:1244
+#: src/prefs_toolbar.c:1245
 msgid "Compose Window"
 msgstr "Venster sluiten"
 
-#: src/prefs_toolbar.c:1359
+#: src/prefs_toolbar.c:1361
 msgid "Icon text"
 msgstr "Pictogramtekst"
 
-#: src/prefs_toolbar.c:1368
+#: src/prefs_toolbar.c:1370
 msgid "Mapped event"
 msgstr "Gebeurtenis"
 
-#: src/prefs_toolbar.c:1675
+#: src/prefs_toolbar.c:1677
 msgid "Toolbar item icon"
 msgstr "Werkbalk item pictogram"
 
@@ -18635,73 +18827,73 @@ msgstr "Tekst afbreken op"
 msgid "Wrapping"
 msgstr "Regels afbreken"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Afdrukvoorbeeld"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "Eerste pagina"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Laatste pagina"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "Zoom 100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Zoom passend"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Zoom in"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Zoom uit"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Pagina %d"
 
-#: src/privacy.c:255 src/privacy.c:276
+#: src/privacy.c:289 src/privacy.c:293
 msgid "No information available"
 msgstr "Geen informatie beschikbaar"
 
-#: src/privacy.c:490
+#: src/privacy.c:507
 msgid "No recipient keys defined."
 msgstr "Geen sleutel van ontvanger gedefinieerd."
 
-#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
+#: src/procmime.c:414 src/procmime.c:416 src/procmime.c:417
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fout bij decoderen BASE64]\n"
 
-#: src/procmime.c:2797
+#: src/procmime.c:2836
 msgid "Could not decode part"
 msgstr "Kon gedeelte van bericht niet decoderen"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:961 src/procmsg.c:964
 msgid "Already trying to send."
 msgstr "Reeds bezig met proberen te sturen."
 
-#: src/procmsg.c:1563 src/procmsg.c:1624
+#: src/procmsg.c:1588 src/procmsg.c:1649
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Kon bestand '%s' niet openen."
 
-#: src/procmsg.c:1634
+#: src/procmsg.c:1659
 msgid "Queued message header is broken."
 msgstr "Header van bericht in de wachtrij is kapot."
 
-#: src/procmsg.c:1654
+#: src/procmsg.c:1679
 msgid "An error happened during SMTP session."
 msgstr "Er is een fout opgetreden tijdens de SMTP-sessie."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1693
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -18709,7 +18901,7 @@ msgstr ""
 "Er is geen specifiek account gevonden om mee te versturen en er is een fout "
 "opgetreden tijdens de SMTP-sessie."
 
-#: src/procmsg.c:1676
+#: src/procmsg.c:1701
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -18717,21 +18909,21 @@ msgstr ""
 "Kon verzend-informatie niet vinden. Misschien is deze e-mail niet gemaakt "
 "met Claws Mail."
 
-#: src/procmsg.c:1699
+#: src/procmsg.c:1724
 msgid "Couldn't create temporary file for news sending."
 msgstr "Kon tijdelijk bestand voor het verzenden van nieuws niet aanmaken."
 
-#: src/procmsg.c:1712
+#: src/procmsg.c:1737
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Fout bij het schrijven naar tijdelijk bestand voor het verzenden van nieuws."
 
-#: src/procmsg.c:1726
+#: src/procmsg.c:1751
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/procmsg.c:2286
+#: src/procmsg.c:2311
 msgid "Filtering messages...\n"
 msgstr "Berichten sorteren...\n"
 
@@ -19043,88 +19235,88 @@ msgstr "Geef tekst om '%s' mee te vervangen"
 msgid "Enter variable"
 msgstr "Geef variabele"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Bericht wordt verzonden met behulp van opdracht: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kon de externe opdracht '%s' niet uitvoeren"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Fout bij uitvoeren van opdracht: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Bezig met POP voor SMTP..."
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP voor SMTP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Account '%s': Verbinden met SMTP-server: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "Bestand verzonden."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "HELO wordt verstuurd..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Bezig met authenticatie"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Bericht wordt verzonden..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "EHLO wordt verstuurd..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM wordt verstuurd..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO wordt verstuurd..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "DATA wordt verstuurd..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Bezig met sluiten..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bericht wordt verzonden (%d / %d bytes)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Bericht wordt verzonden"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19148,11 +19340,11 @@ msgstr ""
 "Je kunt een bestaand postvak in MH-format gebruiken.\n"
 "Als je twijfelt kun je het beste gewoon op OK klikken."
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Bron van het bericht"
 
-#: src/sourcewindow.c:161
+#: src/sourcewindow.c:162
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Bron"
@@ -19162,14 +19354,14 @@ msgid "Expiry"
 msgstr "Verloopt"
 
 #: src/ssl_manager.c:195
-msgid "Saved SSL/TLS certificates"
-msgstr "Opgeslagen SSL/TLS-certificaten"
+msgid "Saved TLS certificates"
+msgstr "Opgeslagen TLS-certificaten"
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:451
 msgid "Delete certificate"
 msgstr "Certificaat verwijderen"
 
-#: src/ssl_manager.c:447
+#: src/ssl_manager.c:452
 msgid "Do you really want to delete this certificate?"
 msgstr "Wil je dit certificaat werkelijk verwijderen?"
 
@@ -19197,80 +19389,80 @@ msgstr "Voorwaarde:"
 msgid "Find _all"
 msgstr "Vind _alles"
 
-#: src/summary_search.c:696 src/summaryview.c:1134 src/summaryview.c:1397
+#: src/summary_search.c:696 src/summaryview.c:1138 src/summaryview.c:1402
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Bezig met zoeken in %s...\n"
 
-#: src/summary_search.c:791
+#: src/summary_search.c:792
 msgid "Beginning of list reached; continue from end?"
 msgstr "Begin van de lijst bereikt, verdergaan vanaf het einde?"
 
-#: src/summary_search.c:793
+#: src/summary_search.c:794
 msgid "End of list reached; continue from beginning?"
 msgstr "Einde van de lijst bereikt, verdergaan vanaf het begin?"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "Re-edit"
 msgstr "Opnieuw wijzigen"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "Create _filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "_Set displayed columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:457
 msgid "_Lock column headers"
 msgstr "Kolomkoppen _vastzetten"
 
-#: src/summaryview.c:593
+#: src/summaryview.c:595
 msgid "Toggle quick search bar"
 msgstr "Verberg/Toon snelzoeken"
 
-#: src/summaryview.c:630
+#: src/summaryview.c:632
 msgid "Toggle multiple selection"
 msgstr "Tik meervoudige selectie aan"
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1329
 msgid "Process mark"
 msgstr "Verwerkmarkering"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1330
 msgid "Some marks are left. Process them?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:1376
+#: src/summaryview.c:1381
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Map wordt ingelezen (%s)..."
 
-#: src/summaryview.c:1937 src/summaryview.c:1985
+#: src/summaryview.c:1935 src/summaryview.c:1984
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten"
 
-#: src/summaryview.c:1938
+#: src/summaryview.c:1936
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:1950 src/summaryview.c:1998 src/summaryview.c:2035
-#: src/summaryview.c:2083 src/summaryview.c:2150
+#: src/summaryview.c:1949 src/summaryview.c:1998 src/summaryview.c:2036
+#: src/summaryview.c:2085 src/summaryview.c:2154
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interne fout: onverwachte waarde voor prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1962
+#: src/summaryview.c:1961
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1986
+#: src/summaryview.c:1985
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2022 src/summaryview.c:2070
+#: src/summaryview.c:2022 src/summaryview.c:2071
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten"
 
@@ -19278,236 +19470,236 @@ msgstr "Geen nieuwe berichten"
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuwe berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:2047
+#: src/summaryview.c:2048
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:2071
+#: src/summaryview.c:2072
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2104 src/summaryview.c:2137
+#: src/summaryview.c:2106 src/summaryview.c:2140
 msgid "No more marked messages"
 msgstr "Laatste gemarkeerde bericht"
 
-#: src/summaryview.c:2105
+#: src/summaryview.c:2107
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerde berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:2114
+#: src/summaryview.c:2117
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:2138
+#: src/summaryview.c:2141
 msgid "No marked message found. Go to next folder?"
 msgstr "Geen ongemarkeerde berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2171 src/summaryview.c:2200
+#: src/summaryview.c:2175 src/summaryview.c:2205
 msgid "No more labeled messages"
 msgstr "Geen berichten met labels"
 
-#: src/summaryview.c:2172
+#: src/summaryview.c:2176
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen berichten met gekleurde labels gevonden. Zoeken vanaf eind?"
 
-#: src/summaryview.c:2181 src/summaryview.c:2214
+#: src/summaryview.c:2186 src/summaryview.c:2220
 msgid "No labeled messages."
 msgstr "Geen berichten met labels."
 
-#: src/summaryview.c:2201
+#: src/summaryview.c:2206
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen berichten met gekleurde labels gevonden. Zoeken vanaf begin?"
 
-#: src/summaryview.c:2524
+#: src/summaryview.c:2530
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:2712
+#: src/summaryview.c:2718
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2722
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:2717 src/summaryview.c:2724
+#: src/summaryview.c:2723 src/summaryview.c:2730
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2728
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:2736
+#: src/summaryview.c:2742
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " item geselecteerd"
 msgstr[1] " items geselecteerd"
 
-#: src/summaryview.c:2754 src/summaryview.c:2799
+#: src/summaryview.c:2760 src/summaryview.c:2805
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:2774
+#: src/summaryview.c:2780
 msgid "Message summary"
 msgstr "Berichtsamenvatting"
 
-#: src/summaryview.c:2775
+#: src/summaryview.c:2781
 msgid "New:"
 msgstr "Nieuw:"
 
-#: src/summaryview.c:2776
+#: src/summaryview.c:2782
 msgid "Unread:"
 msgstr "Ongelezen:"
 
-#: src/summaryview.c:2777
+#: src/summaryview.c:2783
 msgid "Total:"
 msgstr "Totaal:"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2785
 msgid "Marked:"
 msgstr "Gemarkeerd:"
 
-#: src/summaryview.c:2780
+#: src/summaryview.c:2786
 msgid "Replied:"
 msgstr "Beantwoord:"
 
-#: src/summaryview.c:2781
+#: src/summaryview.c:2787
 msgid "Forwarded:"
 msgstr "Doorgestuurd:"
 
-#: src/summaryview.c:2782
+#: src/summaryview.c:2788
 msgid "Locked:"
 msgstr "Op slot:"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 msgid "Ignored:"
 msgstr "Genegeerd:"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2790
 msgid "Watched:"
 msgstr "Gevolgd:"
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2800
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d geselecteerd (%s/%s, %d ongelezen"
 
-#: src/summaryview.c:3082
+#: src/summaryview.c:3088
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:3250
+#: src/summaryview.c:3260
 msgid "Setting summary from message data..."
 msgstr "Lijst wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:3456
+#: src/summaryview.c:3466
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/summaryview.c:3513
+#: src/summaryview.c:3523
 msgid "(No Recipient)"
 msgstr "(Geen ontvanger)"
 
-#: src/summaryview.c:3561
+#: src/summaryview.c:3571
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Van: %s, op %s"
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3580
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Aan: %s, op %s"
 
-#: src/summaryview.c:4455
+#: src/summaryview.c:4465
 msgid "You're not the author of the article."
 msgstr "Je bent niet de auteur van het artikel."
 
-#: src/summaryview.c:4545
+#: src/summaryview.c:4555
 #, 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] "Wil je werkelijk het geselecteerde bericht verwijderen?"
 msgstr[1] "Wil je werkelijk de %d geselecteerde berichten verwijderen?"
 
-#: src/summaryview.c:4548
+#: src/summaryview.c:4558
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Verwijder bericht"
 msgstr[1] "Verwijder bericht"
 
-#: src/summaryview.c:4712
+#: src/summaryview.c:4722
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4767
+#: src/summaryview.c:4777
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "Selecteer map om geselecteerd bericht heen te verplaatsen"
 msgstr[1] "Selecteer map om geselecteerde berichten heen te verplaatsen"
 
-#: src/summaryview.c:4818
+#: src/summaryview.c:4828
 msgid "Destination to copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4852
+#: src/summaryview.c:4862
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "Selecteer map om geselecteerd bericht heen te kopiëren"
 msgstr[1] "Selecteer map om geselecteerde berichten heen te kopiëren"
 
-#: src/summaryview.c:5010
+#: src/summaryview.c:5026
 msgid "Append or Overwrite"
 msgstr "Toevoegen of Overschrijven"
 
-#: src/summaryview.c:5011
+#: src/summaryview.c:5027
 msgid "Append or overwrite existing file?"
 msgstr "Aan bestaand bestand toevoegen of overschrijven?"
 
-#: src/summaryview.c:5012
+#: src/summaryview.c:5028
 msgid "_Append"
 msgstr "_Toevoegen"
 
-#: src/summaryview.c:5012
+#: src/summaryview.c:5028
 msgid "_Overwrite"
 msgstr "_Overschrijven"
 
-#: src/summaryview.c:5023 src/summaryview.c:5026 src/summaryview.c:5041
+#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan bestand '%s' niet opslaan."
 
-#: src/summaryview.c:5061
+#: src/summaryview.c:5080
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "Je staat op het punt om %d berichten af te drukken. Wil je doorgaan?"
 
-#: src/summaryview.c:5519
+#: src/summaryview.c:5538
 msgid "Building threads..."
 msgstr "Discussie-draden worden opgebouwd..."
 
-#: src/summaryview.c:5767
+#: src/summaryview.c:5786
 msgid "Skip these rules"
 msgstr "Sla deze regels over"
 
-#: src/summaryview.c:5770
+#: src/summaryview.c:5789
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Pas deze regels toe, ongeacht welk account ze bij horen"
 
-#: src/summaryview.c:5773
+#: src/summaryview.c:5792
 msgid "Apply these rules if they apply to the current account"
 msgstr "Pas deze regels toe als ze betrekking hebben op het huidige account"
 
-#: src/summaryview.c:5802
+#: src/summaryview.c:5821
 msgid "Filtering"
 msgstr "Filteren"
 
-#: src/summaryview.c:5803
+#: src/summaryview.c:5822
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19515,73 +19707,73 @@ msgstr ""
 "Er zijn filterregels die bij een account horen.\n"
 "Kies wat te doen met deze regels:"
 
-#: src/summaryview.c:5835
+#: src/summaryview.c:5854
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:5918
+#: src/summaryview.c:5937
 msgid "Processing configuration"
 msgstr "Verwerken instellen"
 
-#: src/summaryview.c:6068
+#: src/summaryview.c:6087
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
 "Wil je werkelijk het kleurlabel van alle geselecteerde berichten terugzetten?"
 
-#: src/summaryview.c:6070
+#: src/summaryview.c:6089
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Wil je werkelijk dit kleurlabel toepassen op alle geselecteerde berichten?"
 
-#: src/summaryview.c:6071
+#: src/summaryview.c:6090
 msgid "Reset color label"
 msgstr "Kleurlabel herstellen"
 
-#: src/summaryview.c:6071
+#: src/summaryview.c:6090
 msgid "Set color label"
 msgstr "Kleurlabel instellen"
 
-#: src/summaryview.c:6512
+#: src/summaryview.c:6529
 msgid "Ignored thread"
 msgstr "Genegeerde draad"
 
-#: src/summaryview.c:6514
+#: src/summaryview.c:6531
 msgid "Watched thread"
 msgstr "Gevolgde draad"
 
-#: src/summaryview.c:6522
+#: src/summaryview.c:6539
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Beantwoord maar ook doorgestuurd - klik om het antwoord te zien"
 
-#: src/summaryview.c:6524
+#: src/summaryview.c:6541
 msgid "Replied - click to see reply"
 msgstr "Beantwoord - klik om het antwoord te zien"
 
-#: src/summaryview.c:6536
+#: src/summaryview.c:6553
 msgid "To be moved"
 msgstr "Nog te verplaatsen"
 
-#: src/summaryview.c:6538
+#: src/summaryview.c:6555
 msgid "To be copied"
 msgstr "Nog te kopiëren"
 
-#: src/summaryview.c:6550
+#: src/summaryview.c:6567
 msgid "Signed, has attachment(s)"
 msgstr "Ondertekend, heeft bijlage(s)"
 
-#: src/summaryview.c:6554
+#: src/summaryview.c:6571
 msgid "Encrypted, has attachment(s)"
 msgstr "Versleuteld, heeft bijlage(s)"
 
-#: src/summaryview.c:6556
+#: src/summaryview.c:6573
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: src/summaryview.c:6558
+#: src/summaryview.c:6575
 msgid "Has attachment(s)"
 msgstr "Heeft bijlage(s)"
 
-#: src/summaryview.c:8269
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19590,45 +19782,45 @@ msgstr ""
 "Reguliere expressie (regexp) fout:\n"
 "%s"
 
-#: src/summaryview.c:8372
+#: src/summaryview.c:8405
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Ga terug in de mappenlijst (Je heeft ongelezen berichten)"
 
-#: src/summaryview.c:8377
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Ga terug naar de mappenlijst"
 
-#: src/textview.c:218
+#: src/textview.c:241
 msgid "_Open in web browser"
 msgstr "_Openen met webbrowser"
 
-#: src/textview.c:219
+#: src/textview.c:242
 msgid "Copy this _link"
 msgstr "Kopieer deze _koppeling"
 
-#: src/textview.c:226
+#: src/textview.c:249
 msgid "_Reply to this address"
 msgstr "_Antwoord aan dit adres"
 
-#: src/textview.c:227
+#: src/textview.c:250
 msgid "Add to _Address book"
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:228
+#: src/textview.c:251
 msgid "Copy this add_ress"
 msgstr "Kopieer _dit adres"
 
-#: src/textview.c:666
+#: src/textview.c:708
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:669
+#: src/textview.c:711
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:839
+#: src/textview.c:881
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19642,67 +19834,67 @@ msgstr ""
 "\n"
 "  Gebruik "
 
-#: src/textview.c:844
+#: src/textview.c:886
 msgid "'Network Log'"
 msgstr "'Netwerklog'"
 
-#: src/textview.c:845
+#: src/textview.c:887
 msgid " in the Tools menu for more information."
 msgstr " in het 'Gereedschap'-menu voor meer informatie."
 
-#: src/textview.c:911
+#: src/textview.c:953
 msgid "  The following can be performed on this part\n"
 msgstr "  Het volgende kan op dit gedeelte worden toegepast\n"
 
-#: src/textview.c:913
+#: src/textview.c:955
 msgid "  by right-clicking the icon or list item:"
 msgstr "  met de rechtermuisknop op het pictogram of lijst-item te klikken:"
 
-#: src/textview.c:917
+#: src/textview.c:959
 msgid "     - To save, select "
 msgstr "     - Om op te slaan selecteer "
 
-#: src/textview.c:918
+#: src/textview.c:960
 msgid "'Save as...'"
 msgstr "'Opslaan als...'"
 
-#: src/textview.c:920 src/textview.c:932 src/textview.c:944 src/textview.c:954
+#: src/textview.c:962 src/textview.c:974 src/textview.c:986 src/textview.c:996
 msgid " (Shortcut key: '"
 msgstr " (Sneltoets: '"
 
-#: src/textview.c:928
+#: src/textview.c:970
 msgid "     - To display as text, select "
 msgstr "     - Om als tekst weer te geven selecteer "
 
-#: src/textview.c:929
+#: src/textview.c:971
 msgid "'Display as text'"
 msgstr "'Als tekst weergeven'"
 
-#: src/textview.c:940
+#: src/textview.c:982
 msgid "     - To open with an external program, select "
 msgstr "     - Om te openen met een extern programma, selecteer "
 
-#: src/textview.c:941
+#: src/textview.c:983
 msgid "'Open'"
 msgstr "'Openen'"
 
-#: src/textview.c:949
+#: src/textview.c:991
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (of dubbelklik, of klik met de middelste "
 
-#: src/textview.c:950
+#: src/textview.c:992
 msgid "mouse button)\n"
 msgstr "muisknop)\n"
 
-#: src/textview.c:952
+#: src/textview.c:994
 msgid "     - Or use "
 msgstr "     - Of gebruik "
 
-#: src/textview.c:953
+#: src/textview.c:995
 msgid "'Open with...'"
 msgstr "'Open met...'"
 
-#: src/textview.c:1075
+#: src/textview.c:1118
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19713,432 +19905,468 @@ msgstr ""
 "    %s\n"
 "Uitvoer-code %d\n"
 
-#: src/textview.c:2159
+#: src/textview.c:2229
 msgid "Tags: "
 msgstr "Tags: "
 
-#: src/textview.c:2876
+#: src/textview.c:2714
+msgid "Zoom _In"
+msgstr "_Inzoomen"
+
+#: src/textview.c:2723
+msgid "Zoom _Out"
+msgstr "_Uitzoomen"
+
+#: src/textview.c:2732
+msgid "Reset _zoom"
+msgstr "_Zoom herstellen"
+
+#: src/textview.c:3101
+msgid "Copy it anyway?"
+msgstr "Toch kopiëren?"
+
+#: src/textview.c:3101
+msgid "Open it anyway?"
+msgstr "Toch openen?"
+
+#: src/textview.c:3102
+msgid "Co_py URL"
+msgstr "Ko_pieer URL"
+
+#: src/textview.c:3102
+msgid "_Open URL"
+msgstr "_Open URL"
+
+#: src/textview.c:3108
 msgid "The real URL is different from the displayed URL."
 msgstr "De echte URL verschilt van de weergegeven URL."
 
-#: src/textview.c:2877
+#: src/textview.c:3109
 msgid "Displayed URL:"
 msgstr "Weergegeven URL:"
 
-#: src/textview.c:2878
+#: src/textview.c:3110
 msgid "Real URL:"
 msgstr "Echte URL:"
 
-#: src/textview.c:2879
-msgid "Open it anyway?"
-msgstr "Toch openen?"
-
-#: src/textview.c:2880
+#: src/textview.c:3112
 msgid "Phishing attempt warning"
 msgstr "Phishing-waarschuwing"
 
-#: src/textview.c:2881
-msgid "_Open URL"
-msgstr "_Open URL"
-
-#: src/toolbar.c:224 src/toolbar.c:2294
+#: src/toolbar.c:227 src/toolbar.c:2336
 msgid "Receive Mail from all Accounts"
 msgstr "E-mail voor alle Accounts ophalen"
 
-#: src/toolbar.c:225 src/toolbar.c:2299
+#: src/toolbar.c:228 src/toolbar.c:2341
 msgid "Receive Mail from current Account"
 msgstr "E-mail voor huidige Account ophalen"
 
-#: src/toolbar.c:226 src/toolbar.c:2303
+#: src/toolbar.c:229 src/toolbar.c:2345
 msgid "Send Queued Messages"
 msgstr "Berichten uit de wachtrij verzenden"
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
+#: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Compose Email"
 msgstr "E-mail opstellen"
 
-#: src/toolbar.c:228
+#: src/toolbar.c:231
 msgid "Compose News"
 msgstr "Nieuws opstellen"
 
-#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
+#: src/toolbar.c:232 src/toolbar.c:2418 src/toolbar.c:2428
 msgid "Reply to Message"
 msgstr "Beantwoord bericht"
 
-#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
+#: src/toolbar.c:233 src/toolbar.c:2435 src/toolbar.c:2445
 msgid "Reply to Sender"
 msgstr "Beantwoord afzender"
 
-#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
+#: src/toolbar.c:234 src/toolbar.c:2452 src/toolbar.c:2462
 msgid "Reply to All"
 msgstr "Beantwoord allen"
 
-#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
+#: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
 msgid "Reply to Mailing-list"
 msgstr "Beantwoord mailing-lijst"
 
-#: src/toolbar.c:233 src/toolbar.c:2315
+#: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
 msgstr "Open e-mail"
 
-#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
+#: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
 msgid "Forward Message"
 msgstr "Stuur bericht door"
 
-#: src/toolbar.c:235 src/toolbar.c:2460
+#: src/toolbar.c:238 src/toolbar.c:2502
 msgid "Trash Message"
 msgstr "Bericht naar prullenbak"
 
-#: src/toolbar.c:236 src/toolbar.c:2464
+#: src/toolbar.c:239 src/toolbar.c:2506
 msgid "Delete Message"
 msgstr "Verwijder bericht"
 
-#: src/toolbar.c:237
+#: src/toolbar.c:240
 msgid "Delete duplicate messages"
 msgstr "Verwijder dubbele berichten"
 
-#: src/toolbar.c:239 src/toolbar.c:2472
+#: src/toolbar.c:242 src/toolbar.c:2514
 msgid "Go to Previous Unread Message"
 msgstr "Ga naar vorige ongelezen bericht"
 
-#: src/toolbar.c:240 src/toolbar.c:2476
+#: src/toolbar.c:243 src/toolbar.c:2518
 msgid "Go to Next Unread Message"
 msgstr "Ga naar volgende ongelezen bericht"
 
-#: src/toolbar.c:244
+#: src/toolbar.c:247
 msgid "Mark Message"
 msgstr "Markeer bericht"
 
-#: src/toolbar.c:245
+#: src/toolbar.c:248
 msgid "Unmark Message"
 msgstr "Demarkeer bericht"
 
-#: src/toolbar.c:246
+#: src/toolbar.c:249
 msgid "Lock Message"
 msgstr "Bericht op slot zetten"
 
-#: src/toolbar.c:247
+#: src/toolbar.c:250
 msgid "Unlock Message"
 msgstr "Bericht van slot halen"
 
-#: src/toolbar.c:248
+#: src/toolbar.c:251
 msgid "Mark all Messages as read"
 msgstr "Markeer alle berichten als gelezen"
 
-#: src/toolbar.c:249
+#: src/toolbar.c:252
 msgid "Mark all Messages as unread"
 msgstr "Markeer alle berichten als ongelezen"
 
-#: src/toolbar.c:250
+#: src/toolbar.c:253
 msgid "Mark Message as read"
 msgstr "Markeer bericht als gelezen"
 
-#: src/toolbar.c:251
+#: src/toolbar.c:254
 msgid "Mark Message as unread"
 msgstr "Markeer bericht als ongelezen"
 
-#: src/toolbar.c:253 src/toolbar.c:514
+#: src/toolbar.c:255
+msgid "Run folder processing rules"
+msgstr "Verwerkingsregels draaien voor map"
+
+#: src/toolbar.c:257 src/toolbar.c:525
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/toolbar.c:254
+#: src/toolbar.c:258
 msgid "Learn Spam or Ham"
 msgstr "Leer spam of ham"
 
-#: src/toolbar.c:255
+#: src/toolbar.c:259
 msgid "Open folder/Go to folder list"
 msgstr "Open map/Ga naar mappenlijst"
 
-#: src/toolbar.c:258 src/toolbar.c:2482
+#: src/toolbar.c:262 src/toolbar.c:2524
 msgid "Send Message"
 msgstr "Verzend bericht"
 
-#: src/toolbar.c:259 src/toolbar.c:2486
+#: src/toolbar.c:263 src/toolbar.c:2528
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/toolbar.c:260 src/toolbar.c:2490
+#: src/toolbar.c:264 src/toolbar.c:2532
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/toolbar.c:261 src/toolbar.c:2494
+#: src/toolbar.c:265 src/toolbar.c:2536
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/toolbar.c:262 src/toolbar.c:2498
+#: src/toolbar.c:266 src/toolbar.c:2540
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: src/toolbar.c:263 src/toolbar.c:2502
+#: src/toolbar.c:267 src/toolbar.c:2544
 msgid "Insert signature"
 msgstr "Ondertekening invoegen"
 
-#: src/toolbar.c:264 src/toolbar.c:2506
+#: src/toolbar.c:268 src/toolbar.c:2548
 msgid "Replace signature"
 msgstr "Ondertekening vervangen"
 
-#: src/toolbar.c:265 src/toolbar.c:2510
+#: src/toolbar.c:269 src/toolbar.c:2552
 msgid "Edit with external editor"
 msgstr "Aanpassen met externe editor"
 
-#: src/toolbar.c:266 src/toolbar.c:2514
+#: src/toolbar.c:270 src/toolbar.c:2556
 msgid "Wrap long lines of current paragraph"
 msgstr "Lange regels van huige paragraaf afbreken"
 
-#: src/toolbar.c:267 src/toolbar.c:2518
+#: src/toolbar.c:271 src/toolbar.c:2560
 msgid "Wrap all long lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
+#: src/toolbar.c:274 src/toolbar.c:542 src/toolbar.c:2569
 msgid "Check spelling"
 msgstr "Controleer spelling"
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
+#: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2574
 msgid "Sign"
 msgstr "Ondertekenen"
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
+#: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
 msgid "Encrypt"
 msgstr "Versleutelen"
 
-#: src/toolbar.c:274
+#: src/toolbar.c:278
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Acties Kenmerken"
 
-#: src/toolbar.c:275 src/toolbar.c:2559
+#: src/toolbar.c:279 src/toolbar.c:2601
 msgid "Cancel receiving"
 msgstr "Ophalen annuleren"
 
-#: src/toolbar.c:277 src/toolbar.c:2567
+#: src/toolbar.c:281 src/toolbar.c:2609
 msgid "Cancel receiving/sending"
 msgstr "Ophalen/verzenden annuleren"
 
-#: src/toolbar.c:278 src/toolbar.c:2307
+#: src/toolbar.c:282 src/toolbar.c:2349
 msgid "Close window"
 msgstr "Venster sluiten"
 
-#: src/toolbar.c:280
+#: src/toolbar.c:284
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail Plugins"
 
-#: src/toolbar.c:445 src/toolbar.c:496
+#: src/toolbar.c:450 src/toolbar.c:506
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/toolbar.c:485
+#: src/toolbar.c:495
 msgid "Get Mail"
 msgstr "Ophalen"
 
-#: src/toolbar.c:486
+#: src/toolbar.c:496
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/toolbar.c:488 src/toolbar.c:489
+#: src/toolbar.c:498 src/toolbar.c:499
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/toolbar.c:491
+#: src/toolbar.c:501
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Afzender"
 
-#: src/toolbar.c:492
+#: src/toolbar.c:502
 msgid "All"
 msgstr "Allen"
 
-#: src/toolbar.c:493
+#: src/toolbar.c:503
 msgid "List"
 msgstr "Lijst"
 
-#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
+#: src/toolbar.c:508 src/toolbar.c:2402 src/toolbar.c:2411
 msgid "Delete duplicates"
 msgstr "Verwijder dubbele berichten"
 
-#: src/toolbar.c:500
+#: src/toolbar.c:510
 msgid "Prev"
 msgstr "Vorige"
 
-#: src/toolbar.c:501
+#: src/toolbar.c:511
 msgid "Next"
 msgstr "Volgende"
 
-#: src/toolbar.c:509
+#: src/toolbar.c:519
 msgid "All read"
 msgstr "Alles gelezen"
 
-#: src/toolbar.c:510
+#: src/toolbar.c:520
 msgid "All unread"
 msgstr "Alles ongelezen"
 
-#: src/toolbar.c:511
+#: src/toolbar.c:521
 msgid "Read"
 msgstr "Gelezen"
 
-#: src/toolbar.c:516
+#: src/toolbar.c:523
+msgid "Run proc. rules"
+msgstr "Verwerkingsregels draaien"
+
+#: src/toolbar.c:527
 msgid "Folders"
 msgstr "Mappen"
 
-#: src/toolbar.c:521
+#: src/toolbar.c:532
 msgid "Draft"
 msgstr "Klad"
 
-#: src/toolbar.c:524
+#: src/toolbar.c:535
 msgid "Insert sig."
 msgstr "Ondertekening invoegen."
 
-#: src/toolbar.c:525
+#: src/toolbar.c:536
 msgid "Replace sig."
 msgstr "Vervang ond.t."
 
-#: src/toolbar.c:526
+#: src/toolbar.c:537
 msgid "Edit"
 msgstr "Bewerken"
 
-#: src/toolbar.c:527
+#: src/toolbar.c:538
 msgid "Wrap para."
 msgstr "Breek para. af."
 
-#: src/toolbar.c:528
+#: src/toolbar.c:539
 msgid "Wrap all"
 msgstr "Breek allen af"
 
-#: src/toolbar.c:536 src/toolbar.c:537
+#: src/toolbar.c:547 src/toolbar.c:548
 msgid "Stop"
 msgstr "Stop"
 
-#: src/toolbar.c:538
+#: src/toolbar.c:549
 msgid "Stop all"
 msgstr "Stop alles"
 
-#: src/toolbar.c:951
+#: src/toolbar.c:968
 msgid "Compose News message"
 msgstr "Nieuw Nieuwsbericht opstellen"
 
-#: src/toolbar.c:990
+#: src/toolbar.c:1007
 msgid "Learn spam"
 msgstr "Spam leren"
 
-#: src/toolbar.c:999
+#: src/toolbar.c:1016
 msgid "Ham"
 msgstr "Ham"
 
-#: src/toolbar.c:1001
+#: src/toolbar.c:1018
 msgid "Learn ham"
 msgstr "Ham leren"
 
-#: src/toolbar.c:1916
+#: src/toolbar.c:1956
 msgid "Message will be signed"
 msgstr "Bericht zal ondertekend worden"
 
-#: src/toolbar.c:1918
+#: src/toolbar.c:1958
 msgid "Message will not be signed"
 msgstr "Bericht zal niet ondertekend worden"
 
-#: src/toolbar.c:1937
+#: src/toolbar.c:1977
 msgid "Message will be encrypted"
 msgstr "Bericht zal versleuteld worden"
 
-#: src/toolbar.c:1939
+#: src/toolbar.c:1979
 msgid "Message will not be encrypted"
 msgstr "Bericht zal niet versleuteld worden"
 
-#: src/toolbar.c:2289
+#: src/toolbar.c:2331
 msgid "Go to folder list"
 msgstr "Ga naar mappenlijst"
 
-#: src/toolbar.c:2295
+#: src/toolbar.c:2337
 msgid "Receive Mail from selected Account"
 msgstr "E-mail voor geselecteerde Account ophalen"
 
-#: src/toolbar.c:2311
+#: src/toolbar.c:2353
 msgid "Open preferences"
 msgstr "Open voorkeuren"
 
-#: src/toolbar.c:2322
+#: src/toolbar.c:2364
 msgid "Compose with selected Account"
 msgstr "E-mail opstellen met geselecteerde Account"
 
-#: src/toolbar.c:2343
+#: src/toolbar.c:2385
 msgid "Learn as..."
 msgstr "Leren als..."
 
-#: src/toolbar.c:2353
+#: src/toolbar.c:2395
 msgid "Learn as _Spam"
 msgstr "Leer als _Spam"
 
-#: src/toolbar.c:2354
+#: src/toolbar.c:2396
 msgid "Learn as _Ham"
 msgstr "Leer als _Ham"
 
-#: src/toolbar.c:2361
+#: src/toolbar.c:2403
 msgid "Delete duplicates options"
 msgstr "Opties voor verwijderen dubbele berichten"
 
-#: src/toolbar.c:2365
+#: src/toolbar.c:2407
 msgid "Delete duplicates in selected folder"
 msgstr "Verwijder dubbele berichten in geselecteerde map"
 
-#: src/toolbar.c:2366
+#: src/toolbar.c:2408
 msgid "Delete duplicates in all folders"
 msgstr "Verwijder dubbele berichten in alle mappen"
 
-#: src/toolbar.c:2377
+#: src/toolbar.c:2419
 msgid "Reply to Message options"
 msgstr "Opties voor bericht beantwoorden"
 
-#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
+#: src/toolbar.c:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "_Reply with quote"
 msgstr "Antwoord met _citaat"
 
-#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
+#: src/toolbar.c:2424 src/toolbar.c:2441 src/toolbar.c:2458 src/toolbar.c:2475
 msgid "Reply without _quote"
 msgstr "Antwoord _zonder citaat"
 
-#: src/toolbar.c:2394
+#: src/toolbar.c:2436
 msgid "Reply to Sender options"
 msgstr "Opties voor afzender antwoorden"
 
-#: src/toolbar.c:2411
+#: src/toolbar.c:2453
 msgid "Reply to All options"
 msgstr "Opties voor allen beantwoorden"
 
-#: src/toolbar.c:2428
+#: src/toolbar.c:2470
 msgid "Reply to Mailing-list options"
 msgstr "Opties voor mailing-lijst beantwoorden"
 
-#: src/toolbar.c:2445
+#: src/toolbar.c:2487
 msgid "Forward Message options"
 msgstr "Opties voor bericht doorsturen"
 
-#: src/uri_opener.c:85
+#: src/uri_opener.c:70
+msgid "C_opy URL"
+msgstr "K_opieer URL"
+
+#: src/uri_opener.c:101
 msgid "There are no URLs in this email."
 msgstr "Er zijn geen adressen in deze e-mail."
 
-#: src/uri_opener.c:113
-msgid "Available URLs:"
-msgstr "Beschikbare adressen:"
+#: src/uri_opener.c:129
+msgid "Included URLs:"
+msgstr "Ingevoegde URLs:"
 
-#: src/uri_opener.c:187
+#: src/uri_opener.c:209
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Open adressen"
 
-#: src/uri_opener.c:215
-msgid "Please select the URL to open."
-msgstr "Selecteer een adres om te openen."
+#: src/uri_opener.c:225
+msgid "Open in browser"
+msgstr "Open in browser"
+
+#: src/uri_opener.c:237
+msgid "Any phishing URLs are shown in red, followed by the actual URL."
+msgstr "Alle phishing-URLs worden getoond in rood, gevolgd door de echte URL."
 
-#: src/uri_opener.c:223
+#: src/uri_opener.c:245
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: src/wizard.c:523
+#: src/wizard.c:522
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Welkom bij Claws Mail"
 
-#: src/wizard.c:546
+#: src/wizard.c:545
 #, c-format
 msgid ""
 "\n"
@@ -20199,7 +20427,7 @@ msgstr ""
 "menu-ingang '/Instellingen/Plugins'.\n"
 "\n"
 "Je kunt je account-voorkeuren veranderen door de menu-ingang\n"
-"'/Instellingen/Voorkeuren huidige account' te gebruiken. De algemene\n"
+"'/Instellingen/Account-voorkeuren' te gebruiken. De algemene\n"
 " instellingen verander je via '/Instellingen/Voorkeuren'.\n"
 "\n"
 "Meer informatie vind je in de handleiding van Claws Mail, die \n"
@@ -20228,47 +20456,47 @@ msgstr ""
 "dat doen te <%s>.\n"
 "\n"
 
-#: src/wizard.c:621
+#: src/wizard.c:620
 msgid "Please enter the mailbox name."
 msgstr "Geef naam van postvak."
 
-#: src/wizard.c:649
+#: src/wizard.c:648
 msgid "Please enter your name and email address."
 msgstr "Geef naam en e-mailadres."
 
-#: src/wizard.c:660
+#: src/wizard.c:659
 msgid "Please enter your receiving server and username."
 msgstr "Geef onvangende server en gebruikersnaam."
 
-#: src/wizard.c:670
+#: src/wizard.c:669
 msgid "Please enter your username."
 msgstr "Geef je gebruikersnaam."
 
-#: src/wizard.c:680
+#: src/wizard.c:679
 msgid "Please enter your SMTP server."
 msgstr "Geef je SMTP-server."
 
-#: src/wizard.c:691
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr "Geef je SMTP-gebruikersnaam."
 
-#: src/wizard.c:974
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Je naam:"
 
-#: src/wizard.c:986
+#: src/wizard.c:981
 msgid "Your email address:"
 msgstr "Je e-mailadres:"
 
-#: src/wizard.c:998
+#: src/wizard.c:994
 msgid "Your organization:"
 msgstr "Je organisatie:"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1029
 msgid "Mailbox name:"
 msgstr "Postvak-naam:"
 
-#: src/wizard.c:1039
+#: src/wizard.c:1036
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -20276,7 +20504,7 @@ msgstr ""
 "Je kunt ook een absoluut pad opgeven, bijvoorbeeld: \"/home/kees/Documenten/"
 "Mail\""
 
-#: src/wizard.c:1109
+#: src/wizard.c:1106
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -20284,51 +20512,55 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:25\""
 
-#: src/wizard.c:1112
+#: src/wizard.c:1109
 msgid "SMTP server address:"
 msgstr "SMTP-serveradres:"
 
-#: src/wizard.c:1127
+#: src/wizard.c:1124
 msgid "(empty to use the same as receive)"
 msgstr "(laat leeg om dezelfde als bij ontvangen te gebruiken)"
 
-#: src/wizard.c:1142
+#: src/wizard.c:1139
 msgid "SMTP username:"
 msgstr "SMTP-gebruikersnaam:"
 
-#: src/wizard.c:1154
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "SMTP-wachtwoord:"
 
 #: src/wizard.c:1169
-msgid "Use SSL/TLS to connect to SMTP server"
-msgstr "Gebruik SSL/TLS voor verbinding met de SMTP-server"
+msgid "Use TLS to connect to SMTP server"
+msgstr "Gebruik TLS voor verbinding met de SMTP-server"
 
-#: src/wizard.c:1180 src/wizard.c:1609
+#: src/wizard.c:1180 src/wizard.c:1623
 msgid "Use STARTTLS command to start encryption"
 msgstr "Gebruik STARTTLS voor starten beveiligde sessie"
 
-#: src/wizard.c:1192 src/wizard.c:1622
-msgid "Client SSL/TLS certificate (optional)"
-msgstr "Client SSL/TLS-certificaat (optioneel)"
+#: src/wizard.c:1192 src/wizard.c:1636
+msgid "Client TLS certificate (optional)"
+msgstr "Client TLS-certificaat (optioneel)"
 
-#: src/wizard.c:1267 src/wizard.c:1299 src/wizard.c:1552
+#: src/wizard.c:1201 src/wizard.c:1646
+msgid "File:"
+msgstr "Bestand:"
+
+#: src/wizard.c:1274 src/wizard.c:1306 src/wizard.c:1560
 msgid "Server address:"
 msgstr "Serveradres:"
 
-#: src/wizard.c:1331
+#: src/wizard.c:1338
 msgid "Local mailbox:"
 msgstr "Lokaal postvak:"
 
-#: src/wizard.c:1499
+#: src/wizard.c:1506
 msgid "Server type:"
 msgstr "Servertype:"
 
-#: src/wizard.c:1508
+#: src/wizard.c:1515
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1563
+#: src/wizard.c:1573
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -20336,19 +20568,19 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:110\""
 
-#: src/wizard.c:1598
-msgid "Use SSL/TLS to connect to receiving server"
-msgstr "Gebruik SSL/TLS voor verbinding met de ontvangende server"
+#: src/wizard.c:1612
+msgid "Use TLS to connect to receiving server"
+msgstr "Gebruik TLS voor verbinding met de ontvangende server"
 
-#: src/wizard.c:1671
+#: src/wizard.c:1690
 msgid "IMAP server directory:"
 msgstr "IMAP-servermap:"
 
-#: src/wizard.c:1682
+#: src/wizard.c:1701
 msgid "Show only subscribed folders"
 msgstr "Alleen geabonneerde mappen weergeven"
 
-#: src/wizard.c:1690
+#: src/wizard.c:1709
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -20356,15 +20588,15 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail\n"
 "is gecompileerd zonder ondersteuning voor IMAP."
 
-#: src/wizard.c:1809
+#: src/wizard.c:1828
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-assistent"
 
-#: src/wizard.c:1843
+#: src/wizard.c:1862
 msgid "Welcome to Claws Mail"
 msgstr "Welkom by Claws Mail"
 
-#: src/wizard.c:1850
+#: src/wizard.c:1869
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -20378,31 +20610,31 @@ msgstr ""
 "gebruikte e-mailopties zodat je binnen vijf minuten Claws Mail kunt "
 "gebruiken."
 
-#: src/wizard.c:1863
+#: src/wizard.c:1882
 msgid "About You"
 msgstr "Over u"
 
-#: src/wizard.c:1870 src/wizard.c:1884 src/wizard.c:1898 src/wizard.c:1913
+#: src/wizard.c:1889 src/wizard.c:1903 src/wizard.c:1917 src/wizard.c:1932
 msgid "Bold fields must be completed"
 msgstr "Velden in vet zijn verplicht"
 
-#: src/wizard.c:1877
+#: src/wizard.c:1896
 msgid "Receiving mail"
 msgstr "E-mail ontvangen"
 
-#: src/wizard.c:1891
+#: src/wizard.c:1910
 msgid "Sending mail"
 msgstr "E-mail verzenden"
 
-#: src/wizard.c:1906
+#: src/wizard.c:1925
 msgid "Saving mail on disk"
 msgstr "E-mail opslaan op schijf"
 
-#: src/wizard.c:1921
+#: src/wizard.c:1940
 msgid "Configuration finished"
 msgstr "Klaar met instellen"
 
-#: src/wizard.c:1928
+#: src/wizard.c:1947
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -20410,21 +20642,3 @@ msgstr ""
 "Claws Mail is nu klaar.\n"
 "Klik op 'Opslaan' om te starten."
 
-#~ msgid "Use secure authentication (APOP)"
-#~ msgstr "Gebruik beveiligde authenticatie (APOP)"
-
-#~ msgid "Enable customisable keyboard shortcuts"
-#~ msgstr "Maak aangepaste sneltoetsen mogelijk"
-
-#~ 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 ""
-#~ "Hiermee kun je de sneltoetsen aanpassen van de meeste menu-items door met "
-#~ "de muis op dat item te gaan staan, en dan de gewenste toets in te "
-#~ "drukken\n"
-#~ "Vink deze optie uit als je alle sneltoetsen wilt vastzetten."
-
-#~ msgid "A_dd"
-#~ msgstr "_Toevoegen"
diff --git a/po/pl.po b/po/pl.po
index c727855d3..bac9cdd37 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,23 +3,23 @@
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Emil Nowak <emil5 at go2.pl>, 2003, 2005, 2006, 2007.
-# Pawel Pekala <c0rn at o2.pl>, 2007.
-# Franciszek Janowski <nobange at poczta.onet.pl>, 2009.
-# Jakub T. Jankiewicz <jcubic at onet.pl>, 2017 -
 # Translators:
 # Przemyslaw Sulek <psulek at plo.pl> <przemek at obrpr.plock.pl> <pc2000 at poczta.onet.pl>
 # Witold Wladyslaw Wojciech Wilk <maniack at zawilcow.tyc.katowice.supermedia.pl>
 # Paweł Pękala <c0rn at gazeta.pl>
 # Quar <Quar at sylpheed-claws.net> 2006
-# Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>, 2022.
 #
+# Emil Nowak <emil5 at go2.pl>, 2003, 2005, 2006, 2007.
+# 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.
 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-04-02 10:34+0100\n"
-"PO-Revision-Date: 2022-04-02 21:26+0200\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"
 "Language-Team: Polish <kde-i18n-doc at kde.org>\n"
 "Language: pl_PL\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.03.70\n"
+"X-Generator: Lokalize 22.08.1\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -44,7 +44,7 @@ msgstr "Nie można utworzyć katalogu."
 
 #: src/account.c:735
 msgid "Edit accounts"
-msgstr "Edytuj konta"
+msgstr "Dostosowywanie kont"
 
 #: src/account.c:752
 msgid ""
@@ -52,28 +52,29 @@ msgid ""
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
-"Naciśnięcie przycisku 'Pobierz pocztę' pobierze wiadomości z twoich kont w"
-" poniższej kolejności, pole zaznaczane określa, które konta zostaną w tym"
-" uwzględnione. Tekst wytłuszczony 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"
-msgstr "_Nowy"
+msgstr "_Nowe"
 
 #: src/account.c:787
 msgid "Create a new account"
-msgstr "Utwórz nowe konto"
+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/mainwindow.c:518 src/messageview.c:213
+#: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Edycja"
 
 #: src/account.c:795
 msgid "Edit preferences for the selected account"
-msgstr "Zmień ustawienia dla zaznaczonego konta"
+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
@@ -92,17 +93,17 @@ msgstr "_Usuń"
 
 #: src/account.c:803
 msgid "Delete the selected account from the list"
-msgstr "Usuń zaznaczone konto ze spisu"
+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:552
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "S_kopiuj"
 
 #: src/account.c:811
 msgid "Create a new copy of the selected account"
-msgstr "Utwórz nową kopię zaznaczonego konta"
+msgstr "Utworzy kopię danego konta"
 
 #: src/account.c:813 src/editaddress.c:1324 src/gtk/foldersort.c:318
 #: src/prefs_actions.c:401 src/prefs_customheader.c:289
@@ -116,7 +117,7 @@ msgstr "_W dół"
 
 #: src/account.c:819
 msgid "Move the selected account down"
-msgstr "Przesuń zaznaczone konto w dół"
+msgstr "Przesunie dane konto w dół"
 
 #: src/account.c:821 src/editaddress.c:1323 src/gtk/foldersort.c:312
 #: src/prefs_actions.c:393 src/prefs_customheader.c:283
@@ -130,7 +131,7 @@ msgstr "_W górę"
 
 #: src/account.c:827
 msgid "Move the selected account up"
-msgstr "Przesuń zaznaczone konto w górę"
+msgstr "Przesunie dane konto w górę"
 
 #: src/account.c:834
 msgid " _Set as default account "
@@ -143,10 +144,11 @@ msgstr " U_staw jako konto domyślne "
 #: 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/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:926 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:841 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: 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/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
@@ -161,7 +163,7 @@ msgstr "Zamknij"
 
 #: src/account.c:926
 msgid "Accounts with remote folders cannot be copied."
-msgstr "Konta zawierające zdalne katalogi nie mogą być skopiowane"
+msgstr "Nie można skopiować kont, zawierających zdalne katalogi."
 
 #: src/account.c:933
 #, c-format
@@ -188,24 +190,24 @@ msgstr "Usuń konto"
 #: 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:10736
-#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
-#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
-#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: 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/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/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1193 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:890 src/main.c:2286 src/mainwindow.c:4009
-#: src/mainwindow.c:4212 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:1818
-#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
-#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
+#: 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/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
@@ -216,7 +218,7 @@ msgstr "Usuń konto"
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
 #: src/plugins/keyword_warner/keyword_warner.c:196
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
 #: src/plugins/managesieve/sieve_editor.c:435
 #: src/plugins/managesieve/sieve_editor.c:632
@@ -228,17 +230,17 @@ msgstr "Usuń konto"
 #: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2030
 #: 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:693 src/prefs_display_header.c:246
+#: 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_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:294 src/ssl_manager.c:453
+#: 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/toolbar.c:3108 src/wizard.c:1833
@@ -249,11 +251,11 @@ msgstr "_Anuluj"
 #: 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/plugins/att_remover/att_remover.c:429
-#: src/plugins/mailmbox/plugin_gtk.c:335
+#: 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:2032 src/prefs_actions.c:1105
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "_Usuń"
@@ -272,17 +274,17 @@ msgstr "'Pobierz z wszystkich kont' odbierze pocztę z zaznaczonych kont"
 #: 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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1860
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: 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
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protokół"
 
@@ -338,13 +340,13 @@ msgstr ""
 "%s"
 
 #: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9751 src/ldaputil.c:334
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1829
-#: src/plugins/vcalendar/vcal_folder.c:1847
-#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
+#: 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
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -481,7 +483,7 @@ msgstr "Czy naprawdę usunąć tę nazwę cechy?"
 
 #: src/addrcustomattr.c:197
 msgid "Reset to default"
-msgstr "Domyślne"
+msgstr "Wyzeruj do domyślnych"
 
 #: src/addrcustomattr.c:198
 msgid ""
@@ -491,13 +493,13 @@ msgstr ""
 "Czy na pewno zastąpić wszystkie nazwy\n"
 "cech wartościami domyślnymi?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:1673 src/main.c:412
-#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -509,13 +511,14 @@ msgstr ""
 msgid "_No"
 msgstr "_Nie"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -534,7 +537,7 @@ msgstr "Usuń _wszystko"
 
 #: src/addrcustomattr.c:220
 msgid "_Reset to default"
-msgstr "_Domyślne"
+msgstr "Wyze_ruj do domyślnych"
 
 #: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
@@ -543,14 +546,14 @@ msgstr "Nie określono nazwy cechy."
 #: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
-msgstr "Edycja nazw cech"
+msgstr "Zmień nazwy cech"
 
 #: src/addrcustomattr.c:483
 msgid "New attribute name:"
-msgstr "Nazwa cechy:"
+msgstr "Nazwa nowej cechy:"
 
 #: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
 #: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
@@ -563,14 +566,13 @@ 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/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: 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/mimeview.c:1819 src/password_gtk.c:213
-#: src/plugins/archive/archiver_gtk.c:575
+#: 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
@@ -609,19 +611,19 @@ msgstr "Pokaż powielenia z różnych książek"
 
 #: src/addrduplicates.c:144
 msgid "Find address book email duplicates"
-msgstr "Znajdź powielone adresy pocztowe w książce adresowej"
+msgstr "Wyszukaj powielonych adresów pocztowych w książce adresowej"
 
 #: src/addrduplicates.c:145
 msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr ""
-"Claws Mail spróbuje teraz znaleźć powielone adresy pocztowe w twojej książce"
-" adresowej."
+"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/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
-msgstr "_Szukaj"
+msgstr "Po_szukaj"
 
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
@@ -632,7 +634,7 @@ msgid "Duplicate email addresses"
 msgstr "Powielone adresy pocztowe"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adres"
@@ -666,7 +668,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1303 src/editgroup.c:290
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Uwagi"
 
@@ -683,16 +685,16 @@ 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/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: 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 e-mail"
+msgstr "Adres pocztowy"
 
 #: src/addressbook.c:400
 msgid "_Book"
 msgstr "_Książka"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Narzędzia"
@@ -756,7 +758,7 @@ msgstr "Nowa _grupa"
 
 #: src/addressbook.c:437 src/addressbook.c:483
 msgid "_Mail To"
-msgstr "Wyślij wiado_mość do"
+msgstr "Wyślij tam wiado_mość"
 
 #: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Merge"
@@ -784,18 +786,18 @@ msgstr "Wyeksportuj do LDI_F..."
 
 #: src/addressbook.c:449
 msgid "Find duplicates..."
-msgstr "Znajdź powielone..."
+msgstr "Wyszukaj powieleń..."
 
 #: src/addressbook.c:450
 msgid "Edit custom attributes..."
-msgstr "Edycja atrybutów użytkownika..."
+msgstr "Zmień własne cechy..."
 
 #: src/addressbook.c:485
 msgid "_Browse Entry"
 msgstr "_Przeglądanie wpisu"
 
 #: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: 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
@@ -909,7 +911,7 @@ msgstr "Książka adresowa"
 
 #: src/addressbook.c:1103 src/editldap.c:777
 msgid "Search"
-msgstr "Szukaj"
+msgstr "Poszukaj"
 
 #: src/addressbook.c:1475
 msgid "Delete group"
@@ -952,7 +954,7 @@ msgstr ""
 "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:334 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -985,7 +987,7 @@ msgstr ""
 #: src/addressbook.c:3100
 #, c-format
 msgid "Search '%s'"
-msgstr "Szukaj '%s'"
+msgstr "Poszukaj '%s'"
 
 #: src/addressbook.c:3238 src/addressbook.c:3288
 msgid "New Contacts"
@@ -1064,7 +1066,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Katalog"
 
@@ -1123,7 +1125,7 @@ msgstr "Nazwa książki adresowej:"
 
 #: src/addrgather.c:395
 msgid "Address book folder size:"
-msgstr "Rozmiar katalogu książki adresowej:j"
+msgstr "Rozmiar katalogu książki adresowej:"
 
 #: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
@@ -1138,7 +1140,7 @@ msgstr "Przetwarzane nagłówki"
 
 #: src/addrgather.c:432
 msgid "Include subfolders"
-msgstr "Uwzględniaj podkatalogi"
+msgstr "Uwzględnij podkatalogi"
 
 #: src/addrgather.c:490 src/prefs_filtering_action.c:1384
 msgid "Header Name"
@@ -1159,7 +1161,7 @@ msgstr "Koniec"
 
 #: src/addrgather.c:643
 msgid "Collect email addresses from selected messages"
-msgstr "Wyciągaj adresy e-mail z następujących wiadomości"
+msgstr "Zbierz adresy e-mail z zaznaczonych wiadomości"
 
 #: src/addrgather.c:647
 msgid "Collect email addresses from folder"
@@ -1189,18 +1191,18 @@ msgstr "Uaktualnienie adresów"
 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:9825
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Powiadomienie"
 
 #: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: 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
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Błąd"
@@ -1211,7 +1213,7 @@ msgstr "_Pokaż dziennik"
 
 #: src/alertpanel.c:372
 msgid "Show this message next time"
-msgstr "Wyświetl tę wiadomość następnym razem"
+msgstr "Zapytaj o to także następnym razem"
 
 #: src/browseldap.c:221
 msgid "Browse Directory Entry"
@@ -1320,63 +1322,63 @@ 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:1251
+#: src/common/session.c:201 src/imap.c:1261
 msgid "TLS handshake failed\n"
 msgstr "Nie udało się uścisnąć ręki TLS\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "Metoda SMTP AUTH nie jest dostępna\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Wybrana metoda SMTP AUTH nie jest dostępna\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "zła odpowiedź SMTP\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "wystąpił błąd podczas sesji SMTP\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "wystąpił błąd podczas uwierzytelniania\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 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:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "nie można rozpocząć sesji STARTTLS\n"
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Czas oczekiwania na WE/WY gniazda.\n"
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Upłynął czas oczekiwania na połączenie.\n"
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: połączenie nieudane (%s).\n"
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: nieznany gospodarz.\n"
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: nie udało się wyszukać gospodarza (%s).\n"
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "zapis do fd%d: %s\n"
@@ -1703,8 +1705,8 @@ msgid ""
 "\n"
 "Signing and encrypting have been disabled for this message."
 msgstr ""
-"Wybrałeś, żeby podpisać i/lub zaszyfrować tę wiadomość, lecz nie wybrałeś"
-" sytemu prywatności.\n"
+"Wybrałeś, żeby podpisać i/lub zaszyfrować tę wiadomość, lecz nie wybrałeś "
+"sytemu prywatności.\n"
 "\n"
 "Podpisanie oraz szyfrowanie zostało wyłączone dla tej wiadomości"
 
@@ -1712,7 +1714,7 @@ msgstr ""
 msgid "_Add..."
 msgstr "Dod_aj..."
 
-#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: 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/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
@@ -1725,7 +1727,7 @@ msgstr "_Usuń"
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "Wiado_mość"
 
@@ -1737,7 +1739,7 @@ msgstr "Pi_sownia"
 msgid "_Options"
 msgstr "U_stawienia"
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -1797,7 +1799,7 @@ msgstr "_Z zawijaniem wierszy"
 msgid "_Unwrapped"
 msgstr "_Bez zawijania wierszy"
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Z_aznacz wszystko"
@@ -1902,47 +1904,47 @@ msgstr "Ochrona prywatności"
 msgid "_Priority"
 msgstr "_Ważność"
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Kodowani_e znaków"
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Zachodnioeuropejskie"
 
-#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Bałtyckie"
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrajskie"
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabskie"
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japońskie"
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chińskie"
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreańskie"
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tajskie"
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "Książka _adresowa"
 
@@ -1950,11 +1952,11 @@ msgstr "Książka _adresowa"
 msgid "_Template"
 msgstr "Wzorce"
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Działa_nia"
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "O progr_amie"
 
@@ -1976,7 +1978,7 @@ msgstr "Za_szyfruj"
 
 #: src/compose.c:731
 msgid "_Request Return Receipt"
-msgstr "Żądaj potwierdzenia dostarczenia"
+msgstr "Pop_roś o potwierdzenie dostarczenia"
 
 #: src/compose.c:732
 msgid "Remo_ve references"
@@ -1990,19 +1992,19 @@ msgstr "Pokaż li_nijkę"
 msgid "_Normal"
 msgstr "Z_wykły"
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
-msgstr "W_szyscy"
+msgstr "W_szystkim"
 
-#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
-msgstr "Nadawca"
+msgstr "Nadawcy"
 
 #: src/compose.c:741
 msgid "_Mailing-list"
-msgstr "Lista dyskusyjna"
+msgstr "Na listę dyskusyjną"
 
 #: src/compose.c:746
 msgid "_Highest"
@@ -2020,27 +2022,27 @@ msgstr "Niska"
 msgid "_Lowest"
 msgstr "Najniższa"
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "S_am wykryj"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 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:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unikod (UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 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:896 src/messageview.c:365
+#: src/compose.c:764 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:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Tureckie (ISO-8859-9)"
 
@@ -2167,7 +2169,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Czy jesteś pewny?"
 
-#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "Ws_taw"
 
@@ -2202,7 +2204,7 @@ msgstr " [zmieniono]"
 #: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
-msgstr "%s - Tworzenie wiadomości %s"
+msgstr "%s - Pisanie wiadomości %s"
 
 #: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
 #, c-format
@@ -2227,7 +2229,7 @@ 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/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Wyślij"
 
@@ -2392,7 +2394,7 @@ msgstr "Wybrane konto nie jest kontem NNTP: Wysłanie wiadomości niemożliwe."
 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:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Przerwij wysyłanie"
 
@@ -2415,15 +2417,17 @@ msgstr "Usuń zawartość wpisu"
 
 #: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
-msgstr "Klawisz <tab> umożliwia uzupełnianie nazw z książki adresowej"
+msgstr "Aby uzupełnić adres z książki adresowej, naciśnij klawisz <tab>"
 
 #: src/compose.c:7488
 msgid "Mime type"
 msgstr "Rodzaj MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:468
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -2489,8 +2493,8 @@ msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
-"Nie można wczytać systemu ochrony prywatności '%s'. Nie będzie można ani"
-" podpisać, ani zaszyfrować tej wiadomości. "
+"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
 msgid "_None"
@@ -2548,48 +2552,58 @@ msgstr ""
 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."
+"Porozumiewanie się gniazdami przy użyciu zewnętrznego edytora jest "
+"niedostępne na Windowsie."
 
 #: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Nie można utworzyć procesu potomnego dla polecenia:\n"
+"Nie można utworzyć następującego polecenia edytora zewnętrznego:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9750
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Zewnętrzy edytor zatrzymał się z błędem: %s"
 
-#: src/compose.c:9822
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr "id procesu: %"
+
+#: src/compose.c:9830
+#, c-format
+msgid "process id: %d"
+msgstr "id procesu: %d"
+
+#: src/compose.c:9835
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %"
+"%s"
 msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
-"Wymusić zakończenie działania?\n"
-"identyfikator procesu: %"
+"Wymusić zakończenie jego działania?\n"
+"%s"
 
-#: src/compose.c:10229 src/messageview.c:1094
+#: src/compose.c:10245 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:10432
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Nie można zapisać kopii roboczej."
 
-#: src/compose.c:10436
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Nie można zapisać kopii roboczej"
 
-#: src/compose.c:10437
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2597,76 +2611,77 @@ msgstr ""
 "Nie można zapisać kopii roboczej\n"
 "Co chcesz zrobić z tą wiadomością ?"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "_Anuluj i wyjdź"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "Porzuć wia_domość"
 
-#: src/compose.c:10627 src/compose.c:10641
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Zaznacz plik"
 
-#: src/compose.c:10655
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nie można odczytać pliku '%s'."
 
-#: src/compose.c:10657
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
-"Plik '%s' zawiera nieprawidłowe znaki\n"
-"dla bieżącego kodowania, wstawianie może być niepoprawne."
+"Bieżące kodowanie nie obsługuje\n"
+"wszystkich znaków pliku '%s', więc może się on "
+"wstawić niepoprawnie."
 
-#: src/compose.c:10734
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Porzucanie wiadomości"
 
-#: src/compose.c:10735
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Wiadomość ta uległa zmianie. Czy porzucić te zmiany?"
 
-#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "Por_zuć"
 
-#: src/compose.c:10736 src/compose.c:10741
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "Zapi_sz w katalogu roboczych"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Zapisywanie zmian"
 
-#: src/compose.c:10740
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Wiadomość ta uległa zmianie. Czy zapisać te zmiany?"
 
-#: src/compose.c:10741
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Nie zapisuj"
 
-#: src/compose.c:10812
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
-msgstr "Czy chcesz dołączyć szablon '%s'?"
+msgstr "W jaki sposób chcesz użyć szablonu '%s'?"
 
-#: src/compose.c:10814
+#: src/compose.c:10833
 msgid "Apply template"
-msgstr "Dołącz szablon"
+msgstr "Użycie szablonu"
 
-#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10834 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:10892
+#: src/compose.c:10911
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2675,7 +2690,7 @@ msgstr ""
 "Rozmiar wklejanego tekstu przekracza graniczny (%dKiB) do wklejenia.\n"
 "Załącz go jako plik."
 
-#: src/compose.c:11708
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2689,26 +2704,26 @@ msgstr[1] ""
 msgstr[2] ""
 "Wstawić %d plików do treści wiadomości, czy dodać je jako załączniki?"
 
-#: src/compose.c:11714
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Wstawić czy załączyć?"
 
-#: src/compose.c:11715
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "Z_ałącz"
 
-#: src/compose.c:11930
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Błąd formatu cytowania w wierszu %d."
 
-#: src/compose.c:12226
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
 msgstr ""
-"Zamierzasz odopowiedzieć na %d wiadomości. Otworzenie takiej ilości okien "
+"Zamierzasz odpowiedzieć na %d wiadomości. Otworzenie takiej ilości okien "
 "może zająć trochę czasu. Na pewno chcesz kontynuować ? "
 
 #: src/crash.c:140
@@ -2733,7 +2748,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Dziennik diagnostyczny"
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
 #: src/uri_opener.c:226
 msgid "Close"
 msgstr "Zamknij"
@@ -2770,12 +2785,12 @@ msgid ""
 msgstr ""
 "Dodanie nowej osoby wymaga ustawienia\n"
 "przynajmniej jednej z poniższych wartości:\n"
-" - Nazwa\n"
+" - Nazwa wyświetlana\n"
 " - Imię\n"
 " - Nazwisko\n"
 " - Pseudonim\n"
-" - adres e-mail\n"
-" - dodatkowe cechy\n"
+" - dowolny adres pocztowy\n"
+" - dowolny dodatkowe cechy\n"
 "\n"
 "Naciśnij OK, aby wznowić edytowanie tego kontaktu.\n"
 "Naciśnij Anuluj, aby wyjść bez zapisywania."
@@ -2794,12 +2809,10 @@ msgid ""
 msgstr ""
 "Dodanie nowej osoby wymaga ustawienia\n"
 "przynajmniej jednej z poniższych wartości:\n"
-" - Nazwa\n"
 " - Imię\n"
 " - Nazwisko\n"
-" - Pseudonim\n"
-" - adres e-mail\n"
-" - dodatkowe cechy\n"
+" - dowolny adres pocztowy\n"
+" - dowolny dodatkowe cechy\n"
 "\n"
 "Naciśnij OK, aby wznowić edytowanie tego kontaktu.\n"
 "Naciśnij Anuluj, aby wyjść bez zapisywania."
@@ -2922,7 +2935,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:2443
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Plik"
 
@@ -2930,56 +2943,51 @@ msgstr "Plik"
 msgid "Add New Addressbook"
 msgstr "Książka adresowa"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Trzeba podać nazwę grupy"
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
-msgstr "Edytuj dane grupy"
+#: src/editgroup.c:292
+msgid "Edit group data"
+msgstr "Zmień dane grupy"
 
-#: src/editgroup.c:323 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Adresy w grupie"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Dostępne adresy"
 
-#: src/editgroup.c:452
-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."
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Adresy w grupie"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
-msgstr "Edytuj dane grupy"
+#: src/editgroup.c:494
+msgid "Edit group details"
+msgstr "Zmień szczegóły grupy"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "Dodaj nową grupę"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Edytuj katalog"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
-msgstr "Podaj nazwę nowego katalogu:"
+msgstr "Wpisz nazwę nowego katalogu:"
 
 #: src/editjpilot.c:187
 msgid "File does not appear to be JPilot format."
@@ -3005,13 +3013,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:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
 #: 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:3197
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3064,17 +3072,16 @@ msgid ""
 "used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"To jest nazwa gospodarza serwera. Przykładowo \"ldap.mojadomena.com\" może"
-" być "
-"właściwą nazwą dla organizacji \"mojadomena.com\". Równie dobrze można użyć "
-"adresu IP. Możesz użyć \"localhost\" jeżeli serwer LDAP działa na tym samym "
-"komputerze co Claws Mail."
+"To jest nazwa gospodarza serwera. Przykładowo \"ldap.mojadomena.com\" może "
+"być właściwą nazwą dla organizacji \"mojadomena.com\". Równie dobrze można "
+"użyć adresu IP. Możesz użyć \"localhost\" jeżeli serwer LDAP działa na tym "
+"samym komputerze co Claws Mail."
 
 #: src/editldap.c:467
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4227
 msgid "TLS"
 msgstr "TLS"
 
@@ -3087,8 +3094,8 @@ msgid ""
 msgstr ""
 "Włącz bezpieczne połączenie do serwera LDAP via STARTTLS. Połączenie "
 "rozpoczyna się niezaszyfrowane a następnie jest zabezpieczane poleceniem "
-"STARTTLS. Jeśli połączenie nie powiedzie się sprawdź ustawienia w pliku "
-"ldap.conf (pola TLS_CACERTDIR i TLS_REQCERT)."
+"STARTTLS. Jeśli połączenie nie powiedzie się sprawdź ustawienia w pliku ldap."
+"conf (pola TLS_CACERTDIR i TLS_REQCERT)."
 
 #: src/editldap.c:477
 msgid ""
@@ -3096,9 +3103,9 @@ msgid ""
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
-"Włącz bezpieczne połączenie do serwera LDAP via TLS. Jeśli połączenie "
-"nie powiedzie się sprawdź ustawienia w pliku ldap.conf (pola TLS_CACERTDIR "
-"i TLS_REQCERT)."
+"Włącz bezpieczne połączenie do serwera LDAP via TLS. Jeśli połączenie nie "
+"powiedzie się sprawdź ustawienia w pliku ldap.conf (pola TLS_CACERTDIR i "
+"TLS_REQCERT)."
 
 #: src/editldap.c:487
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -3197,8 +3204,8 @@ msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr ""
-"Zaznacz to pole, aby uwzględnić ten serwer w dynamicznym wyszukiwaniu podczas"
-" używania uzupełniania adresu."
+"Zaznacz to pole, aby uwzględnić ten serwer w dynamicznym wyszukiwaniu "
+"podczas używania uzupełniania adresu."
 
 #: src/editldap.c:632
 msgid "Match names 'containing' search term"
@@ -3206,11 +3213,11 @@ msgstr "Zaznacz nazwy 'zawierające' szukane pojęcie"
 
 #: 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 ""
 "Poszukiwania nazw lub adresów mogą być wykonywane przy użyciu terminów "
 "wyszukiwania \"begins-with\" i \"contains\". Zaznacz tą opcję aby wykonać "
@@ -3242,8 +3249,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:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Pokaż hasło"
@@ -3265,7 +3272,7 @@ 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:4044
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -3352,11 +3359,11 @@ msgstr "Dodaj nowy wpis vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Nie można było przypisać certyfikatu klienta.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "nie można pobrać zakresu xover\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "nie można pobrać zakresu xhdr\n"
 
@@ -3421,8 +3428,8 @@ 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:1178 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: 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
 msgid "None"
 msgstr "Brak"
@@ -3431,9 +3438,9 @@ msgstr "Brak"
 #: src/prefs_folder_item.c:1240 src/prefs_folder_item.c:1271
 #: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
-msgstr "Domyślne"
+msgstr "Domyślnie"
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Pełny"
@@ -3632,10 +3639,10 @@ msgid ""
 "available RDN options that will be used to create the DN."
 msgstr ""
 "Plik LDIF zawiera szereg danych zwykle wczytywanych do serwera LDAP. Każdy "
-"element z pliku LDIF posiada niepowtarzalny identyfikator \"Wyróżniona Nazwa"
-"\" (lub WN). Przyrostek jest dodawany do \"Relatywnie Wyróżnionej Nazwy"
-"\" (lub RWN) aby stworzyć WN. Proszę wybrać jedną z dostępnych opcji RWN "
-"która zostanie użyta do stworzenia WN."
+"element z pliku LDIF posiada niepowtarzalny identyfikator \"Wyróżniona "
+"Nazwa\" (lub WN). Przyrostek jest dodawany do \"Relatywnie Wyróżnionej "
+"Nazwy\" (lub RWN) aby stworzyć WN. Proszę wybrać jedną z dostępnych opcji "
+"RWN która zostanie użyta do stworzenia WN."
 
 #: src/expldifdlg.c:531
 msgid "Use DN attribute if present in data"
@@ -3663,8 +3670,8 @@ msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
 msgstr ""
-"Książka adresowa może zawierać wpisy bez adresu E-Mail. Zaznaczenie tego"
-" pola, spowoduje że takie wpisy będą pomijane."
+"Książka adresowa może zawierać wpisy bez adresu E-Mail. Zaznaczenie tego "
+"pola, spowoduje że takie wpisy będą pomijane."
 
 #: src/expldifdlg.c:637
 msgid "Export Address Book to LDIF File"
@@ -3674,13 +3681,13 @@ msgstr "Eksportowanie książki adresowej do pliku LDIF"
 msgid "Distinguished Name"
 msgstr "Unikalna nazwa"
 
-#: src/export.c:112 src/summaryview.c:8485
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Eksportowanie do pliku mbox"
 
 #: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
-msgstr "Wybierz katalog, do którego chcesz eksportować i podaj plik mbox."
+msgstr "Wybierz katalog, do którego chcesz wyeksportować i wskaż plik mbox."
 
 #: src/export.c:142
 msgid "Source folder:"
@@ -3688,7 +3695,7 @@ msgstr "Katalog źródłowy:"
 
 #: src/export.c:146 src/import.c:142
 msgid "Mbox file:"
-msgstr "Lokalny plik mbox"
+msgstr "Plik skrzynki mbox:"
 
 #: src/export.c:198
 msgid "Target mbox filename can't be left empty."
@@ -3757,152 +3764,171 @@ msgid ""
 "%s?"
 msgstr ""
 "Plik %s jest pusty lub uszkodzony! Czy chcesz użyć pliku z kopi "
-"bezpieczeństa %s?"
+"bezpieczeństwa %s?"
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
-msgstr "zasada nie jest parta na koncie\n"
+msgstr "zasada nie zależy od konta\n"
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"zasada zależna od konta, nie dopasowana do bieżącego konta które służy do "
+"pobierania wiadomości\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
-"zasada zależna od konta [id=%d, name='%s'], dopasowana do aktualnego konta, "
+"zasada zależna od konta [id=%d, name='%s'], dopasowana do bieżącego konta, "
 "które jest używane do pobierania wiadomości\n"
 
-#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
-#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
-#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "NON_EXISTENT"
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
-"zasada zależna od konta, nie dopasowana do aktualnego konta które służy do "
+"zasada zależna od konta, nie dopasowana do bieżącego konta, które służy do "
 "pobierania wiadomości\n"
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
-"zasada zależna od konta [id=%d, name='%s'], nie dopasowywana do aktualnego "
-"konta, które służy do pobieranai wiadomości [id=%d, name='%s']\n"
+"zasada zależna od konta [id=%d, name='%s'], nie dopasowywana do bieżącego "
+"konta, które służy do pobierania wiadomości [id=%d, name='%s']\n"
 
-#: src/filtering.c:646
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"reguła nie opiera się na koncie, wszystkie reguły są dopasowywane i tak na "
-"żądanie użytkownika\n"
+"zasada jest niezależna od konta, mimo to stosowane są wszystkie zasady na"
+" życzenie użytkownika\n"
 
-#: src/filtering.c:652
+#: 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"
+
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
 "zasada zależna od konta [id=%d, name='%s'], ale wszystkie reguły są "
-"dopasowywane na żądanie użytkownika\n"
+"dopasowywane na żądanie użytkownika mimo tego\n"
 
-#: src/filtering.c:670
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "zasada zależna od konta, pominięta na życzenie użytkownika\n"
+
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "zasada zależna od konta [id=%d, name='%s'], pomijane na życzenie "
 "użytkownika\n"
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
-msgstr "zasada zależna od konta, pominięta na życzenie użytkownika\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "zasada zależna od konta, dopasowywana do bieżącego konta\n"
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"zasada zależna od konta [id=%d, name='%s'], nie dopasowywana do bieżącego "
+"zasada zależna od konta [id=%d, name='%s'], dopasowywana do bieżącego "
 "konta [id=%d, name='%s']\n"
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr "zasada zależna od konta, nie dopasowywana do bieżącego konta\n"
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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 ""
-"zasada zależna od konta [id=%d, name='%s'], aktualne konto [id=%d, "
-"name='%s']\n"
+"zasada zależna od konta [id=%d, name='%s'], nie dopasowywana do bieżącego "
+"konta [id=%d, name='%s']\n"
 
-#: src/filtering.c:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "zastosowuje działania [ %s ]\n"
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
-msgstr "akcja nie może zostać uruchomiona\n"
+msgstr "nie można zastosować działania\n"
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "brak dalszych procedur po akcji [ %s ]\n"
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "przetwarzanie zasady '%s' [ %s ]\n"
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "przetwarzanie zasady <nienazwana> [ %s ]\n"
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "wyłączona zasada '%s' [ %s ]\n"
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "wyłączona zasada <nienazwana> [ %s ]\n"
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "nieokreślone"
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "incorporation"
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr "ręcznie"
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "przetwarzania katalogu"
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "przetwarzanie przed"
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "post-przetwarzanie"
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3919,11 +3945,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3984,7 +4010,7 @@ msgstr "Synchronizowanie %s do użytku w trybie niesieciowym...\n"
 
 #: src/folder.c:4872
 msgid "A folder name cannot begin or end with a dot."
-msgstr "Nazwa katalogu nie może się kończyć ani zaczynać kropką."
+msgstr "Nazwa katalogu nie może kończyć ani zaczynać się kropką."
 
 #: src/folder.c:4876
 msgid "A folder name can not end with a space."
@@ -4001,21 +4027,21 @@ msgstr "Nowy katalog"
 
 #: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
-msgstr "Dziedziczenie właściwości i zasad przetwarzania z katalogu nadrzędnego"
+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:433
+#: 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:2104
+#: src/plugins/vcalendar/vcal_folder.c:2102
 #, 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:445 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2111
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2109
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Katalog '%s' już istnieje."
@@ -4029,25 +4055,25 @@ msgstr "Nie można utworzyć katalogu '%s'."
 
 #: src/folderview.c:248
 msgid "Mark all re_ad"
-msgstr "O_znacz wszystkie jako przeczytane"
+msgstr "Ozn_acz wszystkie jako przeczytane"
 
 #: src/folderview.c:249
 msgid "Mark all u_nread"
-msgstr "O_znacz wszystkie jako nieprzeczytane"
+msgstr "Oz_nacz wszystkie jako nieprzeczytane"
 
 #: src/folderview.c:250
 msgid "Mark all read recursi_vely"
-msgstr "Oznacz wszystkie rekursywnie jako przeczytane"
+msgstr "Oznacz _wszystkie wgłąb jako przeczytane"
 
 #: src/folderview.c:251
 msgid "Mark all unread recursi_vely"
-msgstr "Oznacz wszystkie rekursywnie jako nieprzeczytane"
+msgstr "Oznacz _wszystkie wgłąb jako nieprzeczytane"
 
 #: src/folderview.c:253
 msgid "R_un processing rules"
-msgstr "Wykonaj zasady przetwarzania"
+msgstr "_Wykonaj zasady przetwarzania"
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "Po_szukaj w katalogu..."
 
@@ -4057,11 +4083,11 @@ msgstr "Przetwarzan_ie..."
 
 #: src/folderview.c:257
 msgid "Empty _trash..."
-msgstr "Opróżnij kosz..."
+msgstr "Opróżnij _kosz..."
 
 #: src/folderview.c:258
 msgid "Send _queue..."
-msgstr "Wyślij wiadomości z kolejki..."
+msgstr "Wyślij wiadomości z k_olejki..."
 
 #: src/folderview.c:265
 msgid "Set Displayed columns"
@@ -4083,7 +4109,7 @@ msgstr "Nieprzeczytane"
 #: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
-msgstr "Wszystkie"
+msgstr "Łącznie"
 
 #. TRANSLATORS: This in Number sign in American style
 #: src/folderview.c:454 src/summaryview.c:469
@@ -4096,33 +4122,32 @@ msgstr "Ustawianie szczegółów katalogu..."
 
 #: src/folderview.c:870 src/summaryview.c:4272
 msgid "Mark all as read"
-msgstr "Oznacz wszystkie jako przeczytane"
+msgstr "Oznaczanie wszystkich jako przeczytane"
 
 #: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
-"Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu i "
-"podkatalogach jako przeczytane?"
+"Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu i podkatalogach "
+"jako przeczytane?"
 
 #: src/folderview.c:873 src/summaryview.c:4273
 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?"
+"Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu jako przeczytane?"
 
 #: src/folderview.c:876 src/summaryview.c:4318
 msgid "Mark all as unread"
-msgstr "Oznacz wszystkie jako nieprzeczytane"
+msgstr "Oznaczanie wszystkich jako nieprzeczytane"
 
 #: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
-"Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu i "
-"podkatalogach jako nieprzeczytane?"
+"Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu i podkatalogach "
+"jako nieprzeczytane?"
 
 #: src/folderview.c:879 src/summaryview.c:4319
 msgid "Do you really want to mark all mails in this folder as unread?"
@@ -4130,12 +4155,12 @@ msgstr ""
 "Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu jako "
 "nieprzeczytane?"
 
-#: src/folderview.c:1075 src/imap.c:4693
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Odpytywanie katalogu %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Odpytywanie katalogu %s..."
@@ -4148,9 +4173,8 @@ msgstr "Przebuduj drzewo katalogów"
 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ć?"
+"Przebudowanie drzewa katalogów usunie miejscowe pliki pamięci podręczne "
+"(cache). Czy chcesz kontynuować?"
 
 #: src/folderview.c:1120
 msgid "Rebuilding folder tree..."
@@ -4183,7 +4207,7 @@ msgstr "Otwieranie katalogu %s..."
 msgid "Folder could not be opened."
 msgstr "Katalog nie mógł zostać otworzony."
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Opróżnij kosz"
 
@@ -4195,15 +4219,15 @@ msgstr "Usunąć wszystkie wiadomości z kosza?"
 msgid "_Empty trash"
 msgstr "Opróżnij _kosz"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2541 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
 msgid "You're working offline. Override?"
 msgstr ""
-"Pracujesz będąc odłączonym od sieci. Czy chcesz połączyć się ponownie do"
-" sieci?"
+"Pracujesz będąc odłączonym od sieci. Czy chcesz połączyć się ponownie do "
+"sieci?"
 
 #: src/folderview.c:2553 src/toolbar.c:3106
 msgid "Send queued messages"
@@ -4297,11 +4321,11 @@ msgstr "Wybierz źródła wieści, do zapisania się:"
 
 #: src/grouplistdialog.c:189
 msgid "Find groups:"
-msgstr "Znajdź grupę:"
+msgstr "Poszukaj grup:"
 
 #: src/grouplistdialog.c:198
 msgid " Search "
-msgstr " Szukaj "
+msgstr " Poszukaj "
 
 #: src/grouplistdialog.c:212
 msgid "Newsgroup name"
@@ -4311,7 +4335,7 @@ msgstr "Nazwa źródła wieści"
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Rodzaj"
 
@@ -4337,11 +4361,11 @@ msgstr "nieznana"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie udało się pobrać listy źródła wieści."
 
-#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Zrobiono."
 
-#: src/grouplistdialog.c:503
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d pobranych nazw grup (%s przeczytano)"
@@ -4370,7 +4394,7 @@ 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:862
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4441,7 +4465,7 @@ msgstr "Współtwórcy"
 
 #: src/gtk/about.c:416
 msgid "Compiled-in Features"
-msgstr "Cechy włączone do zbudowania programu"
+msgstr "Dodatki użyte do zbudowania programu"
 
 #: src/gtk/about.c:433
 msgctxt "compface"
@@ -4459,47 +4483,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "dodaje obsługę szyfrowanych połączeń z serwerami\n"
 
 #: src/gtk/about.c:463
-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"
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "umożliwia przekształcanie z i na zestawy znaków\n"
 
-#: src/gtk/about.c:484
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "dodaje obsługę adresów IPv6\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "dodaje obsługę książek adresowych PalmOS\n"
 
-#: src/gtk/about.c:494
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "dodaje obsługę współdzielonych książek adresowych LDAP\n"
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "dodaje obsługę serwerów IMAP i NNTP\n"
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "dodaje obsługę wyglądów SVG\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "dodaje obsługę posiedzeń\n"
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "dodaje obsługę wykrywania zmian w ustawieniach sieci\n"
 
-#: src/gtk/about.c:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "dodaje obsługę wyglądów SVG\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "dodaje obsługę uwierzytelniania OAuth2\n"
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4510,7 +4538,7 @@ msgstr ""
 "przez Fundację Wolnego Oprogramowania - w wersji 3 lub (jeśli wolisz) każdej "
 "późniejszej."
 
-#: src/gtk/about.c:574
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4522,7 +4550,7 @@ msgstr ""
 "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
 "dalszych informacji zobacz Powszechną Licencję Publiczną GNU."
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4531,73 +4559,73 @@ msgstr ""
 "Powszechnej Licencji Publicznej GNU (GNU General Public License);jeśli nie, "
 "odwiedź "
 
-#: src/gtk/about.c:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Statystyki posiedzenia\n"
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Rozpoczęto: %s\n"
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Ruch przychodzący\n"
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Odebrane wiadomości: %d\n"
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Ruch wychodzący\n"
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nowe/przekierowane wiadomości: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpowiedzi: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Przekazane wiadomości: %d\n"
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Całkowita liczba wysłanych wiadomości: %d\n"
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "Op_is"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Autorzy"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_Features"
-msgstr "_Cechy"
+msgstr "_Dodatki"
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Licencja"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "_Uwagi do wydania"
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "_Statystyki"
 
@@ -4668,8 +4696,8 @@ msgstr "Ustawianie kolejności skrzynek pocztowych"
 #: src/gtk/foldersort.c:266
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
-"Przesuwaj skrzynki w górę lub w dół, aby zmieniać ich kolejność w spisie"
-" katalogów."
+"Przesuwaj skrzynki w górę lub w dół, aby zmieniać ich kolejność w spisie "
+"katalogów."
 
 #: src/gtk/foldersort.c:300
 msgid "Mailboxes"
@@ -5076,7 +5104,7 @@ msgstr "Pierwszeństwo"
 msgid "Precedence:"
 msgstr "Pierwszeństwo:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -5214,15 +5242,15 @@ msgstr "Nieprzeczytana wiadomość"
 
 #: src/gtk/icon_legend.c:68
 msgid "Message has been replied to"
-msgstr "Na wiadomość odpowiedziano do"
+msgstr "Odpowiedziano na daną wiadomość"
 
 #: src/gtk/icon_legend.c:69
 msgid "Message has been forwarded"
-msgstr "Przekazano wiadomość"
+msgstr "Przekazano daną wiadomość"
 
 #: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded and replied to"
-msgstr "Przekazano i odpowiedziano na wiadomość"
+msgstr "Przekazano i odpowiedziano na daną wiadomość"
 
 #: src/gtk/icon_legend.c:71
 msgid "Message is in an ignored thread"
@@ -5242,7 +5270,7 @@ msgstr "Wiadomość posiada załącznik(i)"
 
 #: src/gtk/icon_legend.c:76
 msgid "Digitally signed message"
-msgstr "Wiadomość podpisana elektronicznie"
+msgstr "Podpisana wiadomość"
 
 #: src/gtk/icon_legend.c:77
 msgid "Encrypted message"
@@ -5262,15 +5290,15 @@ msgstr "Oznaczona wiadomość"
 
 #: src/gtk/icon_legend.c:82
 msgid "Message is marked for deletion"
-msgstr "Wiadomość wyznaczona do usunięcia"
+msgstr "Wiadomość przeznaczona do usunięcia"
 
 #: src/gtk/icon_legend.c:83
 msgid "Message is marked for moving"
-msgstr "Wiadomość wyznaczona do przeniesienia"
+msgstr "Wiadomość przeznaczona do przeniesienia"
 
 #: src/gtk/icon_legend.c:84
 msgid "Message is marked for copying"
-msgstr "Wiadomość oznaczona do skopiowania"
+msgstr "Wiadomość przeznaczona do skopiowania"
 
 #: src/gtk/icon_legend.c:86
 msgid "Locked message"
@@ -5278,7 +5306,7 @@ msgstr "Zablokowana wiadomość"
 
 #: src/gtk/icon_legend.c:88
 msgid "Folder (normal, opened)"
-msgstr "Katalog (normalny, otwarty)"
+msgstr "Katalog (zwyczajny, otwarty)"
 
 #: src/gtk/icon_legend.c:89
 msgid "Folder with read messages hidden"
@@ -5289,7 +5317,7 @@ msgid "Folder contains marked messages"
 msgstr "Katalog zawiera oznaczone wiadomości"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+msgid "IMAP folder which contains subfolders only"
 msgstr "Katalog IMAP, zawierający tylko pod-katalogi"
 
 #: src/gtk/icon_legend.c:92
@@ -5303,8 +5331,7 @@ msgstr "Opis ikon"
 #: src/gtk/icon_legend.c:145
 msgid ""
 "The following icons are used to show the status of messages and folders:"
-msgstr ""
-"Następujące ikony służą do przedstawiania stanu wiadomości i katalogów:"
+msgstr "Poniższe ikony opisują stan wiadomości i katalogów:"
 
 #: src/gtk/inputdialog.c:227 src/gtk/inputdialog.c:249
 #, c-format
@@ -5352,9 +5379,9 @@ msgid ""
 "has been truncated for safety. This message could be\n"
 "corrupted, malformed or part of some DoS attempt."
 msgstr ""
-"Ten adres URL był za długi aby go wyświetlić \n"
-"dlatego został obcięty dla bezpieczeństa. Ta wiadomość mogła zostać\n"
-"uszkodzona, przekształco lub częsciowo mógł to być atak DoS."
+"Ten adres URL jest za długi, aby go wyświetlić,\n"
+"więc został obcięty dla bezpieczeństwa. Ta wiadomość mogła zostać\n"
+"uszkodzona, przekształcona lub być częścią ataku DoS."
 
 #: src/gtk/pluginwindow.c:163 src/gtk/pluginwindow.c:168
 msgid ""
@@ -5458,15 +5485,15 @@ msgstr "Z_astosuj"
 msgid "Page Index"
 msgstr "Spis Stron"
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Ukryj"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
 #: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
-#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Konto"
@@ -5497,7 +5524,7 @@ msgstr "wiadomości które zawierają S w treści wiadomości"
 
 #: src/gtk/quicksearch.c:413
 msgid "messages which contain S in the whole message"
-msgstr "wiadomości które zawierają S w całej wiadomości"
+msgstr "wiadomości, które zawierają S w całej wiadomości"
 
 #: src/gtk/quicksearch.c:414
 msgid "messages carbon-copied to S"
@@ -5551,7 +5578,7 @@ msgstr "wiadomości zawierające S w wartości dowolnego nagłówka"
 
 #: 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"
+msgstr "wiadomości, które zawierają S w polu Message-ID nagłówka"
 
 #: src/gtk/quicksearch.c:429
 msgid "messages which contain S in In-Reply-To header"
@@ -5579,7 +5606,7 @@ msgstr "stare wiadomości"
 
 #: src/gtk/quicksearch.c:435
 msgid "incomplete messages (not entirely downloaded)"
-msgstr "niekompletne wiadomości (częściowo pobrane)"
+msgstr "niepełne wiadomości (niecałkowicie pobrane)"
 
 #: src/gtk/quicksearch.c:436
 msgid "messages which you have replied to"
@@ -5639,7 +5666,7 @@ msgstr "nieprzeczytane wiadomości"
 
 #: src/gtk/quicksearch.c:450
 msgid "messages which contain S in References header"
-msgstr "wiadomości zawierające S w nagłówku Referencje"
+msgstr "wiadomości, zawierające S w nagłówku Referencje"
 
 #: src/gtk/quicksearch.c:451
 #, c-format
@@ -5671,7 +5698,7 @@ msgstr "szukanie z rozróżnieniem na wielkość liter"
 #: src/gtk/quicksearch.c:458
 msgid "match using regular expressions instead of substring search"
 msgstr ""
-"dopasuj używając wyrażenia regularnego zamist wyszukiwania pod-ciągu znaków"
+"dopasuj używając wyrażenia regularnego zamiast wyszukiwania pod-ciągu znaków"
 
 #: src/gtk/quicksearch.c:460
 msgid ""
@@ -5691,8 +5718,8 @@ msgid ""
 "in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
-"Wyszukiwanie w trybie rozszerzonym pozwala określić warunki, które muszą "
-"być spełnione, aby wiadomość została wyświetlona.\n"
+"Wyszukiwanie w trybie rozszerzonym pozwala określić warunki, które muszą być "
+"spełnione, aby wiadomość została wyświetlona.\n"
 "\n"
 "W tym trybie wyszukiwania można używać następujących symboli:"
 
@@ -5706,7 +5733,7 @@ msgstr "Od/Do/DW/Temat/Znacznik"
 
 #: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
-msgstr "Rekursywne"
+msgstr "Wgłąb"
 
 #: src/gtk/quicksearch.c:896
 msgid "Sticky"
@@ -5741,7 +5768,7 @@ msgstr "Dostosuj warunki wyszukiwania"
 #: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
-msgstr "_Informacje"
+msgstr "_Szczegóły"
 
 #: src/gtk/quicksearch.c:954
 msgid "Information about extended symbols"
@@ -5760,7 +5787,7 @@ msgstr "Poprawny%s"
 #: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
 #: src/ssl_manager.c:304 src/ssl_manager.c:308
 msgid " (expired)"
-msgstr " (przedawnione)"
+msgstr " (przedawniony)"
 
 #: src/gtk/sslcertwindow.c:186
 msgid "Owner"
@@ -5853,7 +5880,7 @@ msgstr "Zerwij połą_czenie"
 
 #: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:552
 msgid "_Accept and save"
-msgstr "_Akceptuj i zapisz"
+msgstr "Z_atwierdź i zapisz"
 
 #: src/gtk/sslcertwindow.c:458
 #, c-format
@@ -5874,7 +5901,7 @@ msgstr "Certyfikat TLS wygasł"
 
 #: src/gtk/sslcertwindow.c:490
 msgid "_Accept"
-msgstr "_Akceptuj"
+msgstr "Z_atwierdź"
 
 #: src/gtk/sslcertwindow.c:510
 msgid "New certificate:"
@@ -5882,7 +5909,7 @@ msgstr "Nowy certyfikat:"
 
 #: src/gtk/sslcertwindow.c:515
 msgid "Known certificate:"
-msgstr "Znany certyfikat:"
+msgstr "Bieżący certyfikat:"
 
 #: src/gtk/sslcertwindow.c:522
 #, c-format
@@ -5890,8 +5917,8 @@ msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
 msgstr ""
-"Certyfikat dla %s się zmienił.\n"
-"%sCzy chcesz go zatwierdzić?"
+"Certyfikat dla %s uległ zmianie.\n"
+"%sZatwierdzić go?"
 
 #: src/gtk/sslcertwindow.c:543
 msgid "_View certificates"
@@ -5903,7 +5930,7 @@ msgstr "Certyfikat TLS uległ zmianie i jest nieprawidłowy"
 
 #: src/gtk/sslcertwindow.c:550
 msgid "TLS certificate changed"
-msgstr "Certyfikaty TLS uległ zmianie"
+msgstr "Certyfikat TLS uległ zmianie"
 
 #: src/headerview.c:95
 msgid "Tags:"
@@ -5927,8 +5954,7 @@ msgstr "(Bez tematu)"
 msgid "Error:"
 msgstr "Błąd:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Nazwa pliku:"
@@ -5941,197 +5967,197 @@ msgstr "Rozmiar pliku:"
 msgid "Load Image"
 msgstr "Wczytaj obraz"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "Połączenie IMAP zostało zerwane\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Błąd IMAP dla %s:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "uwierzytelnienie"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "nie uwierzytelniono"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "zły stan"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "błąd strumienia"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "błąd parsowania (prawdopodobnie serwer nie jest zgodny ze specyfikacją "
 "opisaną w RFC)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "połączenie odrzucone."
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "błąd pamięci"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "błąd krytyczny"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "błąd protokołu (prawdopodobnie serwer nie jest zgodny ze specyfikacją "
 "opisaną w RFC)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
-msgstr "połączenie nie zostało zaakceptowane"
+msgstr "połączenie nie zostało zatwierdzone"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "błąd przy wykonywaniu APPEND"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "błąd przy wykonywaniu NOOP"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "błąd przy wykonywaniu LOGOUT"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "błąd przy wykonywaniu CAPABILITY"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "błąd przy wykonywaniu CHECK"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "błąd przy wykonywaniu CLOSE"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "błąd przy wykonywaniu EXPUNGE"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "błąd przy wykonywaniu COPY"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "błąd przy wykonywaniu UID COPY"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "błąd przy wykonywaniu CREATE"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "błąd przy wykonywaniu DELETE"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "błąd przy wykonywaniu EXAMINE"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "błąd przy wykonywaniu FETCH"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "błąd przy wykonywaniu UID FETCH"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "błąd przy wykonywaniu LIST"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "błąd przy wykonywaniu LOGIN"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "błąd przy wykonywaniu LSUB"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "błąd przy wykonywaniu RENAME"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "błąd przy wykonywaniu SEARCH"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "błąd przy wykonywaniu UID SEARCH"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "błąd przy wykonywaniu SELECT"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "błąd przy wykonywaniu STATUS"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "błąd przy wykonywaniu STORE"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "błąd przy wykonywaniu UID STORE"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "błąd przy wykonywaniu SUBSCRIBE"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "błąd przy wykonywaniu UNSUBSCRIBE"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "błąd przy wykonywaniu STARTTLS"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "błąd przy wykonywaniu INVAL"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "błąd przy wykonywaniu EXTENSION"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "błąd przy wykonywaniu SASL"
 
-#: src/imap.c:751
+#: src/imap.c:753
 msgid "TLS error"
 msgstr "Błąd TLS"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Nieznany błąd [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6143,7 +6169,7 @@ msgstr ""
 "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."
 
-#: src/imap.c:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6155,7 +6181,7 @@ msgstr ""
 "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."
 
-#: src/imap.c:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6168,7 +6194,7 @@ msgstr ""
 "została skompilowana ze wsparciem SASL i wtyczka SCRAM SASL jest "
 "zainstalowana."
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6180,7 +6206,7 @@ msgstr ""
 "Logowanie typu PLAIN działa tylko jeżeli biblioteka libetpan została "
 "skompilowana ze wsparciem SASL i wtyczka PLAIN SASL jest zainstalowana."
 
-#: src/imap.c:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6192,7 +6218,7 @@ msgstr ""
 "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."
 
-#: src/imap.c:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -6202,36 +6228,36 @@ msgstr ""
 "\n"
 "Błąd OAuth2. Sprawdź i popraw ustawienia swojego konta OAuth2."
 
-#: src/imap.c:1004
+#: src/imap.c:1014
 #, 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:1008
+#: src/imap.c:1018
 #, 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:1026
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Nie udało się połączyć z %s"
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1043 src/imap.c:1046
 #, 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:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 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:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 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:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 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,114 +6265,114 @@ msgid ""
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
-"To połączenie jest ustawione jako bezpieczne z użyciem TLS, ale"
-"TLS nie jest dostępny w tej wersji Claws Mail. \n"
+"To połączenie jest ustawione jako bezpieczne z użyciem TLS, aleTLS nie jest "
+"dostępny w tej wersji Claws Mail. \n"
 "\n"
 "Czy chcesz kontynuować łączenie do tego serwera? Połączenie nie będzie "
 "bezpieczne."
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Kon_tynuuj łączenie"
 
-#: src/imap.c:1192
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Konto '%s': Łączenie z serwerem IMAP: %s:%d..."
 
-#: src/imap.c:1257
+#: src/imap.c:1267
 #, 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:1260
+#: src/imap.c:1270
 #, 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:1292 src/imap.c:4164
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nie można nawiązać sesji STARTTLS.\n"
 
-#: src/imap.c:1364
+#: src/imap.c:1374
 #, 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:1367
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nie można wejść na serwer IMAP %s."
 
-#: src/imap.c:1795
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Dodawanie wiadomości..."
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopiowanie wiadomości..."
 
-#: src/imap.c:2526
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "Wyszukanie nie powiodło się z powodu błędu serwera."
 
-#: src/imap.c:2610
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "nie można ustawić flagi usunięta\n"
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: src/imap.c:2992
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Odpytywanie o katalogi, których nie śledzę %s..."
 
-#: src/imap.c:2995
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Szukanie podkatalogów w %s ..."
 
-#: src/imap.c:3286
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: src/imap.c:3299
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: src/imap.c:3429
+#: src/imap.c:3439
 #, 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:3542
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "nie można usunąć skrzynki pocztowej\n"
 
-#: src/imap.c:3821
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "Nie udało się wykonać polecenia LIST\n"
 
-#: src/imap.c:3906
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Flagowanie wiadomości..."
 
-#: src/imap.c:4009
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można zaznaczyć katalogu: %s\n"
 
-#: src/imap.c:4161
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Serwer wymaga STARTTLS do zalogowania się.\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Nie można odświeżyć właściwości.\n"
 
-#: src/imap.c:4176
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6355,20 +6381,20 @@ 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:4184
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Logowanie na serwer jest wyłączone.\n"
 
-#: src/imap.c:4407
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Pobieranie wiadomości..."
 
-#: src/imap.c:5108
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nie można ustawić flagi usunięta: %d\n"
 
-#: src/imap.c:6143
+#: src/imap.c:6153
 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,11 +6402,9 @@ msgid ""
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
 "Masz określone jedno lub więcej kont IMAP. Jednak ta wersja Claws  Mail "
-"została zbudowana bez obsługi IMAP; Twoje konta IMAP zostały "
-"wyłączone.\n"
+"została zbudowana bez obsługi IMAP; Twoje konta IMAP zostały wyłączone.\n"
 "\n"
-"Prawdopodobnie potrzebujesz wgrać libetpan lub zbudować Claws "
-"Mail."
+"Prawdopodobnie potrzebujesz wgrać libetpan lub zbudować Claws Mail."
 
 #: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:60
 msgid "Create _new folder..."
@@ -6420,14 +6444,14 @@ msgstr "Śledzenie"
 msgid "_Subscribe..."
 msgstr "Zacznij śledzić..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "Przestań śledzić..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
 #: src/plugins/mailmbox/plugin_gtk.c:65
 msgid "_Check for new messages"
-msgstr "_Pobierz pocztę"
+msgstr "Poszukaj nowych wiadomoś_ci"
 
 #: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:66
 msgid "C_heck for new folders"
@@ -6435,7 +6459,7 @@ msgstr "Odpytaj o nowe katalogi"
 
 #: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "R_ebuild folder tree"
-msgstr "_Przebuduj drzewo katalogów"
+msgstr "Prz_ebuduj drzewo katalogów"
 
 #: src/imap_gtk.c:87
 msgid "Show only subscribed _folders"
@@ -6448,60 +6472,61 @@ msgid ""
 "only and no mail, append '/' to the folder name)"
 msgstr ""
 "Wpisz nazwę nowego katalogu:\n"
-"(jeśli chcesz utworzyć katalog by przechowywać w nim\n"
-"podkatalogi a nie przechowywać wiadomości, dołącz `/' na końcu nazwy)"
+"(jeśli katalog ma przechowywać tylko podkatalogi\n"
+"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:422 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 #, 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:423
+#: 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:2097
+#: src/plugins/vcalendar/vcal_folder.c:2095
 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:453 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2117
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2115
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
-"Nie udało się zmienić nazwy katalogu.\n"
-"Nowa nazwa katalogu nie jest dozwolona."
+"Nie udało się przemianować katalogu.\n"
+"Nie wolno nazwać katalogu w ten sposób."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
-msgstr "wybierz katalog, do którego chcesz przenieść '%s'"
+msgstr "Wybierz katalog, do którego przenieść katalog '%s'"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 msgid "Select folder to copy folder '%s' to"
-msgstr "Wybierz katalog, do którego chcesz skopiować '%s'"
+msgstr "Wybierz katalog, do którego skopiować katalog '%s'"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203
+#: 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
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"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ąć?"
+"Nastąpi trwałe usunięcie wszystkich katalogów i wiadomości w '%s'.\n"
+"Odzyskanie ich będzie niemożliwe.\n"
+"Czy na pewno to zrobić?"
 
-#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: 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:2050
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "Nie można usunąć katalogu `%s'."
+msgstr "Nie można usunąć katalogu '%s'."
 
 #: src/imap_gtk.c:507
 #, c-format
@@ -6510,7 +6535,7 @@ msgstr "Czy naprawdę odpytać o podkatalogi, których nie śledzisz w '%s'?"
 
 #: src/imap_gtk.c:510
 msgid "Search recursively"
-msgstr "Szukaj rekursywnie"
+msgstr "Poszukaj wgłąb"
 
 #: src/imap_gtk.c:515 src/imap_gtk.c:575
 msgid "Subscriptions"
@@ -6518,14 +6543,14 @@ msgstr "Śledzone"
 
 #: src/imap_gtk.c:516
 msgid "_Search"
-msgstr "_Szukaj"
+msgstr "Po_szukaj"
 
 #: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Wybierz podkatalog z %s do śledzenia: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Zacznij śledzić"
 
@@ -6543,8 +6568,8 @@ msgstr ""
 "Jesteś śledzisz ten katalog i nie posiada on podkatalogów,\n"
 "których nie śledzisz.\n"
 "\n"
-"Jeśli istnieją nowe katalogi, utworzone i które zacząłeś śledzić poprzez inny "
-"program, użyj \"Odpytaj o nowe katalogi\" w głównym katalogu skrzynki "
+"Jeśli istnieją nowe katalogi, utworzone i które zacząłeś śledzić poprzez "
+"inny program, użyj \"Odpytaj o nowe katalogi\" w głównym katalogu skrzynki "
 "pocztowej."
 
 #: src/imap_gtk.c:567
@@ -6756,42 +6781,42 @@ msgstr "Proszę wybierz plik do importu."
 
 #: src/importpine.c:140
 msgid "Error importing Pine file."
-msgstr "Błąd podczas importu pliku PINE."
+msgstr "Błąd podczas importu pliku Pine."
 
 #: src/importpine.c:155
 msgid "Select Pine File"
-msgstr "Wybierz plik PINE."
+msgstr "Wybierz plik Pine."
 
 #: src/importpine.c:201
 msgid "Import Pine file into Address Book"
-msgstr "Zaimportuj plik PINE do Książki Adresowej"
+msgstr "Zaimportuj plik Pine do Książki Adresowej"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail potrzebuje dostępu do sieci, aby móc pobrać wiadomości."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "Nie udało się wykonać polecenia %s\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Anuluj"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6799,28 +6824,28 @@ msgstr[0] "Wykonano (otrzymano %d wiadomość (%s))"
 msgstr[1] "Wykonano (otrzymano %d wiadomości (%s))"
 msgstr[2] "Wykonano (otrzymano %d wiadomości (%s))"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Wykonano (brak nowych wiadomości)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Błąd połączenia."
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Błąd uwierzytelniania"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: 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
 msgid "Locked"
 msgstr "Zablokowana"
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Czas oczekiwania"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6828,66 +6853,66 @@ msgstr[0] "Skończono (%d nowa wiadomość)"
 msgstr[1] "Skończono (%d nowe wiadomości)"
 msgstr[2] "Skończono (%d nowe wiadomości)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Skończono (brak nowych wiadomości)"
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Podłączanie do serwera POP3: %s:%d..."
 
-#: src/inc.c:930
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nie można połączyć się z serwerem POP3: %s:%d"
 
-#: src/inc.c:934
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można połączyć się z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Pobieranie wiadomości z %s (%s)..."
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby wiadomości (STAT)..."
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby wiadomości (LAST)..."
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby wiadomości (UIDL)"
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie wielkości wiadomości (LIST)..."
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6895,16 +6920,16 @@ msgstr[0] "Pobieranie (%d wiadomości, otrzymano %s)"
 msgstr[1] "Pobieranie (%d wiadomości, otrzymano %s)"
 msgstr[2] "Pobieranie (%d wiadomości, otrzymano %s)"
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Nie udało się nawiązać połączenia z %s:%d."
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6913,37 +6938,37 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Błąd gniazda podczas połączenia z %s:%d."
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zostało zamknięte przez zdalnego gospodarza"
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Połączenie z %s:%d zostało zamknięte przez zdalnego gospodarza."
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "Skrzynka zablokowana."
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6952,11 +6977,11 @@ msgstr ""
 "Skrzynka zablokowana:\n"
 "%s"
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiodło się."
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6965,57 +6990,56 @@ msgstr ""
 "Uwierzytelnienie nie powiodło się:\n"
 "%s"
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
-"Upłynął czas oczekiwania na sesję. Możesz zwiększyć czas oczekiwania w"
-" Ustawienia/"
-"Inne/Różne."
+"Upłynął czas oczekiwania na sesję. Możesz zwiększyć czas oczekiwania w "
+"Ustawienia/Inne/Różne."
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Upłynął czas oczekiwania na połączenie z %s:%d."
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporacja została anulowana\n"
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: 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:1834
+#: 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
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "godzina"
 msgstr[1] "godziny"
 msgstr[2] "godzin"
 
-#: src/inc.c:1661
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sPracujesz odłączonym od sieci. Czy podłączyć na %d %s?"
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%s Pracujesz odłączonym od sieci. Czy chcesz się podłączyć?"
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "Ty_lko raz"
 
@@ -7128,16 +7152,16 @@ msgid_plural ""
 "more information:\n"
 "%s"
 msgstr[0] ""
-"Nie udało się wczytać następującej wtyczki. Sprawdź ustawienia wtyczek po"
-" więcej szczegółów:\n"
+"Nie udało się wczytać następującej wtyczki. Sprawdź ustawienia wtyczek po "
+"więcej szczegółów:\n"
 "%s"
 msgstr[1] ""
-"Nie udało się wczytać następujących wtyczek. Sprawdź ustawienia wtyczek po"
-" więcej szczegółów:\n"
+"Nie udało się wczytać następujących wtyczek. Sprawdź ustawienia wtyczek po "
+"więcej szczegółów:\n"
 "%s"
 msgstr[2] ""
-"Nie udało się wczytać następujących wtyczek. Sprawdź ustawienia wtyczek po"
-" więcej szczegółów:\n"
+"Nie udało się wczytać następujących wtyczek. Sprawdź ustawienia wtyczek po "
+"więcej szczegółów:\n"
 "%s"
 
 #: src/main.c:1582
@@ -7146,9 +7170,9 @@ msgid ""
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
-"Claws Mail wykryło ustawioną skrzynkę mailbox, ale jest ona "
-"niepełna. Prawdopodobnie spowodowane jest to wadliwym kontem IMAP. Użyj "
-"\"Przebuduj drzewo katalogów\" z menu katalogu by spróbować to naprawić."
+"Claws Mail wykryło ustawioną skrzynkę mailbox, ale jest ona niepełna. "
+"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
 msgid ""
@@ -7157,8 +7181,8 @@ msgid ""
 "plugin and try again."
 msgstr ""
 "Claws Mail wykrył ustawioną skrzynkę mailbox, ale nie mógł jej wczytać. "
-"Prawdopodobnie jest to spowodowane przestarzałą zewnętrzną wtyczką. Wgraj"
-" wtyczkę ponownie i spróbuj ponownie."
+"Prawdopodobnie jest to spowodowane przestarzałą zewnętrzną wtyczką. Wgraj "
+"wtyczkę ponownie i spróbuj ponownie."
 
 #: src/main.c:1828
 msgid "Missing filename\n"
@@ -7241,8 +7265,7 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 "  --compose-from-file file\n"
-"                         otwórz okno tworzenia wiadomości z danymi z "
-"pliku;\n"
+"                         otwórz okno tworzenia wiadomości z danymi z pliku;\n"
 "                         użyj - zamiast nazwy pliku aby użyć standardowego "
 "wejścia;\n"
 "                         format zawartości: najpierw nagłówek (To: wymagany) "
@@ -7301,14 +7324,14 @@ msgid ""
 "                         request: search string\n"
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
-"  --search katalog typ żądanie [rekursywnie]\n"
+"  --search katalog rodzaj żądanie [wgłąb]\n"
 "                         przeszukuje pocztę\n"
 "                         katalog na przykład.: \"#mh/Mailbox/inbox\" lub "
 "\"Mail\"\n"
 "                         typ: s[ubject],f[rom],t[o],e[xtended],m[ixed] lub "
 "g: etykieta\n"
 "                         żądanie: wyszukiwany ciąg znaków\n"
-"                         rekursywnie: wyłączone jeśli arg. rozpoczyna się od "
+"                         wgłąb: wyłączone jeśli arg. rozpoczyna się od "
 "0, n, N, f lub F"
 
 #: src/main.c:2092
@@ -7341,9 +7364,10 @@ msgid ""
 "                         folder is a folder id like 'folder/sub_folder', a "
 "file:// uri or an absolute path"
 msgstr ""
-"  --select katalog[/msg]  Przechodzi do wybranego katalogu/wiadomości\n"
-"                         Katalog do indentyfikator w formie '#mh/Mailbox/"
-"inbox'"
+"  --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"
 
 #: src/main.c:2100
 msgid "  --online               switch to online mode"
@@ -7443,829 +7467,829 @@ msgstr "NetworkManager: sieć jest włączona.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieć jest rozłączona.\n"
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Plik"
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "_Widok"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "U_stawienia"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "Dod_aj skrzynkę pocztową"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Zmień kolejność katalogów..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "Za_importuj plik mbox..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "Wy_eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "Wy_eksportuj zaznaczone do pliku mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
-msgstr "Opróżnij wszystkie kosze"
+msgstr "Opróżnij wszys_tkie kosze"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "Zapi_sz wiadomość jako..."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "Zapi_sz część jako..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Układ strony..."
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "Zsynchronizuj katalogi"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "_Wyjdź"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Zaznacz cały wątek"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "Poszukaj w bieżącej wiadomości..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "Poszukaj szybko"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "Pokaż lub uk_ryj"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "Pasek narzędzi"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Wybierz pokazywane kolumny"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "W spisie katalogów..."
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "W spisie wiadomości..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "_Układ"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "U_szereguj"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "Grupuj po tem_acie"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "Ro_zwiń wszystkie wątki"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "Prze_jdź do"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Poprzedniej wiadomości"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Następnej wiadomości"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Pop_rzedniej nieprzeczytanej wiadomości"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Następnej nieprz_eczytanej wiadomości"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Poprzedniej nowej wiadomości"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Następnej nowej wiadomości"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Poprzedniej oznaczonej wiado_mości"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Następnej ozn_aczonej wiadomości"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Poprzedniej wiadomości z etykietą"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Następnej wiadomości z etykietą"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:594
 msgid "Previously opened message"
-msgstr "Poprzednio otwarta wiadomość"
+msgstr "Poprzedniej otwartej wiadomości"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Następnej otwartej wiadomości"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Nadrzędnej wiadomości"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Następnego katalogu z ni_eprzeczytanymi wiadomościami"
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "Katal_ogu..."
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Następnej części"
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Poprzedniej części"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Przewiń wiadomość do"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Poprzedniego wiersza"
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Następnego wiersza"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Poprzedniej strony"
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Następnej strony"
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Dekodowanie znaków"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:635
 msgid "Open in new _window"
-msgstr "Otwórz w _nowym oknie"
+msgstr "Otwórz w no_wym oknie"
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
-msgstr "Źródło wiado_mości"
+msgstr "Źródło wi_adomości"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Część wiadomości"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Wyświetl jako tekst"
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Otwórz w..."
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Cytowania"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "_Uaktualnij podliczenie wiadomości"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "Pobierz"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Pobierz z bieżącego konta"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Pobierz ze wszystkich kont"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "Przerwij pobieranie"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "Utwórz _nową wiadomość"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "Compose a news message"
-msgstr "Utwórz nową wieść"
+msgstr "Napisz nową wieść"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:665 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
-msgstr "Odpowiedz do"
+msgstr "Odpowiedz szczególnie"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
-msgstr "_Lista dyskusyjna"
+msgstr "Na _listę dyskusyjną"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "_Odpowiedz na grupę i nadawcy"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "Prze_każ"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Prz_ekaż jako załącznik"
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
 #: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Prze_kieruj"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
-msgstr "Lista dyskusyjna"
+msgstr "_Lista dyskusyjna"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Wyślij"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Przestań śledzić"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "View archive"
-msgstr "Podejrzyj archiwum"
+msgstr "Obejrzyj archiwum"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:688
 msgid "Contact owner"
-msgstr "Właściciel kontaktu"
+msgstr "Napisz do właściciela"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "_Przenieś..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Move to _trash"
-msgstr "Przenieś do _kosza"
+msgstr "Wyrzuć do _kosza"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "_Usuń..."
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
-msgstr "Przenieś wątek do kosz_a"
+msgstr "Wyrzuć wątek do kosz_a"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "Usuń wątek"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Odwołaj wieść"
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "O_znacz"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "O_dznacz"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "_Oznacz jako przeczytane"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Oznacz jako nieprzeczytan_e"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Oznacz wszystko w katalogu jako przeczytane"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Oznacz wszystko w katalogu jako nieprzeczytane"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Pomiń wątek"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Cofnij pominięcie wątku"
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Śledź wątek"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Cofnij śledzenie wątku"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Oznacz jako _spam"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Oznacz jako _ham"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Odblokuj"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Kolorowa _etykieta"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "_Znaczniki"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "Zmień tr_eść"
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Sprawdź podpis"
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Dodaj nadawcę do książki adresowej..."
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "Zbierz adresy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Z bi_eżącego katalogu..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Z zaznaczonych wiado_mości..."
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "Prze_filtruj wszystkie wiadomości w tym katalogu"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "Prze_filtruj zaznaczone wiadomości"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "Wykonaj zasady przetwarzania katalogów"
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Utwórz zasadę f_iltrowania"
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
-msgstr "Automatycznie"
+msgstr "S_amoczynnie"
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Wg nadawcy"
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Wg adresa_ta"
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Wg tematu"
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
-msgstr "Wg nadawcy"
+msgstr "Wg wysyłając_ego"
 
-#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Utwórz zasadę przetwarzania"
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Wypisz adresy _URL..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "Odpytaj o nowe wiadomości w_e wszystkich katalogach"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Usuń _powielone wiadomości"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "W zaznaczonym katalogu"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "We wszystkich katalogach"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "_Wymaż"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr "Cer_tyfikaty TLS"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Dziennik filtr_owania"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Dziennik sieci"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Dziennik _diagnostyczny"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "_Zapomnij wszystkie hasła sesji"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr "Za_pomnij główne hasło"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "Przestaw bieżą_ce konto"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "_Dostosuj bieżące konto..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "Utwórz _nowe konto..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "Dostosuj wszystki_e konta..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "U_stawienia..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "_Przetwarzanie przed..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "_Przetwarzanie po..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Filtrowanie..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "Wzorce..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "Dzi_ałania..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "Znaczniki..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "Wtyczki..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Podręcznik użytkownika"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ w internecie"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "Opis ikon"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Ustaw jako konto domyślne"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "Odłącz od sieci"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Pasek men_u"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "Widok wiado_mości"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "Pasek stanu"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Nagłówki kolumn"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "Pokaż w wątkach"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Ukryj przeczytane wątki"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "_Ukryj przeczytane wiadomości"
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Ukryj usunięte wiadomości"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "_Na całym ekranie"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Pokaż wszystkie na_główki"
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Zwiń wszystkie"
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Zwiń od _2 poziomu"
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Zwiń od _3 poziomu"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Tekst pod ikonkami"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Tekst obok ikon"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Tylko _ikony"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Tylko _tekst"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "_Standardowy"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "_Trójkolumnowy"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "Szerokie _wiadomości"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "Szeroki sp_is wiadomości"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "_Mały ekran"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "Wg _numeru"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "Wg rozm_iaru"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "Wg _daty"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Wg daty wątku"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Wg temat_u"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "Wg koloru _etykiety"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Wg znacznika"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "Wg oznaczenia"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "Wg _stanu"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "Wg załącznika"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Wg punktacji"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Wg blokad"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "Nie szereguj"
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Rosnąco"
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Malejąco"
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "S_am wykryj"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6489
 msgid "Modify tags..."
 msgstr "Zmień znaczniki..."
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Pojawił się błąd. Naciśnij tutaj aby zobaczyć dziennik."
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Jesteś podłączony do sieci. Naciśnij, aby odłączyć się od sieci"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "Jesteś odłączony do sieci. Naciśnij, aby podłączyć się do sieci"
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Wybierz konto"
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Dziennik sieci"
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Dziennik diagnostyczny filtrowania/przetwarzania"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "dziennik filtrowania włączony\n"
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "dziennik filtrowania wyłączony\n"
 
-#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
-#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
+#: 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
 msgid "Untitled"
 msgstr "Nienazwany"
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Usunąć wszystkie wiadomości z katalogów kosza?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "Nie wychodź"
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę pocztową"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8279,18 +8303,18 @@ msgstr ""
 "Jeśli podasz istniejącą skrzynkę, zostanie ona\n"
 "samoczynnie przeszukana."
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Skrzynka pocztowa '%s' już istnieje."
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Skrzynka pocztowa"
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8299,51 +8323,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:3389
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Wysyłanie zabronione"
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Nie udało się zaimportować skrzynki mbox."
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Nie udało się wyeksportować skrzynki mbox."
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Wyjdź"
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Czy wyjść z Claws Mail?"
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "_Wyjdź"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Synchronizacja katalogów"
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Czy chcesz zsynchronizować swoje katalogi?"
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "Z_synchronizuj"
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Usuwanie powielonych wiadomości..."
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Nie znaleziono powielonych wiadomości w wybranym katalogu.\n"
 
-#: src/mainwindow.c:4711
+#: src/mainwindow.c:4709
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8351,7 +8375,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:4715
+#: src/mainwindow.c:4713
 #, 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"
@@ -8362,11 +8386,11 @@ msgstr[1] ""
 msgstr[2] ""
 "Oznaczono %d powielonych wiadomości do usunięcia z wybranego katalogu.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Usuwanie powielonych wiadomości z wszystkich katalogów..."
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8374,50 +8398,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:4764
+#: src/mainwindow.c:4762
 #, 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:4926 src/messageview.c:2647
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Wybierz katalog, do którego chcesz przejść"
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Zasady przetwarzania do zastosowania przed zasadami katalogów"
 
-#: src/mainwindow.c:5037
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Zasady przetwarzania do zastosowania po zasadach katalogów"
 
-#: src/mainwindow.c:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Ustawienia filtrowania"
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5156
 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:5249
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail został zarejestrowany jako klient domyślny."
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5249
 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:5265 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Odpytywanie katalogu %s%c%s..."
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8531,7 +8555,7 @@ msgstr "Szukanie w bieżącej wiadomości"
 
 #: src/message_search.c:192
 msgid "Find text:"
-msgstr "Znajdź tekst:"
+msgstr "Poszukaj tekstu:"
 
 #: src/message_search.c:318 src/summary_search.c:783
 msgid "Search failed"
@@ -8622,11 +8646,11 @@ msgstr ""
 
 #: src/messageview.c:1917
 msgid "You asked for a return receipt in this message."
-msgstr "Autor tej wiadomości prosił o potwierdzenie dostarczenia."
+msgstr "Prosisz w tej wiadomości o potwierdzenie jej dostarczenia."
 
 #: src/messageview.c:1923
 msgid "This message asks for a return receipt."
-msgstr "Autor tej wiadomości prosił o potwierdzenie dostarczenia."
+msgstr "Autor tej wiadomości prosi o potwierdzenie jej dostarczenia."
 
 #: src/messageview.c:1924
 msgid "Send receipt"
@@ -8637,8 +8661,8 @@ msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
-"Ta wiadomość została pobrana częściowo\n"
-"i została usunięta z serwera "
+"Pobrano tę wiadomość częściowo\n"
+"i usunięto na serwerze."
 
 #: src/messageview.c:1973
 #, c-format
@@ -8740,7 +8764,7 @@ msgstr ""
 "  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:7290
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "Błąd podczas uczenia.\n"
 
@@ -8815,7 +8839,7 @@ msgstr "Rodzaj MIME"
 #: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
 #: src/mimeview.c:1072
 msgid "View full information"
-msgstr "Wyświetl pełne informacje"
+msgstr "Zobacz pełne szczegóły"
 
 #: src/mimeview.c:1079
 msgid "Check again"
@@ -8863,9 +8887,9 @@ msgstr "Sprawdzanie podpisu..."
 msgid "Go back to email"
 msgstr "Powrót do wiadomości email"
 
-#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
-#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
-#: src/plugins/fancy/fancy_viewer.c:538
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nie można zapisać części wiadomości wieloczęściowej: %s"
@@ -8875,28 +8899,28 @@ msgstr "Nie można zapisać części wiadomości wieloczęściowej: %s"
 msgid "Overwrite existing file '%s'?"
 msgstr "Czy zastąpić istniejący plik '%s'?"
 
-#: src/mimeview.c:1839
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"An error has occurred while saving message part %d. Do you want to cancel "
+"saving or ignore error and continue?"
 msgstr ""
-"Błąd nastąpił podczas zapisu części wiadomości #%d. Czy chcesz anulować "
-"operacji czy pominąć błąd i kontynuować?"
-
-#: src/mimeview.c:1842
-msgid "Error saving all message parts"
-msgstr "Błąd zapisu wszystkich części wiadomości"
+"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
-msgid "Skip"
+msgid "Error saving message part"
+msgstr "Błąd zapisywania części wiadomości"
+
+#: src/mimeview.c:1844
+msgid "Ignore"
 msgstr "Pomiń"
 
-#: src/mimeview.c:1843
-msgid "Skip all"
+#: src/mimeview.c:1844
+msgid "Ignore all"
 msgstr "Pomiń wszystkie"
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1856
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8904,7 +8928,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:1861
+#: src/mimeview.c:1868
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8912,7 +8936,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:1866
+#: src/mimeview.c:1873
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8920,35 +8944,35 @@ 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:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Wybierz katalog docelowy"
 
-#: src/mimeview.c:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
 #: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Zapisz jako"
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
-msgstr "Otwórz z"
+msgstr "Otwórz w"
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
-"Wpisz nazwę programu, którym chcesz otworzyć ten plik:\n"
+"Wpisz nazwę programu do otworzenia pliku:\n"
 "('%s' zostanie zastąpione nazwą pliku)"
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8959,11 +8983,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Uruchomić niepewny plik binarny?"
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8975,20 +8999,20 @@ msgstr ""
 "\n"
 "Czy chcesz uruchomić ten plik?"
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Uruchom plik wykonywalny"
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Rodzaj:"
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9032,8 +9056,8 @@ msgstr "Błąd uwierzytelniania na serwerze %s:%d...\n"
 #: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
-"Claws Mail potrzebuje połączenia z siecią aby uzyskać dostęp do serwera"
-" źródła wieści."
+"Claws Mail potrzebuje połączenia z siecią aby uzyskać dostęp do serwera "
+"źródła wieści."
 
 #: src/news.c:875
 #, c-format
@@ -9074,12 +9098,10 @@ msgid ""
 "\n"
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
-"Masz zdefiniowane jedno lub więcej kont źródła wieści. Jednak ta wersja Claws"
-"  Mail "
-"została zbudowana bez obsługi źródeł wieści; Twoje konta NNTP zostały "
-"wyłączone.\n"
-"Prawdopodobnie potrzebujesz wgrać libetpan lub zbudować Claws "
-"Mail."
+"Masz zdefiniowane jedno lub więcej kont źródła wieści. Jednak ta wersja "
+"Claws  Mail została zbudowana bez obsługi źródeł wieści; Twoje konta NNTP "
+"zostały wyłączone.\n"
+"Prawdopodobnie potrzebujesz wgrać libetpan lub zbudować Claws Mail."
 
 #: src/news_gtk.c:56
 msgid "_Subscribe to newsgroup..."
@@ -9102,77 +9124,77 @@ msgstr "Przestań śledzić źródło wieści"
 msgid "Rename newsgroup folder"
 msgstr "Przemianuj katalog źródła wieści"
 
-#: src/oauth2.c:239
+#: src/oauth2.c:241
 msgid "OAuth2 missing authorization code\n"
 msgstr "Brakuje kodu uwierzytelniającego OAuth2\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 błąd połączenia\n"
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:257 src/oauth2.c:397
 msgid "OAuth2 TLS connection error\n"
 msgstr "Błąd połączenia TLS OAuth2\n"
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "Token dostępu OAuth2 został pobrany\n"
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "Token dostępu OAuth2 nie został pobrany\n"
 
-#: src/oauth2.c:355
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "Odświeżający token OAuth2 został pobrany\n"
 
-#: src/oauth2.c:357
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "Odświeżający token OAuth2 nie został pobrany\n"
 
-#: src/oauth2.c:489
+#: src/oauth2.c:479
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "Podano token odświeżający, zastępujący OAuth2\n"
 
-#: src/oauth2.c:491
+#: src/oauth2.c:481
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "Nie podano tokena odświeżającego, zastępującego OAuth2\n"
 
-#: src/oauth2.c:522
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "Błąd pisania do gniazda OAuth2\n"
 
-#: src/oauth2.c:544
+#: src/oauth2.c:534
 msgid "OAuth2 socket timeout error\n"
 msgstr "Błąd przekroczenia czasu oczekiwania dla gniazda OAuth2\n"
 
-#: src/oauth2.c:638
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "Token dostępu OAuth2 jest nadal aktualny\n"
 
-#: src/oauth2.c:645
+#: src/oauth2.c:635
 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:649
+#: src/oauth2.c:639
 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:666
+#: src/oauth2.c:656
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "Uaktualniono token dostępu i odświeżania OAuth2\n"
 
-#: src/oauth2.c:698
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth oryginalna cześć %s\n"
 
-#: src/oauth2.c:699
+#: src/oauth2.c:689
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth zakodowano: %s\n"
 
-#: src/oauth2.c:700
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9321,7 +9343,7 @@ msgstr " - Wyłączone: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:426
 msgid "Blink when user interaction is required"
-msgstr "Mrugaj jeśli wymagana jest interakcja użytkownika"
+msgstr "Zamigaj, gdy wymagane jest działanie użytkownika"
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:852
 msgid "This plugin handles various ACPI mail LEDs."
@@ -9422,9 +9444,8 @@ msgstr ""
 "\n"
 "Umożliwia ona wybranie katalogu, który chcesz archiwizować i potem wybrać "
 "nazwę, format i położenie archiwum. Podkatalogi mogą zawierać sumę "
-"sprawdzającą MD5 dla każdego pliku w archiwum. Dostępne jest także kilka"
-" ustawień "
-"archiwizowania.\n"
+"sprawdzającą MD5 dla każdego pliku w archiwum. Dostępne jest także kilka "
+"ustawień archiwizowania.\n"
 "\n"
 "Archiwum może być przechowywane jako:\n"
 "%s\n"
@@ -9437,8 +9458,8 @@ msgstr ""
 "\n"
 "Aby włączyć archiwizowanie przejdź do /Narzędzia/Stwórz Archiwum\n"
 "\n"
-"Domyślne ustawienia można nadać w /Ustawienia/Ustawienia/Wtyczki/"
-"Archiwizer Poczty"
+"Domyślne ustawienia można nadać w /Ustawienia/Ustawienia/Wtyczki/Archiwizer "
+"Poczty"
 
 #: src/plugins/archive/archiver.c:170
 msgid "Archiver"
@@ -9589,7 +9610,7 @@ msgstr "Rozmiar katalogu"
 
 #: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
-msgstr "Poziom kompresji"
+msgstr "Poziom spakowania"
 
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
@@ -9606,7 +9627,7 @@ msgstr "Tak"
 #: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
 #: src/prefs_summaries.c:407
 msgid "No"
-msgstr "Brak"
+msgstr "Nie"
 
 #: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
@@ -9672,7 +9693,7 @@ msgstr "Miejsce archiwum i jego nazwa"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Wybierz"
 
@@ -9717,7 +9738,7 @@ msgstr "Różne ustawienia"
 
 #: src/plugins/archive/archiver_gtk.c:1288
 msgid "_Recursive"
-msgstr "_Rekursywne"
+msgstr "_Wgłąb"
 
 #: src/plugins/archive/archiver_gtk.c:1292
 msgid "Choose this option to include subfolders in the archive"
@@ -9733,8 +9754,8 @@ msgid ""
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archive"
 msgstr ""
-"Zaznacz to pole, aby dodać sumę sprawdzającą MD5 do każdego pliku w"
-" archiwum.\n"
+"Zaznacz to pole, aby dodać sumę sprawdzającą MD5 do każdego pliku w "
+"archiwum.\n"
 "Bądź jednak świadomy, że może do znacznie zwiększyć czas jaki\n"
 "zajmie na stworzenie archiwum"
 
@@ -9780,8 +9801,7 @@ msgstr "Domyślny katalog zapisu"
 #: src/plugins/archive/archiver_prefs.c:228
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
-"Naciśnij ten przycisk, aby wybrać domyślne miejsce dla zapisywanych "
-"archiwów"
+"Naciśnij ten przycisk, aby wybrać domyślne miejsce dla zapisywanych archiwów"
 
 #: src/plugins/archive/archiver_prefs.c:237
 msgid "Default compression"
@@ -9833,8 +9853,8 @@ msgid ""
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archives"
 msgstr ""
-"Zaznacz to pole, aby domyślnie dodawać sumy sprawdzające MD5 do każdego pliku "
-"archiwum\n"
+"Zaznacz to pole, aby domyślnie dodawać sumy sprawdzające MD5 do każdego "
+"pliku archiwum\n"
 "Miej jednak na uwadze, że może to znacznie zwiększyć czas potrzebny\n"
 "na stworzenie archiwum"
 
@@ -9846,6 +9866,10 @@ msgstr "Zmień nazwę"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Wybierz tę opcję, aby usunąć wiadomości po archiwizacji"
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Nazwa pliku"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Usuń załącznik"
@@ -9925,9 +9949,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Załącznik jest wspomniany w wiadomości, którą wysyłasz, ale nie "
-"załączono żadnego pliku. Wspomniany wpis znajduje się w wierszu %d, który "
-"rozpoczyna się słowami: %s\n"
+"Załącznik jest wspomniany w wiadomości, którą wysyłasz, ale nie załączono "
+"żadnego pliku. Wspomniany wpis znajduje się w wierszu %d, który rozpoczyna "
+"się słowami: %s\n"
 "\n"
 "%s"
 
@@ -9951,15 +9975,15 @@ msgstr ""
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:52
 msgid "attach"
-msgstr "dołącz"
+msgstr "załącz"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:83
 msgid ""
 "Warn when one of the following regular expressions is matched (one per line)"
 msgstr ""
-"Ostrzeż, gdy jedno z następujących wyrażeń regularnych zostało dopasowane"
-" (jedno na wiersz)"
+"Ostrzeż, gdy jedno z następujących wyrażeń regularnych zostało dopasowane "
+"(jedno na wiersz)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:88
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:88
@@ -10068,8 +10092,8 @@ msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 msgstr ""
-"Wtyczka Bogofilter nie może odfiltrować wiadomości. Nie można uruchomić"
-" polecenia `%s %s %s`."
+"Wtyczka Bogofilter nie może odfiltrować wiadomości. Nie można uruchomić "
+"polecenia `%s %s %s`."
 
 #: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
@@ -10109,19 +10133,18 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
-"Wtyczka ta może rozpoznawać spam w wiadomościach z kont IMAP, LOCAL lub POP"
-" przy użyciu Bogofilter. Wtyczka ta do swojego działania wymaga wgranego"
-" Bogofilter.\n"
+"Wtyczka ta może rozpoznawać spam w wiadomościach z kont IMAP, LOCAL lub POP "
+"przy użyciu Bogofilter. Wtyczka ta do swojego działania wymaga wgranego "
+"Bogofilter.\n"
 "\n"
 "Zanim Bogofilter będzie mógł rozpoznawać spam, musisz go wyćwiczyć poprzez "
-"zaznaczenie kilkuset wiadomości dobrych i niechcianych (spamu), używając menu "
-"\"/Oznacz/Oznacz jako spam\" i \"/Oznacz/Oznacz jako ham\".\n"
+"zaznaczenie kilkuset wiadomości dobrych i niechcianych (spamu), używając "
+"menu \"/Oznacz/Oznacz jako spam\" i \"/Oznacz/Oznacz jako ham\".\n"
 "\n"
-"Gdy wiadomość zostanie rozpoznana jako spam, to może zostać usunięta lub"
-" zapisana w szczególnie do tego przeznaczonym katalogu.\n"
+"Gdy wiadomość zostanie rozpoznana jako spam, to może zostać usunięta lub "
+"zapisana w szczególnie do tego przeznaczonym katalogu.\n"
 "\n"
-"Ustawienia wtyczki znajdują się w /Ustawienia/Ustawienia/Wtyczki/"
-"Bogofilter"
+"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
@@ -10153,7 +10176,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:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
 msgid "KiB"
 msgstr "KiB"
 
@@ -10290,8 +10313,8 @@ msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
-"Wtyczka Bsfilter nie może odfiltrować wiadomości. Nie można uruchomić"
-" polecenia `%s`."
+"Wtyczka Bsfilter nie może odfiltrować wiadomości. Nie można uruchomić "
+"polecenia `%s`."
 
 #: src/plugins/bsfilter/bsfilter.c:474
 msgid "Bsfilter: learning from message..."
@@ -10312,19 +10335,18 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
-"Wtyczka ta może rozpoznawać spam w wiadomościach z kont IMAP, LOCAL lub POP"
-" przy użyciu Bsfilter. Wtyczka ta do swojego działania wymaga wgranego"
-" Bsfilter.\n"
+"Wtyczka ta może rozpoznawać spam w wiadomościach z kont IMAP, LOCAL lub POP "
+"przy użyciu Bsfilter. Wtyczka ta do swojego działania wymaga wgranego "
+"Bsfilter.\n"
 "\n"
 "Zanim Bsfilter będzie mógł rozpoznawać spam, musisz go wyćwiczyć poprzez "
-"zaznaczenie kilkuset wiadomości dobrych i niechcianych (spamu), używając menu "
-"\"/Oznacz/Oznacz jako spam\" i \"/Oznacz/Oznacz jako ham\".\n"
+"zaznaczenie kilkuset wiadomości dobrych i niechcianych (spamu), używając "
+"menu \"/Oznacz/Oznacz jako spam\" i \"/Oznacz/Oznacz jako ham\".\n"
 "\n"
-"Gdy wiadomość zostanie rozpoznana jako spam, to może zostać usunięta lub"
-" zapisana w szczególnie do tego przeznaczonym katalogu.\n"
+"Gdy wiadomość zostanie rozpoznana jako spam, to może zostać usunięta lub "
+"zapisana w szczególnie do tego przeznaczonym katalogu.\n"
 "\n"
-"Ustawienia wtyczki znajdują się w /Ustawienia/Ustawienia/Wtyczki/"
-"Bsfilter"
+"Ustawienia wtyczki znajdują się w /Ustawienia/Ustawienia/Wtyczki/Bsfilter"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:170
 #: src/plugins/spamassassin/spamassassin_gtk.c:419
@@ -10441,13 +10463,13 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
-"Ta wtyczka używa programu Anty-Wirusowego Clam do skanowania wszystkich "
-"wiadomości odbieranych poprzez konta IMAP, LOCAL oraz POP.\n"
+"Ta wtyczka używa programu Antywirusowego Clam do przeszukiwania wszystkich "
+"wiadomości pobieranych z kont IMAP, LOCAL oraz POP.\n"
 "\n"
-"Kiedy załącznik wiadomości zawiera wirusa może on zostać usunięty lub "
-"zapisany w specjalnie wyznaczonym 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 komunikuje się z clamd za pomocą\n"
+"Ponieważ ta wtyczka porozumiewa się z clamd za pomocą\n"
 "gniazd dlatego są wymagane minimalne uprawnienia do\n"
 "katalogu Domowego oraz katalogu .claws-mail zakładając,\n"
 "że usługa clamav została ustawiona na porozumiewanie się \n"
@@ -10540,7 +10562,7 @@ msgstr "Sprawdź prawa dostępu do katalogu i popraw jeśli będzie trzeba"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:348
 msgid "Find and _Replace"
-msgstr "Znajdź i _zastąp"
+msgstr "Poszukaj i _zastąp"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
@@ -10553,8 +10575,8 @@ msgstr "Gospodarz zdalny"
 #: src/plugins/clamd/clamav_plugin_gtk.c:368
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr ""
-"Nazwa gospodarza lub adres IP gospodarza zdalnego, na którym działa usługa"
-" clamav"
+"Nazwa gospodarza lub adres IP gospodarza zdalnego, na którym działa usługa "
+"clamav"
 
 #: src/plugins/clamd/clamav_plugin_gtk.c:387
 msgid "Port number where clamav daemon is listening"
@@ -10679,14 +10701,14 @@ msgid "Render embedded objects using plugins"
 msgstr "Renderuj zagnieżdżone obiekty używając wtyczek"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
-msgstr "Otwórz w przeglądarce (treść zdalna jest włączona)"
+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
 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:4254
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
 #: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Pośrednik"
@@ -10713,8 +10735,8 @@ msgid ""
 "in the email."
 msgstr ""
 "Wczytywanie zdalnych zasoby może zagrozić prywatności.\n"
-"Gdy wczytywanie zdalnej zawartość jest wyłączone, nic nie może zostać"
-" pobrane\n"
+"Gdy wczytywanie zdalnej zawartość jest wyłączone, nic nie może zostać "
+"pobrane\n"
 "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."
 
@@ -10728,8 +10750,8 @@ msgid "When clicking on a link, by default"
 msgstr "Przy kliknięciu na odnośnik, domyślnie"
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
-msgstr "Otwórz w przeglądarce zewnętrznej"
+msgid "Open in External Browser"
+msgstr "Otwórz w zewnętrznej przeglądarce"
 
 #: src/plugins/fancy/fancy_prefs.c:300
 msgid "The CSS in this file will be applied to all HTML parts"
@@ -10738,7 +10760,7 @@ 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:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Prze_glądaj"
@@ -10747,86 +10769,86 @@ msgstr "Prze_glądaj"
 msgid "Select stylesheet"
 msgstr "Wybierz arkusz stylów"
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "Wyłączono wczytywanie zdalnej zawartości."
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Wczytaj obrazy"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Włącz zdalną zawartość"
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Włącz Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Włącz Wtyczki"
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Włącz Javę"
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Otwórz odnośniki w zewnętrznej przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Wystąpił błąd: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:853
 #, 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:874
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Otwórz w przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Otwórz w przeglądarce"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Otwórz obraz"
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Skopiuj odnośnik"
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Odnośnik Pobierania"
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Zapisz obraz Jako"
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Skopiuj obraz"
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Zaimportuj kanał"
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Przeglądarka HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10834,9 +10856,8 @@ msgid ""
 "Configuration/Preferences/Plugins/Fancy"
 msgstr ""
 "Ta wtyczka wyświetla wiadomości HTML używając biblioteki WebKit %d.%d.%d.\n"
-"Domyślnie wszystkie zdalne zawartości są blokowane. Ustawienia można znaleźć"
-" w /"
-"Ustawienia/Ustawienia/Wtyczki/Fancy"
+"Domyślnie wszystkie zdalne zawartości są blokowane. Ustawienia można znaleźć "
+"w /Ustawienia/Ustawienia/Wtyczki/Fancy"
 
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:160
 #: src/plugins/fetchinfo/fetchinfo_plugin.c:193
@@ -10862,8 +10883,9 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
 "Ta wtyczka zmienia pobrane wiadomości. Dodaje nagłówki zawierające "
-"informacje takie jak: UIDL, konto Claws Mail, serwer POP, ID użytkownika "
-"oraz czas odbioru.\n"
+"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"
 
@@ -10945,9 +10967,9 @@ msgstr ""
 "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."
+"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:"
@@ -11030,9 +11052,8 @@ msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
-"Wtyczka GData: Nie otrzymano kodu uwierzytelniającego, zapytanie"
-" uwierzytelniające "
-"anulowane\n"
+"Wtyczka GData: Nie otrzymano kodu uwierzytelniającego, zapytanie "
+"uwierzytelniające anulowane\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:496
 msgid ""
@@ -11064,7 +11085,7 @@ 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:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
@@ -11127,8 +11148,8 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"W wiadomości, którą próbujesz wysłać znajduje się słowo kluczowe. Słowo to"
-" znajduje się w wierszu %d, który zaczyna się tekstem: %s\n"
+"W wiadomości, którą próbujesz wysłać znajduje się słowo kluczowe. Słowo to "
+"znajduje się w wierszu %d, który zaczyna się tekstem: %s\n"
 "\n"
 "%s"
 
@@ -11147,8 +11168,8 @@ 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 ""
-"Pokazuje ostrzeżenie przy wysyłaniu lub umieszczaniu wiadomości w kolejce i"
-" gdy w jej treści znajdzie się jedno lub więcej słów kluczowych."
+"Pokazuje ostrzeżenie przy wysyłaniu lub umieszczaniu wiadomości w kolejce i "
+"gdy w jej treści znajdzie się jedno lub więcej słów kluczowych."
 
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:138
 msgid "Don't check for keywords when forwarding or redirecting messages"
@@ -11201,8 +11222,8 @@ msgstr ""
 "Strona ustawień wtyczki jest dostępna z głównej strona poprzez:\n"
 "/Ustawienia/Ustawienia/Wtyczki/Libravatar.\n"
 "\n"
-"Ta wtyczka używa libcurl do pobierania obrazów, więc jeśli używasz"
-" pośrednika\n"
+"Ta wtyczka używa libcurl do pobierania obrazów, więc jeśli używasz "
+"pośrednika\n"
 "proszę zobacz szczegóły ustawień 'http_proxy na stronie dokumentacji\n"
 " mam curl(1). Więcej szczegółów na ten temat i nie tylko znajdziesz w pliku "
 "README.\n"
@@ -11285,8 +11306,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:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "godzin"
 
@@ -11400,9 +11421,8 @@ msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
-"Ustaw 0 dla globalnego czasu oczekiwania WE/WY gniazda. Graniczna wartość"
-" musi "
-"być także mniejsza od globalnego czasu oczekiwania WE/WY gniazda."
+"Ustaw 0 dla globalnego czasu oczekiwania WE/WY gniazda. Graniczna wartość "
+"musi być także mniejsza od globalnego czasu oczekiwania WE/WY gniazda."
 
 #: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
@@ -11476,15 +11496,6 @@ msgstr ""
 "Jeśli podasz istniejącą skrzynkę, zostanie ona\n"
 "samoczynnie przeszukana."
 
-#: src/plugins/mailmbox/plugin_gtk.c:332
-#, 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ąć?"
-
 #: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Brak dostępnych metod uwierzytelniania Sieve\n"
@@ -11675,7 +11686,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:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Szczegóły serwera"
 
@@ -11686,7 +11697,8 @@ msgstr "Nazwa serwera"
 #: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
-"Połącz do tego gospodarza zamiast do gospodarza używanego do pobierania poczty"
+"Połącz do tego gospodarza zamiast do gospodarza używanego do pobierania "
+"poczty"
 
 #: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
@@ -11727,27 +11739,27 @@ 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:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:382
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:134
+#: 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
 msgid "Password"
 msgstr "Hasło"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: 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
 msgid "Automatic"
 msgstr "Sam wykryj"
@@ -11764,20 +11776,20 @@ msgstr "Nie wpisano serwera Sieve."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Nie powiodła się rejestracja funkcji newmail"
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Nie można było otworzyć pliku dziennika %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11794,7 +11806,7 @@ msgstr ""
 "\n"
 "Bieżący dziennik to %s"
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Plik dziennika"
 
@@ -11808,7 +11820,7 @@ msgstr "Wybierz katalog(i)"
 
 #: src/plugins/notification/notification_foldercheck.c:581
 msgid "select recursively"
-msgstr "wybierz rekursywnie"
+msgstr "wybierz wgłąb"
 
 #: src/plugins/notification/notification_lcdproc.c:155
 msgid "No new messages"
@@ -11881,10 +11893,9 @@ msgid ""
 "\n"
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
-"Wtyczka ta powiadamia użytkownika o nowych i nieprzeczytanych wiadomościach"
-" na różne sposoby.\n"
-"Wtyczkę tę można dostosować w oknie ustawień"
-"w dziale wtyczki.\n"
+"Wtyczka ta powiadamia użytkownika o nowych i nieprzeczytanych wiadomościach "
+"na różne sposoby.\n"
+"Wtyczkę tę można dostosować w oknie ustawień w dziale wtyczki.\n"
 "\n"
 "Wrażenia i uwagi na adres <berndth at gmx.de> będą mile widziane."
 
@@ -12050,8 +12061,8 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:681
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
-"Powiadom zarządzanie oknami o pilności, gdy pojawią się nieprzeczytane"
-" wiadomości"
+"Powiadom zarządzanie oknami o pilności, gdy pojawią się nieprzeczytane "
+"wiadomości"
 
 #: src/plugins/notification/notification_prefs.c:691
 msgid "Use sound theme"
@@ -12062,7 +12073,7 @@ msgid "Show banner"
 msgstr "Pokaż baner"
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nigdy"
@@ -12161,7 +12172,7 @@ msgstr "Włącz okna wysuwne"
 #: src/plugins/notification/notification_prefs.c:1054
 #: src/plugins/notification/notification_prefs.c:1652
 msgid "Popup timeout"
-msgstr "Czas trwania okna wysuwnego"
+msgstr "Czas pokazywania okna wysuwnego"
 
 #: src/plugins/notification/notification_prefs.c:1093
 msgid "Make popup sticky"
@@ -12210,7 +12221,7 @@ msgstr "Włącz LCD"
 
 #: src/plugins/notification/notification_prefs.c:1471
 msgid "Hostname:Port of LCDd server"
-msgstr "Nazwa_gospodarza:Port dla serwera LCDd"
+msgstr "Gospodarz:Port serwera LCDd"
 
 #: src/plugins/notification/notification_prefs.c:1556
 msgid "Enable Trayicon"
@@ -12222,7 +12233,7 @@ msgstr "Ukryj zaraz po uruchomieniu"
 
 #: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
-msgstr "Zamknięcie minimalizuje do ikonki"
+msgstr "Zamknięcie umieszcza w zasobniku systemowym"
 
 #: src/plugins/notification/notification_prefs.c:1588
 msgid "Hide when iconified"
@@ -12253,7 +12264,7 @@ msgstr "Włącz globalne skróty klawiszowe"
 #: src/plugins/notification/notification_prefs.c:1870
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
-msgstr "Przykłady skrótów klawiszowych obejmują <b>%s</b> i <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
 msgid "<control><shift>F11"
@@ -12409,68 +12420,68 @@ msgstr "z %d"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Nie udało się utworzyć PDF z nieznanych powodów."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Indeks Dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "Pierwsza Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Poprzednia Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Następna Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Ostatnia Strona"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Powiększ"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Pomniejsz"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Dopasuj do Strony"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Dopasuj do Szerokości Strony"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Obróć w Lewo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Obróć w Prawo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Wydrukuj dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Szczegóły dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Numer Strony"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Współczynnik Powiększenia"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12483,13 +12494,13 @@ msgstr ""
 "\n"
 "Jakiekolwiek opinie i sugestie mile widziane: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "Przeglądarka PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12498,11 +12509,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Uwaga: nie znaleziono pliku wykonywalnego ghostscript (gs) który jest"
-" wymagany "
-"przez wtyczkę %s aby przetworzyć załącznik PostScript, tylko załączniki PDF "
-"będą wyświetlane. Aby włączyć obsługę PostScript wgraj program "
-"gs.\n"
+"Uwaga: nie znaleziono pliku wykonywalnego ghostscript (gs) który jest "
+"wymagany przez wtyczkę %s aby przetworzyć załącznik PostScript, tylko "
+"załączniki PDF będą wyświetlane. Aby włączyć obsługę PostScript wgraj "
+"program gs.\n"
 "\n"
 "%s"
 
@@ -12550,8 +12560,8 @@ msgstr "Import klucza"
 msgid ""
 "This key is not in your keyring. Do you want Claws Mail to try to import it?"
 msgstr ""
-"Ten klucz jest w twoim pęku kluczy. Czy chcesz aby Claws Mail spróbował go"
-" zaimportować?"
+"Ten klucz jest w twoim pęku kluczy. Czy chcesz aby Claws Mail spróbował go "
+"zaimportować?"
 
 #: src/plugins/pgpcore/pgp_viewer.c:182
 msgid "from keyserver"
@@ -12643,12 +12653,12 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Wtyczka ta obsługuje działania PGP jądra i daje możliwość uzupełniania"
-" adresów z pęku kluczy GPG. Jest ona używana przez inne wtyczki, takie jak"
-" PGP/Mime.\n"
+"Wtyczka ta obsługuje działania PGP jądra i daje możliwość uzupełniania "
+"adresów z pęku kluczy GPG. Jest ona używana przez inne wtyczki, takie jak "
+"PGP/Mime.\n"
 "\n"
-"Ustawienia znajdują się w /Ustawienia/Ustawienia/Wtyczki/GPG a także"
-" /Ustawienia/Dostosuj bieżące konto.../Wtyczki/GPG\n"
+"Ustawienia znajdują się w /Ustawienia/Ustawienia/Wtyczki/GPG a także /"
+"Ustawienia/Dostosuj bieżące konto.../Wtyczki/GPG\n"
 "\n"
 "Wtyczka ta uzyskuje dostęp do GnuPG poprzez bibliotekę GPGME.\n"
 "\n"
@@ -12685,8 +12695,8 @@ msgstr ""
 "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:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
+#: src/prefs_account.c:2162 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut"
 
@@ -12724,7 +12734,7 @@ msgstr "Użyj domyślnego klucza GnuPG"
 
 #: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
-msgstr "Wybierz klucz poprzez twój adres e-mail"
+msgstr "Wybierz klucz po twoim adresie pocztowym"
 
 #: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
@@ -12751,64 +12761,64 @@ msgstr "GPG"
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "Nie znaleziono '%s', wybierz klucz."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Zbieranie informacji dla \"%s\" ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Nieokreślone"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Marginalne"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Nieograniczone"
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Wybierz klucze"
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "ID klucza"
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Zaufany klucz"
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Inne"
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "B_rak szyfrowania"
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Dodaj klucz"
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Wpisz innego użytkownika lub ID klucza:"
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Zaszyfruj do %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -13211,14 +13221,14 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Wtyczka ta obsługuje przestarzały sposób podpisywania i/lub szyfrowania"
-" wiadomości w ich treści. Dzięki niej dostajesz możliwość odszyfrowywania"
-" wiadomości, potwierdzania podpisów, a także podpisywania i szyfrowania"
-" własnych wiadomości.\n"
+"Wtyczka ta obsługuje przestarzały sposób podpisywania i/lub szyfrowania "
+"wiadomości w ich treści. Dzięki niej dostajesz możliwość odszyfrowywania "
+"wiadomości, potwierdzania podpisów, a także podpisywania i szyfrowania "
+"własnych wiadomości.\n"
 "\n"
-"Można ją wybrać jako Domyślny System Ochrony Prywatności w"
-" /Ustawienia/Dostosuj bieżące konto.../Prywatność, a także podczas tworzenia"
-" wiadomości z /Ustawienia/Ochrona Prywatności\n"
+"Można ją wybrać jako Domyślny System Ochrony Prywatności w /Ustawienia/"
+"Dostosuj bieżące konto.../Prywatność, a także podczas tworzenia wiadomości "
+"z /Ustawienia/Ochrona Prywatności\n"
 "\n"
 "Wtyczka ta uzyskuje dostęp do GnuPG poprzez bibliotekę GPGME.\n"
 "\n"
@@ -13270,13 +13280,13 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Wtyczka ta obsługuje wiadomości podpisane i/lub zaszyfrowane PGP/MIME. Dzięki"
-" niej dostajesz możliwość odszyfrowywania wiadomości, potwierdzania podpisów,"
-" a także podpisywania i szyfrowania własnych wiadomości.\n"
+"Wtyczka ta obsługuje wiadomości podpisane i/lub zaszyfrowane PGP/MIME. "
+"Dzięki niej dostajesz możliwość odszyfrowywania wiadomości, potwierdzania "
+"podpisów, a także podpisywania i szyfrowania własnych wiadomości.\n"
 "\n"
-"Można ją wybrać jako Domyślny System Ochrony Prywatności w"
-" /Ustawienia/Dostosuj bieżące konto.../Prywatność, a także podczas tworzenia"
-" wiadomości z /Ustawienia/Ochrona Prywatności\n"
+"Można ją wybrać jako Domyślny System Ochrony Prywatności w /Ustawienia/"
+"Dostosuj bieżące konto.../Prywatność, a także podczas tworzenia wiadomości "
+"z /Ustawienia/Ochrona Prywatności\n"
 "\n"
 "Wtyczka ta uzyskuje dostęp do GnuPG poprzez bibliotekę GPGME.\n"
 "\n"
@@ -13296,8 +13306,8 @@ msgstr "Pokaż konsolę Pythona..."
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Przeglądaj"
@@ -13310,7 +13320,7 @@ msgstr "Python"
 #: src/plugins/python/python_plugin.c:644
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
-"Niepowiodła się rejestracja funkcji \"compose create hook\" we wtycze Python"
+"Nie powiodła się rejestracja funkcji \"compose create hook\" we wtycze Python"
 
 #: src/plugins/python/python_plugin.c:727
 msgid ""
@@ -13363,8 +13373,8 @@ msgstr ""
 "w Narzędzia -> Pokaż konsole Pythona lub zapisany w skryptach.\n"
 "\n"
 "Te skrypty są dostępne w menu. Możesz im przypisać skróty klawiszowe jak "
-"każde inne elementy menu. Możesz także dodać przyciski dla skryptów "
-"używając wbudowanego edytora paska narzędzi Claws Mail.\n"
+"każde inne elementy menu. Możesz także dodać przyciski dla skryptów używając "
+"wbudowanego edytora paska narzędzi Claws Mail.\n"
 "\n"
 "Możesz udostępnić skrypty dla głównego okna, umieszczając jest w katalogu ~/."
 "claws-mail/python-scripts/main.\n"
@@ -13423,7 +13433,7 @@ msgstr "RSSyl: Nie można otworzyć starego pliku OPML '%s' %s\n"
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
-"RSSyl: Nie można otworzyć pliku '%s' w cely przeglądania listy kanałów: %s\n"
+"RSSyl: Nie można otworzyć pliku '%s' w celu przeglądania listy kanałów: %s\n"
 
 #: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
@@ -13482,18 +13492,6 @@ msgstr "Wpisz adres URL kanału, który chcesz zacząć śledzić:"
 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:190
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be permanently deleted.\n"
-"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ąć?"
-
 #: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
@@ -13587,7 +13585,7 @@ msgstr "Zawsze oznaczaj jako nowe"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:336
 msgid "Only mark it as new if its text has changed"
-msgstr "Tylko oznaczaj jako nowy gdy tekst się zmienił"
+msgstr "Oznacz jako nową, tylko gdy tekst uległ zmianie"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Never mark it as new"
@@ -13606,7 +13604,7 @@ msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
-"Włącz to aby zachować bierzącą nazwę katalogu, nawet gdy autor zmieni tytuł "
+"Włącz to aby zachować bieżącą nazwę katalogu, nawet gdy autor zmieni tytuł "
 "kanału."
 
 #: src/plugins/rssyl/rssyl_feed_props.c:359
@@ -13628,7 +13626,7 @@ msgstr "Pobierz komentarze do postów, które są młodsze niż"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dni"
 
@@ -13638,7 +13636,7 @@ msgstr "Ustaw -1 aby pobrać wszystkie komentarze"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:438
 msgid "If an item changes"
-msgstr "Gdy wpis się zmienił"
+msgstr "Gdy wpis ulegnie zmianie"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:443
 msgid "Items"
@@ -13646,11 +13644,11 @@ msgstr "Wpisy"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Refresh interval"
-msgstr "Odstęp czasu między odświeżeniami"
+msgstr "Okres odświeżania"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:464
 msgid "Set to 0 to disable automatic refreshing for this feed"
-msgstr "Ustaw na 0 żeby wyłączyć automatyczne odświeżanie tego kanału"
+msgstr "Ustaw na 0 żeby wyłączyć okresowe odświeżanie tego kanału"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "Set feed properties"
@@ -13662,15 +13660,15 @@ msgstr "_Odśwież kanał"
 
 #: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Feed pr_operties"
-msgstr "_Właściwości kanału..."
+msgstr "Właściw_ości kanału"
 
 #: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Rena_me..."
-msgstr "_Zmień nazwę..."
+msgstr "Prze_mianuj..."
 
 #: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "R_efresh recursively"
-msgstr "Szukaj rekursywnie"
+msgstr "Poszuk_aj wgłąb"
 
 #: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Subscribe _new feed..."
@@ -13774,7 +13772,7 @@ msgid "Updating comments for '%s'..."
 msgstr "Uaktualnianie uwag dla %s ..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1628
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Wymagane uwierzytelnienie)"
 
@@ -13783,7 +13781,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Nieautoryzowany)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Nie znaleziono)"
 
@@ -13840,7 +13838,7 @@ msgstr ""
 "Nie można przetworzyć kanał z\n"
 "<b>%s</b>\n"
 "\n"
-"Prosze skontaktuj się z programistami, to nie powinno się wydarzyć."
+"Proszę skontaktuj się z programistami, to nie powinno się wydarzyć."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:356
 msgid "Claws Mail needs network access in order to update your feeds."
@@ -13851,8 +13849,9 @@ msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
-"Problem wewnętrzny podczas upgrad'u formatu zapisu. To nie powinno się "
-"wydarzyć. Prosze zgłoś to, wraz z dołączonym outputem debugowania.\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 ""
@@ -13873,21 +13872,20 @@ msgid ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
-"Wtyczka ta obsługuje wiadomości podpisane i/lub zaszyfrowane S/MIME. Dzięki"
-" niej dostajesz możliwość odszyfrowywania wiadomości, potwierdzania podpisów,"
-" a także podpisywania i szyfrowania własnych wiadomości.\n"
+"Wtyczka ta obsługuje wiadomości podpisane i/lub zaszyfrowane S/MIME. Dzięki "
+"niej dostajesz możliwość odszyfrowywania wiadomości, potwierdzania podpisów, "
+"a także podpisywania i szyfrowania własnych wiadomości.\n"
 "\n"
-"Można ją wybrać jako Domyślny System Ochrony Prywatności w"
-" /Ustawienia/Dostosuj bieżące konto.../Prywatność, a także podczas tworzenia"
-" wiadomości z /Ustawienia/Ochrona Prywatności\n"
+"Można ją wybrać jako Domyślny System Ochrony Prywatności w /Ustawienia/"
+"Dostosuj bieżące konto.../Prywatność, a także podczas tworzenia wiadomości "
+"z /Ustawienia/Ochrona Prywatności\n"
 "\n"
 "Wtyczka ta uzyskuje dostęp do GnuPG poprzez bibliotekę GPGME.\n"
-"Wtyczka ta wymaga wymaga wgrania gpgsm, gnupg-agent i dirmngr "
-"i ich poprawnego ustawienia\n"
+"Wtyczka ta wymaga wymaga wgrania gpgsm, gnupg-agent i dirmngr i ich "
+"poprawnego ustawienia\n"
 "\n"
 "Odwiedź http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
-"aby dowiedzieć się jak sprawić, żeby certyfikaty S/MIME zadziałały z GPGSM."
-"\n"
+"aby dowiedzieć się jak sprawić, żeby certyfikaty S/MIME zadziałały z GPGSM.\n"
 "Do GPGME prawa autorskie ma Werner Koch <dd9jn at gnu.org>"
 
 #: src/plugins/smime/smime.c:567
@@ -13913,7 +13911,7 @@ msgid ""
 "MIME system."
 msgstr ""
 "Pamiętaj, że nagłówki wiadomości (np. Temat) nie są szyfrowane w systemie S/"
-"Mime"
+"MIME"
 
 #: src/plugins/spam_report/spam_report.c:312
 msgid "Reporting spam..."
@@ -13989,9 +13987,9 @@ msgid ""
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
-"Wtyczce SpamAssassin nie udało się przefiltrować tej wiadomości."
-" Prawdopodobnie z powodu nieosiągalności usługi spamd. Upewnij się, "
-"że spamd jest uruchomiony i osiągalny."
+"Wtyczce SpamAssassin nie udało się przefiltrować tej wiadomości. "
+"Prawdopodobnie z powodu nieosiągalności usługi spamd. Upewnij się, że spamd "
+"jest uruchomiony i osiągalny."
 
 #: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
@@ -14022,17 +14020,16 @@ msgid ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
-"Wtyczka ta może rozpoznawać spam w wiadomościach z kont IMAP, LOCAL lub POP"
-" przy użyciu serwera SpamAssassin. Wtyczka ta do swojego działania wymaga"
-" uruchomionego serwera SpamAssassin (spamd).\n"
+"Wtyczka ta może rozpoznawać spam w wiadomościach z kont IMAP, LOCAL lub POP "
+"przy użyciu serwera SpamAssassin. Wtyczka ta do swojego działania wymaga "
+"uruchomionego serwera SpamAssassin (spamd).\n"
 "\n"
 "Wtyczki tej można użyć do oznaczania wiadomości jako Ham lub Spam.\n"
 "\n"
-"Gdy wiadomość zostanie rozpoznana jako spam, to może zostać usunięta lub"
-" zapisana w szczególnie do tego przeznaczonym katalogu.\n"
+"Gdy wiadomość zostanie rozpoznana jako spam, to może zostać usunięta lub "
+"zapisana w szczególnie do tego przeznaczonym katalogu.\n"
 "\n"
-"Ustawienia wtyczki znajdują się w /Ustawienia/Ustawienia/Wtyczki/"
-"SpamAssassin"
+"Ustawienia wtyczki znajdują się w /Ustawienia/Ustawienia/Wtyczki/SpamAssassin"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
@@ -14099,8 +14096,8 @@ msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr ""
-"Dopuszczalny czas przeznaczony na sprawdzanie. Po jego upływie sprawdzanie"
-" zostanie przerwane."
+"Dopuszczalny czas przeznaczony na sprawdzanie. Po jego upływie sprawdzanie "
+"zostanie przerwane."
 
 #: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
@@ -14281,18 +14278,16 @@ msgstr ""
 "Ta wtyczka umożliwia używanie wiadomości vCalendar utworzonych przez program "
 "Evolution lub Outlook.\n"
 "\n"
-"Gdy zostanie wczytana utworzy skrzynkę vCalendar na spisie katalogów, "
-"która zawierać będzie spotkania przyjęte lub stworzone przez ciebie.\n"
+"Gdy zostanie wczytana utworzy skrzynkę vCalendar na spisie katalogów, która "
+"zawierać będzie spotkania przyjęte lub stworzone przez ciebie.\n"
 "Przysłane Formularze spotkań zostaną przedstawione w odpowiedniej postaci i "
 "będziesz mógł je przyjąć lub odrzucić.\n"
-"Aby utworzyć spotkanie , naciśnij prawym klawiszem myszy na katalogu"
-" vCalendar "
-"i wybierz \"Nowe spotkanie...\".\n"
+"Aby utworzyć spotkanie , naciśnij prawym klawiszem myszy na katalogu "
+"vCalendar i wybierz \"Nowe spotkanie...\".\n"
 "\n"
-"Będziesz miał również możliwość rozpoczęcia śledzenia kanałów Webcal,"
-" eksportowania "
-"twoich spotkań lub twoich kalendarzy, ogłaszania twojej dostępności"
-" wolny/zajęty i pobierania takiej dostępności od innych."
+"Będziesz miał również możliwość rozpoczęcia śledzenia kanałów Webcal, "
+"eksportowania twoich spotkań lub twoich kalendarzy, ogłaszania twojej "
+"dostępności wolny/zajęty i pobierania takiej dostępności od innych."
 
 #: src/plugins/vcalendar/plugin.c:106
 msgid "Calendar"
@@ -14307,8 +14302,7 @@ msgstr "Utwórz spotkanie z wiadomości..."
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr ""
-"Zamierzasz utworzyć %d spotkań, jedno po drugim. Na pewno chcesz "
-"kontynuować?"
+"Zamierzasz utworzyć %d spotkań, jedno po drugim. Na pewno chcesz kontynuować?"
 
 #: src/plugins/vcalendar/vcalendar.c:137
 msgid "Creating meeting..."
@@ -14431,7 +14425,7 @@ msgstr "Odwołaj spotkanie..."
 
 #: src/plugins/vcalendar/vcalendar.c:1195
 msgid "Launch website"
-msgstr "Uruchom Stronę"
+msgstr "Otwórz stronę sieciową"
 
 #: src/plugins/vcalendar/vcalendar.c:1199
 msgid "You are already busy at this time."
@@ -14452,7 +14446,7 @@ msgstr "Organizator:"
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1611
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1621
 msgid "Location:"
-msgstr "Położenie:"
+msgstr "Miejsce:"
 
 #: src/plugins/vcalendar/vcalendar.c:1241
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
@@ -14462,11 +14456,11 @@ msgstr "Podsumowanie:"
 
 #: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Starting:"
-msgstr "Początek:"
+msgstr "Rozpoczęcie:"
 
 #: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Ending:"
-msgstr "Koniec:"
+msgstr "Zakończenie:"
 
 #: src/plugins/vcalendar/vcalendar.c:1245
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
@@ -14476,65 +14470,65 @@ msgstr "Uczestnicy:"
 
 #: src/plugins/vcalendar/vcalendar.c:1247
 msgid "Action:"
-msgstr "Akcja:"
+msgstr "Działanie:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nowe spotkanie"
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "Wy_eksportuj kalendarz..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "Zacznij śledzić Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
-msgstr "_Zmień nazwę..."
+msgstr "P_rzemianuj..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Uaktualnij śledzone"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
-msgstr "Widok _Listy"
+msgstr "Widok _listy"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Widok tygodni"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "Widok _miesięcy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Spotkania"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "w przeszłości"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "dzisiaj"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "jutro"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "w tym tygodniu"
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "później"
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14543,21 +14537,21 @@ msgstr ""
 "\n"
 "Te spotkania są zaplanowane %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, 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:1631
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Nieautoryzowany)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Błąd: %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14570,7 +14564,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14581,47 +14575,47 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nie można utworzyć katalogu %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1918
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1929
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Pobieranie kalendarza dla %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "nowy śledzony"
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1939
 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:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Zacznij śledzić Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Wpisz adres URL WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "Błędny adres URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Czy na pewno chcesz przestać śledzić?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Przestań śledzić"
 
@@ -14875,8 +14869,8 @@ msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr ""
-"Wygląda na to, że wszyscy są dostępni, ale nie udało się ściągnąć wszystkich"
-" stanów wolny/zajęty."
+"Wygląda na to, że wszyscy są dostępni, ale nie udało się ściągnąć wszystkich "
+"stanów wolny/zajęty."
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1315
 msgid ""
@@ -15098,95 +15092,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:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "Błąd protokołu POP\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "niewłaściwa odpowiedź UIDL: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Usuwanie przeterminowanych wiadomości %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, 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:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "skrzynka zablokowana\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Upłynął czas oczekiwania na sesję\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "nieobsługiwane polecenie\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "wystąpił błąd podczas sesji POP\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "polecenie TOP nie jest obsługiwana\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "Wieści (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
-msgstr "Lokalny plik mbox"
+msgstr "Plik miejscowej skrzynki mbox"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Żaden (tylko SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Nazwa konta"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Ustaw jako konto domyślne"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Dane osobowe"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
-msgstr "Pełna nazwa"
+msgstr "Imię i nazwisko"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
-msgstr "Adres e-mail"
+msgstr "Adres pocztowy"
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Sam ustaw"
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15194,176 +15188,177 @@ msgstr ""
 "Ostrzeżenie: ta wersja Claws Mail\n"
 "została zbudowana bez obsługi IMAP oraz News."
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga uwierzytelniania"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Uwierzytelnij przy połączeniu"
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Serwer wieści"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Serwer do pobierania"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Lokalny mailbox"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (do wysyłania)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Użyj polecenia mail zamiast serwera SMTP"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "polecenia do wysyłania poczty"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Lokalny"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Domyślna skrzynka poczty przychodzącej"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Niefiltrowane wiadomości będą przetrzymywane w tym katalogu"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "Uwierzytelnij przed połączeniem POP"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Po odebraniu usuń wiadomość z serwera"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Usuń po"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dni oraz 0 godzin : usuw natychmiast"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Graniczny rozmiar przy pobieraniu"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 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."
+"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:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Graniczna liczba artykułów do pobrania"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "nieskończona jeśli podano 0"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Zwykły tekst"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(zazwyczaj puste)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Pokaż tylko katalogi, które śledzę"
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Tryb oszczędzania łącza (zapobiega pobieraniu zdalnych znaczników)"
 
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:1831
 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:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Sprawdzanie okresowe"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Użyj ustawień globalnych"
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Odpytuj o nowe wiadomości co"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
-msgstr "Filtruj wiadomości podczas pobierania"
+msgstr "Filtruj wiadomości w trakcie ich pobierania"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
-msgstr "Zezwól na filtrowanie przez wtyczki podczas pobierania wiadomości"
+msgstr "Zezwól wtyczkom na filtrowanie wiadomości w trakcie ich pobierania"
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 msgid "'Get Mail' checks for new messages on this account"
-msgstr "\"Pobierz pocztę\" szuka nowych wiadomości na tym koncie."
+msgstr ""
+"Poszukaj nowych wiadomości na tym koncie po naciśnięciu 'Pobierz wiadomości'"
 
-#: src/prefs_account.c:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:1996 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:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Wytwórz ID-wiadomości"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "Wyślij adres konta w ID-wiadomości"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Dodaj nagłówek user agent"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Dodaj nagłówek określony przez użytkownika"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnienie SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15371,215 +15366,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:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Uwierzytelnij z POP przed wysłaniem"
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "Upłynął czas oczekiwania uwierzytelnienie POP"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Uwierzytelnienie"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Wybierz dostawcę usług dla wiadomości OAuth2"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
-msgstr "Indentyfikator Klienta"
+msgstr "Identyfikator Klienta"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "Dana poufna klienta"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Pobierz kod uwierzytelniający"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
-msgstr "Otwórz domyśną przeglądarkę wraz z zapytaniem"
+msgstr "Otwórz domyślną przeglądarkę wraz z zapytaniem"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Skopiuj odnośnik"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Kod uwierzytelnienia"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2361
 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:2331
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Dokończ uwierzytelnienie"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Uwierzytelnij"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
-msgstr "Sam wstawiaj podpisy"
+msgstr "Sam wstaw podpis"
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Podpis oddziel"
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Wynik polecenia"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
-msgstr "Sam dodawaj następujące adresy"
+msgstr "Sam dodaj następujące adresy"
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
-msgstr "Słowniki do sprawdzania pisowni"
+msgstr "Sprawdź pisownię poniższymi słownikami"
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Domyślny słownik"
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2596 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:2643 src/prefs_account.c:4116
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
 #: 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 "Tworzenie wiadomości"
+msgstr "Pisanie wiadomości"
 
-#: src/prefs_account.c:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
-msgstr "Odpowiedź"
+msgstr "Odpowiedz"
 
-#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2711 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:2720
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Domyślny system ochrony prywatności"
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Podpisz każdą wiadomość"
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Zaszyfruj każdą wiadomość"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr "Podpisz wiadomość, gdy odpowiadam na podpisaną wiadomość"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Zaszyfruj wiadomość, gdy odpowiadam na zaszyfrowaną wiadomość"
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2797
 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:2761
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Zapisz wysłane, zaszyfrowane wiadomości zwykłym tekstem"
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
 msgid "Don't use TLS"
 msgstr "Nie używaj TLS"
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
-msgstr "Użyj polecenia STARTTLS by nawiązać zaszyfrowaną sesję"
+msgstr "Użyj polecenia STARTTLS, aby nawiązać zaszyfrowaną sesję"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Wysyłanie (SMTP)"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3003
 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:2976
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Certyfikaty klienta"
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Certyfikaty do pobierania"
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 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:3012
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Certyfikat do wysyłania"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Automatically accept valid TLS certificates"
-msgstr "Sam przyjmuj prawidłowe certyfikaty TLS"
+msgstr "Sam zatwierdzaj prawidłowe certyfikaty TLS"
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3093
 msgid "Use non-blocking TLS"
 msgstr "Użyj nieblokującego TLS"
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3105
 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:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Użyj serwera pośredniczącego"
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3206
 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:3170
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Użyj globalnych ustawień serwera pośredniczącego"
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
-msgstr "Uwierzytelniaj się"
+msgstr "Uwierzytelnij się"
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Użyj serwera pośredniczącego do wysyłania"
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15587,184 +15582,205 @@ 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:3354
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "Port serwera SMTP"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "Port serwera POP"
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "Port serwera IMAP"
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "Port serwera NNTP"
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Nazwa domeny"
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
-"Nazwa domeny zostanie użyta w wytworzenia identyfikatora wiadomości, jak"
-" również podczas łączenia z serwerami SMTP."
+"Nazwa domeny zostanie użyta w wytworzenia identyfikatora wiadomości, jak "
+"również podczas łączenia z serwerami SMTP."
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Użyj tego polecenia do porozumiewania się z serwerem"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Oznacz cross-posty jako przeczytane i zakoloruj:"
 
-#: src/prefs_account.c:3456
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Umieść wiadomości wysłane w"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Umieść wiadomości z kolejki w"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Umieść wiadomości robocze w"
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Umieść usunięte wiadomości w"
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "Nie wpisano nazwy konta."
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "Nie wpisano adresu pocztowego."
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "Nie wpisano serwera SMTP."
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "Nie wpisano ID użytkownika."
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "Nie wpisano serwera POP."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "Domyślny katalog poczty przychodzącej nie istnieje."
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "Nie wpisano serwera IMAP."
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "Nie wpisano serwera NNTP."
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "nie wpisano ścieżki do pliku miejscowej skrzynki mailbox."
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "nie wpisano polecenia poczty."
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "ID użytkownika nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3601
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "Hasło nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3636
+#: src/prefs_account.c:3676
 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:3641
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "Hasło SMTP nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3733
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "nie podano domeny."
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "nie wybrano katalogu wysłanych."
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "nie wybrano katalogu kolejki."
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "nie wybrano katalogu roboczych."
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "nie wybrano katalogu kosza."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Pobieranie"
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Wysyłanie"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Wzorce"
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Rozszerzone"
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Ustawianie nowego konta"
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Ustawienia konta"
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Niepowodzenie (błędy adres)"
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Wybierz plik z podpisem"
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Wybierz plik certyfikatu"
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (nie wczytano wtyczki)"
 
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Ukończono uwierzytelnianie"
+
+#: src/prefs_account.c:6139
+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
+msgid "Authorisation NOT completed"
+msgstr "NIE ukończono uwierzytelniania"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "Claws Mail nie otrzymał twojego kodu uwierzytelniającego OAuth2"
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Ustawienia działań"
@@ -15787,11 +15803,11 @@ msgstr "Edytuj działanie filtra"
 
 #: src/prefs_actions.c:326
 msgid "Append the new action above to the list"
-msgstr "Dołącz nowe działanie powyżej do spisu"
+msgstr "Doda powyższe działanie do spisu"
 
 #: src/prefs_actions.c:334
 msgid "Replace the selected action in list with the action above"
-msgstr "Zastąp zaznaczone działanie w spisie, działaniem powyżej"
+msgstr "Zastąpi działanie zaznaczone w spisie powyższym działaniem"
 
 #: src/prefs_actions.c:342
 msgid "Delete the selected action from the list"
@@ -15807,11 +15823,11 @@ msgstr "Pokaż szczegóły działań ustawień"
 
 #: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:356
 msgid "_Top"
-msgstr "Na szczy_t"
+msgstr "Na _górę"
 
 #: src/prefs_actions.c:389
 msgid "Move the selected action to the top"
-msgstr "Przesuń zaznaczone działanie na górę"
+msgstr "Przesunie zaznaczone działanie na górę"
 
 #: src/prefs_actions.c:399
 msgid "Move the selected action up"
@@ -15823,11 +15839,11 @@ msgstr "Przesuń wybrane działanie w dół"
 
 #: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
 msgid "_Bottom"
-msgstr "_Na spód"
+msgstr "Na _dół"
 
 #: src/prefs_actions.c:417
 msgid "Move the selected action to the bottom"
-msgstr "Przesuń zaznaczone działanie na dół"
+msgstr "Przesunie zaznaczone działanie na dół"
 
 #: src/prefs_actions.c:550 src/prefs_filtering_action.c:678
 #: src/prefs_filtering.c:822 src/prefs_filtering.c:824
@@ -15896,14 +15912,14 @@ msgstr "Nie zapisano wpisu"
 #: 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 "Nie zapisano wpisu. Czy na pewno zamknąć?"
+msgstr "Nie zapisano wpisu po jego zmianach. Czy na pewno zamknąć?"
 
 #: 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
 #: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
 #: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
-msgstr "Wznów edyt_owanie"
+msgstr "Wróć d_o zmieniania"
 
 #: src/prefs_actions.c:918
 msgid "Actions list not saved"
@@ -15919,7 +15935,7 @@ msgstr "<span weight=\"bold\" underline=\"single\">Nazwa menu:</span>"
 
 #: src/prefs_actions.c:990
 msgid "Use / in menu name to make submenus."
-msgstr "Użyj / w nazwie menu do stworzenia podmenu"
+msgstr "Wstaw / w nazwie menu, aby stworzyć podmenu"
 
 #: src/prefs_actions.c:992
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
@@ -15927,24 +15943,25 @@ msgstr "<span weight=\"bold\" underline=\"single\">Wiersz poleceń:</span>"
 
 #: src/prefs_actions.c:993
 msgid "<span weight=\"bold\">Begin with:</span>"
-msgstr "<span weight=\"bold\">Rozpoczyna się od:</span>"
+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 wybrany jej kawałek do stdin"
+msgstr ""
+"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"
-msgstr "aby wysłać tekst użytkownika do standardowego wejścia polecenia"
+msgstr "aby wysłać tekst użytkownika na standardowe wejście polecenia"
 
 #: src/prefs_actions.c:996
 msgid "to send user provided hidden text to command's standard input"
-msgstr ""
-"aby wysłać ukryty tekst użytkownika do do standardowego wejścia polecenia"
+msgstr "aby wysłać ukryty tekst użytkownika na standardowe wejście polecenia"
 
 #: src/prefs_actions.c:997
 msgid "<span weight=\"bold\">End with:</span>"
-msgstr "<span weight=\"bold\">Kończy się:</span>"
+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"
@@ -15967,36 +15984,39 @@ msgstr "<span weight=\"bold\">Użyj:</span>"
 
 #: src/prefs_actions.c:1002
 msgid "for the file of the selected message in RFC822/2822 format "
-msgstr "dla pliku lub wybranej wiadomości w formacie RFC822/2822 "
+msgstr "aby uzyskać plik zaznaczonej wiadomości w formacie RFC822/2822 "
 
 #: src/prefs_actions.c:1003
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
-msgstr "dla listy plików wybranych wiadomości w formacie RFC822/2822"
+msgstr ""
+"aby uzyskać plik listy plików zaznaczonych wiadomości w formacie RFC822/2822"
 
 #: src/prefs_actions.c:1004
 msgid "for the file of the selected decoded message MIME part"
-msgstr "dla pliku wybranej zdekodowanej części MIME danej wiadomości"
+msgstr ""
+"aby uzyskać plik zaznaczonej wiadomości po zdekodowaniu jej części MIME"
 
 #: src/prefs_actions.c:1005
 msgid "for a user provided argument"
-msgstr "dla argumentu wprowadzonego przez użytkownika"
+msgstr "aby uzyskać argument podany przez użytkownika"
 
 #: src/prefs_actions.c:1006
 msgid "for a user provided hidden argument (e.g. password)"
-msgstr "dla ukrytego argumentu (np. hasło) wprowadzonego przez użytkownika"
+msgstr "aby uzyskać ukryty argument podany przez użytkownika (np. hasło)"
 
 #: src/prefs_actions.c:1007
 msgid "for the text selection"
-msgstr "dla wybrania tekstu"
+msgstr "aby uzyskać zaznaczony tekst"
 
 #: src/prefs_actions.c:1008
 msgid "apply filtering actions between {} to selected messages"
-msgstr "zastosuj filtrowanie określone pomiędzy {} do wybranych wiadomości"
+msgstr ""
+"zastosuj filtrowanie określone pomiędzy {} na zaznaczonych wiadomościach"
 
 #: src/prefs_actions.c:1009
 msgid "for a literal %"
-msgstr "dla dosłownego %"
+msgstr "aby użyć znaku % dosłownie"
 
 #: src/prefs_actions.c:1019 src/prefs_themes.c:1191
 msgid "Actions"
@@ -16007,9 +16027,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 ""
-"Mechanizm Akcji jest rozwiązaniem, które umożliwia użytkownikowi "
-"uruchamianie zewnętrznych poleceń do przetwarzania całych plików wiadomości "
-"lub tylko niektórych części wiadomoś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
@@ -16046,8 +16065,8 @@ msgstr "Dnia %D{%F}, o godz. %D{%T}\\n%f napisał(a):\\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\\nPoczątek przekazywanej wiadomości:\\n\\n?d{Data: %d\\n}?f{Od: %f\\n}?"
 "t{Do: %t\\n}?c{Kopia: %c\\n}?n{Lista news: %n\\n}?s{Temat: %s\\n}\\n\\n%M"
@@ -16094,15 +16113,15 @@ msgstr "Nawet gdy wiadomość ma zostać zaszyfrowana"
 
 #: src/prefs_compose_writing.c:177
 msgid "Undo level"
-msgstr "Graniczna liczba poziomów cofnięć"
+msgstr "Graniczna liczba kroków cofnięć"
 
 #: src/prefs_compose_writing.c:194
 msgid "Warn when inserting a file larger than"
 msgstr "Ostrzeż, gdy wstawię plik większy niż"
 
 #: src/prefs_compose_writing.c:205
-msgid "KiB into message body "
-msgstr "KiB w treść wiadomości "
+msgid "KiB into message body"
+msgstr "KiB w treści wiadomości"
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -16159,66 +16178,70 @@ msgid "Header name is not set."
 msgstr "Brak nazwy nagłówka."
 
 #: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "W nazwie nagłówka nie wolno stosować dwukropka (:)."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Ta nazwa nagłówka nie jest dozwolona jako własny nagłówek."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Wybierz plik PNG"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Wybierz plik XBM"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Wybierz plik tekstowy"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Ten plik nie jest obrazem."
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr ""
 "Wybrany obraz ma niewłaściwe wymiary. Prawidłowy powinien mieć (48x48)."
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Wybrany obraz jest zbyt duży - może mieć co najwyżej 752 bajty."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Obraz nie jest we właściwym formacie (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Obraz nie jest we właściwym formacie (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Nie można uruchomić `compface`. Sprawdź czy ten plik jest w Twojej zmiennej "
 "$PATH."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "błąd Compface: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Ten plik zawiera znaki nowych wierszy."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Usuń nagłówek"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Czy na pewno usunąć ten nagłówek?"
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Bieżące własne nagłówki"
 
@@ -16236,7 +16259,7 @@ msgstr "Ukryte nagłówki"
 
 #: src/prefs_display_header.c:353
 msgid "Displayed Headers"
-msgstr "Wyświetlone nagłówki"
+msgstr "Wyświetlane nagłówki"
 
 #: src/prefs_display_header.c:398
 msgid "Show all unspecified headers"
@@ -16276,9 +16299,9 @@ msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
-"Zaznaczenie tego pola włącza wyświetlanie części MIME w widoku wiadomości"
-" przy użyciu "
-"skryptu gdy używasz opcji z menu kontekstowego 'Wyświetl jako tekst'"
+"Zaznaczenie tego pola włącza wyświetlanie części MIME w widoku wiadomości "
+"przy użyciu skryptu gdy używasz opcji z menu kontekstowego 'Wyświetl jako "
+"tekst'"
 
 #: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:172
 #: src/prefs_message.c:362
@@ -16432,7 +16455,7 @@ msgstr "Nie określono żadnego działania."
 #: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2213
 #: src/quote_fmt.c:78
 msgid "literal %"
-msgstr "dosłowne %"
+msgstr "znak % dosłownie"
 
 #: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2222
 msgid "filename (should not be modified)"
@@ -16510,19 +16533,19 @@ msgstr " O_kreśl... "
 
 #: src/prefs_filtering.c:461
 msgid "Append the new rule above to the list"
-msgstr "Dołącz nową zasadę z góry do spisu"
+msgstr "Doda powyższą zasadę do spisu"
 
 #: src/prefs_filtering.c:470
 msgid "Replace the selected rule in list with the rule above"
-msgstr "Zastąp zaznaczoną zasadę ze spisu zasadą powyżej"
+msgstr "Zastąpi zasadę zaznaczoną w spisie powyższą zasadą"
 
 #: src/prefs_filtering.c:477
 msgid "Delete the selected rule from the list"
-msgstr "Usuń zaznaczoną zasadę ze spisu"
+msgstr "Usunie zaznaczoną zasadę ze spisu"
 
 #: src/prefs_filtering.c:516
 msgid "Move the selected rule to the top"
-msgstr "Przesuwa zaznaczoną zasadę na szczyt"
+msgstr "Przesunie zaznaczoną zasadę na szczyt"
 
 #: src/prefs_filtering.c:519
 msgid "Page u_p"
@@ -16530,15 +16553,15 @@ msgstr "_Strona w górę"
 
 #: src/prefs_filtering.c:527
 msgid "Move the selected rule one page up"
-msgstr "Przesuwa zaznaczoną zasadę o stronę w górę"
+msgstr "Przesunie zaznaczoną zasadę o stronę w górę"
 
 #: src/prefs_filtering.c:536
 msgid "Move the selected rule up"
-msgstr "Przesuwa zaznaczoną zasadę w górę"
+msgstr "Przesunie zaznaczoną zasadę w górę"
 
 #: src/prefs_filtering.c:544
 msgid "Move the selected rule down"
-msgstr "Przesuwa zaznaczoną zasadę w dół"
+msgstr "Przesunie zaznaczoną zasadę w dół"
 
 #: src/prefs_filtering.c:547
 msgid "Page dow_n"
@@ -16546,11 +16569,11 @@ msgstr "Stro_na w dół"
 
 #: src/prefs_filtering.c:555
 msgid "Move the selected rule one page down"
-msgstr "Przesuwa zaznaczoną zasadę o stronę w dół"
+msgstr "Przesunie zaznaczoną zasadę o stronę w dół"
 
 #: src/prefs_filtering.c:564
 msgid "Move the selected rule to the bottom"
-msgstr "Przesuwa zaznaczoną zasadę na spód"
+msgstr "Przesunie zaznaczoną zasadę na spód"
 
 #: src/prefs_filtering.c:1026 src/prefs_filtering.c:1112
 msgid "Condition string is not valid."
@@ -16659,15 +16682,15 @@ msgstr "Rodzaj katalogu"
 
 #: src/prefs_folder_item.c:360
 msgid "Simplify Subject RegExp"
-msgstr "Uprość wyrażenie regularne tematu"
+msgstr "Wyrażenie regularne, upraszczające temat"
 
 #: src/prefs_folder_item.c:387
 msgid "Test string"
-msgstr "Próbny ciąg znaków"
+msgstr "Wejściowy ciąg znaków"
 
 #: src/prefs_folder_item.c:408
 msgid "Result"
-msgstr "Wynik"
+msgstr "Wynikowy ciąg znaków"
 
 #: src/prefs_folder_item.c:426
 msgid "Folder chmod"
@@ -16723,8 +16746,8 @@ msgid ""
 "Turn this option on if you want this folder to be ignored when searching for "
 "unread or new messages"
 msgstr ""
-"Zaznacz to pole, jeśli chcesz aby ten katalog był pomijany przy odpytywaniu o"
-" nieprzeczytane lub nowe wiadomości"
+"Zaznacz to pole, jeśli chcesz aby ten katalog był pomijany przy odpytywaniu "
+"o nieprzeczytane lub nowe wiadomości"
 
 #: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
@@ -16732,7 +16755,7 @@ msgstr "Synchronizuj do użytku niesieciowego"
 
 #: src/prefs_folder_item.c:582
 msgid "Fetch message bodies from the last"
-msgstr "Pobierz całe wiadomości z ostatnich"
+msgstr "Pobierz treści wiadomości z ostatnich"
 
 #: src/prefs_folder_item.c:587
 msgid "0: all bodies"
@@ -16748,11 +16771,12 @@ msgstr "Porzuć pamięć podręczną katalogu"
 
 #: src/prefs_folder_item.c:943
 msgid "Request Return Receipt"
-msgstr "Żądaj potwierdzenia dostarczenia"
+msgstr "Poproś o potwierdzenie dostarczenia"
 
 #: src/prefs_folder_item.c:954
 msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr "Zapisz kopię poczty wychodzącej do tego katalogu a nie do wysłanych"
+msgstr ""
+"Zapisuj wiadomości wychodzące w tym katalogu zamiast w katalogu wysłanych"
 
 #: src/prefs_folder_item.c:965 src/prefs_folder_item.c:990
 #: src/prefs_folder_item.c:1040 src/prefs_folder_item.c:1065
@@ -16770,11 +16794,12 @@ msgstr "Domyślny %s przy odpowiadaniu"
 
 #: src/prefs_folder_item.c:1114
 msgid "Default account"
-msgstr "Konto domyślne"
+msgstr "Domyślne konto"
 
 #: src/prefs_folder_item.c:1247 src/prefs_folder_item.c:1278
 msgid "\"Default\" will follow the applicable account preference"
-msgstr "\"Domyślne\" będzie używało ustawień konta, których można użyć"
+msgstr ""
+"\"Domyślnie\" zastosuje ustawienia konta, które będzie się dało zastosować"
 
 #: src/prefs_folder_item.c:1824
 msgid "Discard cache"
@@ -16783,7 +16808,7 @@ msgstr "Opróżnij dane z pamięci podręcznej"
 #: src/prefs_folder_item.c:1825
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
-"Czy na pewno chcesz wyczyścić przechowywaną lokalnie pamięć podręczną dla "
+"Czy na pewno chcesz wyczyścić przechowywaną miejscowo pamięć podręczną dla "
 "tego katalogu? "
 
 #: src/prefs_folder_item.c:1940
@@ -16806,8 +16831,8 @@ msgstr "Wiadomość"
 #: src/prefs_fonts.c:119
 msgid "Derive small and bold fonts from Folder and Message Lists font"
 msgstr ""
-"Przy małych i pogrubionych czcionkach wzoruj się na spisie katalogu i"
-" wiadomości"
+"Przy małych i pogrubionych czcionkach wzoruj się na spisie katalogu i "
+"wiadomości"
 
 #: src/prefs_fonts.c:127
 msgid "Small"
@@ -16909,10 +16934,9 @@ msgstr ""
 "wiadomość będą zapisywane do odpowiedniego dziennika zdarzeń. \n"
 "Można go w dowolnej chwili przejrzeć wybierając z menu Narzędzia Dziennik "
 "filtrów/Dziennik przetwarzania.\n"
-"Należy pamiętać, że zaznaczenie tego pola może spowodować spowolnienie"
-" czynności "
-"filtrowania/przetwarzania szczególnie wtedy, gdy liczba wiadomości przekracza"
-" tysiąc."
+"Należy pamiętać, że zaznaczenie tego pola może spowodować spowolnienie "
+"czynności filtrowania/przetwarzania szczególnie wtedy, gdy liczba wiadomości "
+"przekracza tysiąc."
 
 #: src/prefs_logging.c:181
 msgid "Log filtering/processing when..."
@@ -17364,7 +17388,7 @@ msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
-"Nie zapisano wpisu.\n"
+"Nie zapisano wpisu po jego zmianach.\n"
 "Czy zamknąć mimo tego?"
 
 #: src/prefs_matcher.c:2234
@@ -17393,7 +17417,7 @@ msgstr "Nagłówki"
 
 #: src/prefs_message.c:124
 msgid "Display header pane above message view"
-msgstr "Wyświetl panelu nagłówków powyżej okna wiadomości"
+msgstr "Pokaż pasek nagłówka powyżej wiadomości"
 
 #: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
@@ -17421,11 +17445,11 @@ msgstr "Wiadomości HTML"
 
 #: src/prefs_message.c:164
 msgid "Render HTML messages as text"
-msgstr "Wyświetl wiadomości HTML jako zwykły tekst"
+msgstr "Wyświetlaj wiadomości HTML jako zwykły tekst"
 
 #: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
-msgstr "Wyświetl wiadomości tylko-HTML przy użyciu wtyczki, jeśli to możliwe"
+msgstr "Wyświetlaj wiadomości tylko-HTML przy użyciu wtyczki, jeśli to możliwe"
 
 #: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
@@ -17639,9 +17663,8 @@ msgid ""
 "Target folder is used when the option 'Execute immediately when moving or "
 "deleting messages' is turned off"
 msgstr ""
-"Katalog docelowy jest używany gdy "
-"pole 'Natychmiastowe wykonywanie działań przenoszenia lub usuwania "
-"wiadomości' jest wyłączona"
+"Katalog docelowy jest używany gdy pole 'Natychmiastowe wykonywanie działań "
+"przenoszenia lub usuwania wiadomości' jest wyłączona"
 
 #: src/prefs_msg_colors.c:370
 msgctxt "Tooltip and Dialog title"
@@ -17682,20 +17705,12 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Wybór zestawu skrótów klawiszowych"
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Wybrany zestaw:"
-
-#: src/prefs_other.c:138
-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 "Select preset keyboard shortcuts:"
+msgstr "Wybór zestawu skrótów klawiszowych:"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
-msgstr "Dwukrotne kliknięcie dodaje adres do pola \"Do\" wiadomości"
+msgstr "Dodaj adres do pola \"Do\" po dwukrotnym naciśnięciu na niego"
 
 #: src/prefs_other.c:498
 msgid "On exit"
@@ -17711,7 +17726,7 @@ msgstr "Opróżnij kosz przed wyjściem"
 
 #: src/prefs_other.c:511
 msgid "Warn if there are queued messages"
-msgstr "Ostrzeż, gdy istnieją wiadomości w kolejce"
+msgstr "Ostrzeż, gdy w kolejce znajdują się wiadomości"
 
 #: src/prefs_other.c:513
 msgid "Keyboard shortcuts"
@@ -17736,7 +17751,7 @@ msgid ""
 msgstr ""
 "Bezpieczniejszy tryb zleca systemowi operacyjnemu zapisywanie\n"
 "metadanych na dysk bezpośrednio; pozwala to uniknąć utraty\n"
-"danych po awarii, ale zajmuje więcej czasu."
+"danych po wysypaniu się programu, ale zajmuje więcej czasu."
 
 #: src/prefs_other.c:535
 msgid "Safer"
@@ -17862,7 +17877,7 @@ msgstr "Nie pokazuj okna w przypadku błędu pobierania"
 
 #: src/prefs_receive.c:247
 msgid "After receiving new mail"
-msgstr "Po otrzymaniu nowych wiadomości"
+msgstr "Po otrzymaniu nowej wiadomości"
 
 #: src/prefs_receive.c:249
 msgid "Go to Inbox"
@@ -17915,7 +17930,7 @@ msgstr "Ostrzeż, gdy temat wiadomości jest pusty"
 
 #: src/prefs_send.c:209
 msgid "Warn when sending to more recipients than"
-msgstr "Ostrzeż, gdy wysyłam do więcej odbiorców niż"
+msgstr "Ostrzeż, gdy wysyłam do większej liczby odbiorców niż"
 
 #: src/prefs_send.c:225
 msgid "Outgoing encoding"
@@ -17926,8 +17941,8 @@ msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
-"Po wybraniu `Sam wykryj', zostanie użyte optymalne kodowanie "
-"na podstawie obecnych ustawień językowych"
+"Po wybraniu `Sam wykryj', zostanie użyte optymalne kodowanie na podstawie "
+"obecnych ustawień językowych"
 
 #: src/prefs_send.c:263
 msgid "7bit ASCII (US-ASCII)"
@@ -18061,8 +18076,8 @@ msgstr ""
 "Określ kodowanie treści przesyłania (Content-Transfer-Encoding)\n"
 "dla wiadomość zawierających znaki odmienne od formatu ASCII"
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Wysyłanie"
 
@@ -18226,8 +18241,8 @@ msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
 msgstr ""
-"Wykonaj zasady przetwarzania przed oznaczeniem wszystkich wiadomości w"
-" katalogu jako przeczytane lub nieprzeczytane"
+"Wykonaj zasady przetwarzania przed oznaczeniem wszystkich wiadomości w "
+"katalogu jako przeczytane lub nieprzeczytane"
 
 #: src/prefs_summaries.c:426
 msgid "Abbreviate newsgroup names longer than"
@@ -18259,7 +18274,7 @@ msgstr "Pomoc formatu daty"
 
 #: src/prefs_summaries.c:513
 msgid "Set message selection when entering a folder"
-msgstr "ustaw zaznaczanie wiadomości po wejściu do katalogu"
+msgstr "Określ otwartą wiadomość po otwarciu katalogu"
 
 #: src/prefs_summaries.c:522
 msgid "Open message when selected"
@@ -18267,24 +18282,23 @@ msgstr "Otwórz wiadomość po jej zaznaczeniu"
 
 #: src/prefs_summaries.c:527
 msgid "When opening a folder"
-msgstr "Podczas otwierania katalogu"
+msgstr "Po otwarciu katalogu"
 
 #: src/prefs_summaries.c:529
 msgid "When displaying search results"
-msgstr "Podczas wyświetlania wyników wyszukiwania"
+msgstr "Po wyświetleniu wyników wyszukiwania"
 
 #: src/prefs_summaries.c:531
 msgid "When selecting next or previous message using shortcuts"
-msgstr ""
-"Podczas wybierania następnej lub poprzedniej wiadomości używając skrótów"
+msgstr "Po wybraniu następnej lub poprzedniej wiadomości, używając skrótów"
 
 #: src/prefs_summaries.c:533
 msgid "When deleting or moving messages"
-msgstr "Podczas usuwania lub przenoszenia wiadomości"
+msgstr "Po usunięciu lub przeniesieniu wiadomości"
 
 #: src/prefs_summaries.c:535
 msgid "When using directional keys"
-msgstr "Podczas używania klawiszy kierunkowych"
+msgstr "Po użyciu klawiszy kierunkowych"
 
 #: src/prefs_summaries.c:537
 msgid "Mark message as read"
@@ -18292,25 +18306,23 @@ msgstr "Oznacz wiadomość jako przeczytaną"
 
 #: src/prefs_summaries.c:540
 msgid "when selected, after"
-msgstr "po zaznaczeniu i po czasie"
+msgstr "po jej zaznaczeniu i po czasie"
 
 #: src/prefs_summaries.c:559
 msgid "only when opened in a new window, or replied to"
-msgstr "tylko gdy otwarta w nowym oknie lub udzielono odpowiedzi"
+msgstr "tylko po jej otwarciu w nowym oknie lub odpowiedzeniu na nią"
 
 #: src/prefs_summaries.c:569
 msgid "Show \"no unread (or new) message\" dialog"
-msgstr ""
-"Brak okna dialogowego o\n"
-"nowych i nieprzeczytanych wiadomościach"
+msgstr "Pokaż okno \"nie ma żadnych nieprzeczytanych (lub nowych) wiadomości\""
 
 #: src/prefs_summaries.c:579
 msgid "Assume 'Yes'"
-msgstr "Przyjmij 'Tak'"
+msgstr "Domyślnie 'Tak'"
 
 #: src/prefs_summaries.c:580
 msgid "Assume 'No'"
-msgstr "Przyjmij 'Nie'"
+msgstr "Domyślnie 'Nie'"
 
 #: src/prefs_summaries.c:586
 msgid "Display sender using address book"
@@ -18322,7 +18334,7 @@ msgstr "Wątek używa tematu w dodatku do standardowych nagłówków"
 
 #: src/prefs_summaries.c:594
 msgid "Execute immediately when moving or deleting messages"
-msgstr "Wykonuj natychmiast przenoszenie lub usuwanie wiadomości"
+msgstr "Przenoś lub usuwaj wiadomości ze skutkiem natychmiastowym"
 
 #: src/prefs_summaries.c:596
 msgid ""
@@ -18335,7 +18347,8 @@ msgstr ""
 #: src/prefs_summaries.c:601
 msgid "Confirm when marking all messages as read or unread"
 msgstr ""
-"Potwierdź gdy zaznaczasz wszystkie wiadomości w katalogu jako przeczytane"
+"Proś o potwierdzenie przy oznaczaniu wszystkich wiadomości  jako przeczytane"
+" lub nieprzeczytane"
 
 #: src/prefs_summaries.c:604
 msgid "Confirm when changing color labels"
@@ -18343,7 +18356,7 @@ msgstr "Zapytaj przed zmianą kolorowej etykiety"
 
 #: src/prefs_summaries.c:608
 msgid "Show tooltips"
-msgstr "Pokazuj wskazówki"
+msgstr "Pokaż wskazówki"
 
 #: src/prefs_summaries.c:618 src/quote_fmt.c:541
 msgid "Defaults"
@@ -18412,7 +18425,7 @@ msgstr "najstarsza nieprzeczytana wiadomość"
 
 #: src/prefs_summary_open.c:112
 msgid "last opened email"
-msgstr "ostatni otworzona wiadomość"
+msgstr "ostatnio otworzona wiadomość"
 
 #: src/prefs_summary_open.c:113
 msgid "newest email in the list"
@@ -18436,15 +18449,15 @@ msgstr "najnowsza nieprzeczytana wiadomość"
 
 #: src/prefs_summary_open.c:188
 msgid "Message selection when entering a folder"
-msgstr "Wybrana wiadomość podczas otwierania katalogu"
+msgstr "Otwarcie wiadomości po otwarciu katalogu"
 
 #: src/prefs_summary_open.c:233
 msgid "Available selections"
-msgstr "Dostępne zaznaczenie"
+msgstr "Dostępny wybór"
 
 #: src/prefs_summary_open.c:268
 msgid "Current selections"
-msgstr "Bieżące zaznaczenie"
+msgstr "Bieżący wybór"
 
 #: src/prefs_template.c:79
 msgid "This name is used as the Menu item"
@@ -18472,7 +18485,7 @@ msgstr "Usuwa wybrany szablon z listy"
 
 #: src/prefs_template.c:338
 msgid "Show information on configuring templates"
-msgstr "Wyświetla informacje o ustawianiu wzorców"
+msgstr "Wyświetla szczegóły o ustawianiu wzorców"
 
 #: src/prefs_template.c:362
 msgid "Move the selected template to the top"
@@ -18508,24 +18521,24 @@ msgstr "Nie podano nazwy wzorca."
 
 #: src/prefs_template.c:796
 msgid "The \"From\" field of the template contains an invalid email address."
-msgstr "Pole \"Od\" wzorca zawiera nieprawidłowy adres e-mail."
+msgstr "Pole \"Od\" wzorca zawiera nieprawidłowy adres pocztowy."
 
 #: src/prefs_template.c:802
 msgid "The \"To\" field of the template contains an invalid email address."
-msgstr "Pole \"Do\" wzorca zawiera nieprawidłowy adres e-mail."
+msgstr "Pole \"Do\" wzorca zawiera nieprawidłowy adres pocztowy."
 
 #: src/prefs_template.c:808
 msgid "The \"Cc\" field of the template contains an invalid email address."
-msgstr "Pole \"Cc\" wzorca zawiera nieprawidłowy adres e-mail."
+msgstr "Pole \"Cc\" wzorca zawiera nieprawidłowy adres pocztowy."
 
 #: src/prefs_template.c:814
 msgid "The \"Bcc\" field of the template contains an invalid email address."
-msgstr "Pole \"Bcc\" wzorca zawiera nieprawidłowy adres e-mail."
+msgstr "Pole \"Bcc\" wzorca zawiera nieprawidłowy adres pocztowy."
 
 #: src/prefs_template.c:820
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
-msgstr "Pole \"Reply-To\" szablonu zawiera nieprawidłowy adres e-mail."
+msgstr "Pole \"Reply-To\" szablonu zawiera nieprawidłowy adres pocztowy."
 
 #: src/prefs_template.c:826
 msgid "The \"Subject\" field of the template is invalid."
@@ -18643,7 +18656,7 @@ msgstr "Nie można utworzyć katalogu docelowego %s."
 
 #: src/prefs_themes.c:627
 msgid "Theme installed successfully."
-msgstr "Pomyślnie wgrano wyglad."
+msgstr "Pomyślnie wgrano wygląd."
 
 #: src/prefs_themes.c:634
 msgid "Failed installing theme"
@@ -18738,8 +18751,8 @@ msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
 msgstr ""
-"Wybrana Akcja już ustawiona.\n"
-"Proszę wybrać inną Akcję z Listy"
+"Wybrane Działanie już ustawiona.\n"
+"Proszę wybrać inne Działanie ze Spisu"
 
 #: src/prefs_toolbar.c:188
 msgid "Item has no icon defined."
@@ -18795,7 +18808,7 @@ msgstr "Okno wiadomości"
 
 #: src/prefs_toolbar.c:1245
 msgid "Compose Window"
-msgstr "Okno tworzenia nowej wiadomości"
+msgstr "Okno pisania wiadomości"
 
 #: src/prefs_toolbar.c:1361
 msgid "Icon text"
@@ -18833,35 +18846,35 @@ msgstr "Zwijaj tekst po"
 msgid "Wrapping"
 msgstr "Zawijanie wierszy"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Podgląd wydruku"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "Pierwsza strona"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Ostatnia strona"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "Powiększa do 100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Dopasowuje powiększenie do rozmiaru ekranu"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Powiększa"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Pomniejsza"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Strona nr %d"
@@ -18939,15 +18952,15 @@ msgstr "<span weight=\"bold\">symbole:</span>"
 
 #: src/quote_fmt.c:47
 msgid "customized date format (see 'man strftime')"
-msgstr "Własny zapis daty (zobacz `man strftime')"
+msgstr "własny zapis daty (zobacz `man strftime')"
 
 #: src/quote_fmt.c:50
 msgid "email address of sender"
-msgstr "adres e-mail nadawcy"
+msgstr "adres pocztowy nadawcy"
 
 #: src/quote_fmt.c:51
 msgid "full name of sender"
-msgstr "pełne dane nadawcy"
+msgstr "imię i nazwisko nadawcy"
 
 #: src/quote_fmt.c:52
 msgid "first name of sender"
@@ -18959,7 +18972,7 @@ msgstr "nazwisko nadawcy"
 
 #: src/quote_fmt.c:54
 msgid "initials of sender"
-msgstr "Inicjały Nadawcy"
+msgstr "inicjały nadawcy"
 
 #: src/quote_fmt.c:61
 msgid "message body"
@@ -18983,11 +18996,11 @@ msgstr "znaczniki wiadomości"
 
 #: src/quote_fmt.c:66
 msgid "current dictionary"
-msgstr "aktualny słownik"
+msgstr "bieżący słownik"
 
 #: src/quote_fmt.c:67
 msgid "cursor position"
-msgstr "pozycje kursora"
+msgstr "położenie kursora"
 
 #: src/quote_fmt.c:68
 msgid "account property: your name"
@@ -19019,7 +19032,7 @@ msgstr "właściwość konta: domyślny słownik"
 
 #: src/quote_fmt.c:75
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
-msgstr "książka adresowa <span style=\"oblique\">uzupełnianie</span>: Cc"
+msgstr "książka adresowa <span style=\"oblique\">uzupełnianie</span>: DW"
 
 #: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: From"
@@ -19031,31 +19044,31 @@ msgstr "książka adresowa <span style=\"oblique\">uzupełnianie</span>: Do"
 
 #: src/quote_fmt.c:79
 msgid "literal backslash"
-msgstr "znak odwróconego ukośnika"
+msgstr "odwrócony ukośnik dosłownie"
 
 #: src/quote_fmt.c:80
 msgid "literal question mark"
-msgstr "znak zapytania"
+msgstr "zapytanie dosłownie"
 
 #: src/quote_fmt.c:81
 msgid "literal exclamation mark"
-msgstr "znak wykrzyknika"
+msgstr "wykrzyknik dosłownie"
 
 #: src/quote_fmt.c:82
 msgid "literal pipe"
-msgstr "znak rury"
+msgstr "potok dosłownie"
 
 #: src/quote_fmt.c:83
 msgid "literal opening curly brace"
-msgstr "znak otwarcia nawiasu klamrowego"
+msgstr "otwarcia nawiasu klamrowego dosłownie"
 
 #: src/quote_fmt.c:84
 msgid "literal closing curly brace"
-msgstr "znak zamknięcia nawiasu klamrowego"
+msgstr "zamknięcia nawiasu klamrowego dosłownie"
 
 #: src/quote_fmt.c:85
 msgid "tab"
-msgstr "tab"
+msgstr "tabulator"
 
 #: src/quote_fmt.c:88
 msgid "<span weight=\"bold\">commands:</span>"
@@ -19101,7 +19114,8 @@ msgid ""
 "the output from"
 msgstr ""
 "wstaw wynik programu:\n"
-"<span style=\"oblique\">sub_expr </span>jest poleceniem, z którego pobierane\n"
+"<span style=\"oblique\">sub_expr </span>jest poleceniem, z którego "
+"pobierane\n"
 "jest wyjście"
 
 #: src/quote_fmt.c:93
@@ -19120,9 +19134,9 @@ msgid ""
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to attach"
 msgstr ""
-"wstaw plik:\n"
-"<span style=\"oblique\">sub_expr </span> jest ścieżka do pliku, który ma być "
-"wstawiony"
+"załącz plik:\n"
+"<span style=\"oblique\">sub_expr </span> zostanie odczytane jako ścieżka"
+" pliku do załączenia"
 
 #: src/quote_fmt.c:95
 msgid ""
@@ -19132,8 +19146,10 @@ msgid ""
 "the filename from"
 msgstr ""
 "załącz plik:\n"
-"<span style=\"oblique\">sub_expr </span>jest poleceniem, z którego pobierana\n"
-"jest nazwa pliku"
+"<span style=\"oblique\">sub_expr </span> zostanie odczytane jako polecenie"
+" wiersza poleceń, "
+"z którego\n"
+"pobrać nazwę pliku"
 
 #: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -19144,7 +19160,7 @@ msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
 msgstr ""
-"tekst który może zawierać wszystkie znaki lub polecenia\n"
+"tekst, który może zawierać wszystkie znaki lub polecenia\n"
 "opisane powyżej"
 
 #: src/quote_fmt.c:99
@@ -19152,7 +19168,7 @@ msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
 msgstr ""
-"tekst który może zawierać wszystkie znaki powyżej\n"
+"tekst, który może zawierać wszystkie znaki powyżej\n"
 "(polecenia nie są dozwolone)"
 
 #: src/quote_fmt.c:100
@@ -19162,17 +19178,18 @@ msgid ""
 "of the contact if that address matches exactly\n"
 "one contact in the address book"
 msgstr ""
-"Uzupełnienie nazwy na podstawie danych z książki adresowej.\n"
-"Jeżeli pierwszy adresu z nagłówków występuje jeden raz w książce\n"
-"adresowej zwraca pełną nazwę kontaktu"
+"uzupełnienie z książki adresowej działa tylko z pierwszym\n"
+"adresem w nagłówku, daje imię i nazwisko kontaktu,\n"
+"jeśli ten adres pasuje dokładnie do jednego kontaktu\n"
+"w książce adresowej"
 
 #: src/quote_fmt.c:109
 msgid "Description of symbols"
-msgstr "Opis pól zastępczych"
+msgstr "Opis symboli"
 
 #: src/quote_fmt.c:110
 msgid "The following symbols and commands can be used:"
-msgstr "Można używać następujących pól zastępczych i poleceń:"
+msgstr "Można używać następujących symboli i poleceń:"
 
 #: src/quote_fmt.c:173
 msgid "Use template when composing new messages"
@@ -19215,7 +19232,7 @@ msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr ""
-"Pole \"Od\" wzorca \"Nowa wiadomość\" zawiera nieprawidłowy adres e-mail."
+"Pole \"Od\" wzorca \"Nowa wiadomość\" zawiera nieprawidłowy adres pocztowy."
 
 #: src/quote_fmt.c:562
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
@@ -19238,88 +19255,88 @@ msgstr "Wpisz tekst zastępujący '%s'"
 msgid "Enter variable"
 msgstr "Wpisz zmienną"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Wysyłanie wiadomości za pomocą polecenia: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nie można wykonać polecenia: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Wystąpił błąd podczas wykonywania polecenia: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Podłączanie"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Wykonywanie POP przez SMTP"
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP przed SMTP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Łączenie z serwerem SMTP: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "Wiadomość została poprawnie wysłana."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "Wysyłanie HELO..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Uwierzytelnianie"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Wysyłanie wiadomości..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "Wysyłanie EHLO..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "Wysyłanie MAIL FROM..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "Wysyłanie RCPT TO..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "Wysyłanie DATA..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Wysyłanie wiadomości (%d / %d bajtów)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Wysyłanie wiadomości"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "Błąd podczas wysyłania wiadomości."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19375,11 +19392,11 @@ msgstr "Szukanie wiadomości"
 
 #: src/summary_search.c:311
 msgid "Match any of the following"
-msgstr "Spełnij jedno z następujących"
+msgstr "Spełnij jedno z poniższych"
 
 #: src/summary_search.c:313
 msgid "Match all of the following"
-msgstr "Spełnij wszystkie z następujących"
+msgstr "Spełnij wszystkie z poniższych"
 
 #: src/summary_search.c:441
 msgid "Body:"
@@ -19507,7 +19524,7 @@ msgstr "Brak kolorowanych wiadomości"
 
 #: src/summaryview.c:2176
 msgid "No labeled message found. Search from the end?"
-msgstr "Nie znaleziono kolorowanych wiadomości. Szukać od końca?"
+msgstr "Nie znaleziono żadnej wiadomości z etykietami. Czy poszukać od końca?"
 
 #: src/summaryview.c:2186 src/summaryview.c:2220
 msgid "No labeled messages."
@@ -19566,7 +19583,7 @@ msgstr "Nieprzeczytane:"
 
 #: src/summaryview.c:2783
 msgid "Total:"
-msgstr "Wszystkie:"
+msgstr "Łącznie:"
 
 #: src/summaryview.c:2785
 msgid "Marked:"
@@ -19649,28 +19666,28 @@ msgstr "Katalog docelowy taki sam jak bieżący."
 #: src/summaryview.c:4777
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
-msgstr[0] "Wybierz katalog do przeniesienia zaznaczonej wiadomości"
-msgstr[1] "Wybierz katalog do przeniesienia zaznaczonych wiadomości"
-msgstr[2] "Wybierz katalog do przeniesienia zaznaczonych wiadomości"
+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
 msgid "Destination to copy is same as current folder."
-msgstr "Katalog docelowy taki sam jak bieżący."
+msgstr "Katalog docelowy jest taki sam jak bieżący."
 
 #: src/summaryview.c:4862
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
-msgstr[0] "Wybierz katalog do skopiowania zaznaczonej wiadomości"
-msgstr[1] "Wybierz katalog do skopiowania zaznaczonych wiadomości"
-msgstr[2] "Wybierz katalog do skopiowania zaznaczonych wiadomości"
+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
 msgid "Append or Overwrite"
-msgstr "Dodaj lub Nadpisz"
+msgstr "Dopisać, czy zastąpić"
 
 #: src/summaryview.c:5027
 msgid "Append or overwrite existing file?"
-msgstr "Dodać do, czy nadpisać istniejący plik?"
+msgstr "Dopisać się, czy zastąpić istniejący plik?"
 
 #: src/summaryview.c:5028
 msgid "_Append"
@@ -19678,7 +19695,7 @@ msgstr "_Dopisz"
 
 #: src/summaryview.c:5028
 msgid "_Overwrite"
-msgstr "_Nadpisz"
+msgstr "_Zastąp"
 
 #: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
 #, c-format
@@ -19689,7 +19706,7 @@ msgstr "Nie można zapisać pliku '%s'."
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
-msgstr "Zamierzasz wydrukować %d wiadomości. Na pewno chcesz kontynuować ? "
+msgstr "Nastąpi wydrukowanie %d wiadomości. Czy na pewno to zrobić?"
 
 #: src/summaryview.c:5538
 msgid "Building threads..."
@@ -19701,11 +19718,11 @@ msgstr "Pomiń te zasady"
 
 #: src/summaryview.c:5789
 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"
+msgstr "Wykonaj te zasady, bez względu na to z jakim kontem są powiązane"
 
 #: src/summaryview.c:5792
 msgid "Apply these rules if they apply to the current account"
-msgstr "Wykonaj te zasady jeśli powiązane są z bieżącym kontem"
+msgstr "Wykonaj te zasady, jeśli powiązane są z bieżącym kontem"
 
 #: src/summaryview.c:5821
 msgid "Filtering"
@@ -19730,16 +19747,16 @@ msgstr "Ustawienia przetwarzania"
 #: src/summaryview.c:6087
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr ""
-"Czy na pewno wyzerować kolorową etykietę wszystkim zaznaczonym wiadomością?"
+"Czy na pewno wyzerować kolorową etykietę wszystkim zaznaczonym wiadomościom?"
 
 #: src/summaryview.c:6089
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
-"Czy na pewno nadać kolorową etykietę wszystkim zaznaczonym wiadomością?"
+"Czy na pewno nadać kolorową etykietę wszystkim zaznaczonym wiadomościom?"
 
 #: src/summaryview.c:6090
 msgid "Reset color label"
-msgstr "Resetowanie koloru etykiet"
+msgstr "Wyzeruj kolorową etykietę"
 
 #: src/summaryview.c:6090
 msgid "Set color label"
@@ -19755,11 +19772,11 @@ msgstr "Śledzony wątek"
 
 #: src/summaryview.c:6539
 msgid "Replied but also forwarded - click to see reply"
-msgstr "Odpowiedziano ale także przekazano - kliknij aby zobaczyć odpowiedź"
+msgstr "Odpowiedziano, ale także przekazano - naciśnij, aby zobaczyć odpowiedź"
 
 #: src/summaryview.c:6541
 msgid "Replied - click to see reply"
-msgstr "Odpowiedziano - kliknij aby zobaczyć odpowiedź"
+msgstr "Odpowiedziano - naciśnij, aby zobaczyć odpowiedź"
 
 #: src/summaryview.c:6553
 msgid "To be moved"
@@ -19785,7 +19802,7 @@ msgstr "Zaszyfrowana wiadomość"
 msgid "Has attachment(s)"
 msgstr "Wiadomość posiada załącznik(i)"
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19794,17 +19811,17 @@ msgstr ""
 "Błąd regularnego wyrażenia (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8405
 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:8406
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Powrót do listy katalogów"
 
 #: src/textview.c:241
 msgid "_Open in web browser"
-msgstr "_Otwórz w przeglądarce"
+msgstr "_Otwórz w przeglądarce sieciowej"
 
 #: src/textview.c:242
 msgid "Copy this _link"
@@ -19816,7 +19833,7 @@ msgstr "Odpowiedz na ten ad_res"
 
 #: src/textview.c:250
 msgid "Add to _Address book"
-msgstr "Dodaj do książki adresowej"
+msgstr "Dodaj do książki _adresowej"
 
 #: src/textview.c:251
 msgid "Copy this add_ress"
@@ -19968,11 +19985,11 @@ msgstr "Ostrzeżenie przed próbą oszustwa."
 
 #: src/toolbar.c:227 src/toolbar.c:2336
 msgid "Receive Mail from all Accounts"
-msgstr "Pobiera Pocztę ze wszystkich kont"
+msgstr "Pobiera wiadomości ze wszystkich kont"
 
 #: src/toolbar.c:228 src/toolbar.c:2341
 msgid "Receive Mail from current Account"
-msgstr "Pobiera Pocztę z bieżącego konta"
+msgstr "Pobiera wiadomości z bieżącego konta"
 
 #: src/toolbar.c:229 src/toolbar.c:2345
 msgid "Send Queued Messages"
@@ -19980,43 +19997,43 @@ msgstr "Wysyła zakolejkowane wcześniej wiadomości"
 
 #: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Compose Email"
-msgstr "Utwórz wiadomość"
+msgstr "Pisze wiadomość"
 
 #: src/toolbar.c:231
 msgid "Compose News"
-msgstr "Utwórz wieść"
+msgstr "Pisze wieść"
 
 #: src/toolbar.c:232 src/toolbar.c:2418 src/toolbar.c:2428
 msgid "Reply to Message"
-msgstr "Odpowiedz na wiadomość"
+msgstr "Odpowiada na wiadomość"
 
 #: src/toolbar.c:233 src/toolbar.c:2435 src/toolbar.c:2445
 msgid "Reply to Sender"
-msgstr "Odpowiedz nadawcy"
+msgstr "Odpowiada nadawcy"
 
 #: src/toolbar.c:234 src/toolbar.c:2452 src/toolbar.c:2462
 msgid "Reply to All"
-msgstr "Odpowiedz wszystkim"
+msgstr "Odpowiada wszystkim"
 
 #: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
 msgid "Reply to Mailing-list"
-msgstr "Odpowiedz na listę dyskusyjną"
+msgstr "Odpowiada na listę dyskusyjną"
 
 #: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
-msgstr "Otwórz wiadomość"
+msgstr "Otwiera wiadomość"
 
 #: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
 msgid "Forward Message"
-msgstr "Przekaż wiadomość"
+msgstr "Przekazuje wiadomość"
 
 #: src/toolbar.c:238 src/toolbar.c:2502
 msgid "Trash Message"
-msgstr "Wyrzuć wiadomość do kosza"
+msgstr "Wyrzuca wiadomość do kosza"
 
 #: src/toolbar.c:239 src/toolbar.c:2506
 msgid "Delete Message"
-msgstr "Usuń wiadomość"
+msgstr "Usuwa wiadomość"
 
 #: src/toolbar.c:240
 msgid "Delete duplicate messages"
@@ -20024,63 +20041,63 @@ msgstr "Usuń powielone wiadomości"
 
 #: src/toolbar.c:242 src/toolbar.c:2514
 msgid "Go to Previous Unread Message"
-msgstr "Przejdź do poprzedniej nieprzeczytanej wiadomości"
+msgstr "Przechodzi do poprzedniej nieprzeczytanej wiadomości"
 
 #: src/toolbar.c:243 src/toolbar.c:2518
 msgid "Go to Next Unread Message"
-msgstr "Przejdź do następnej nieprzeczytanej wiadomości"
+msgstr "Przechodzi do następnej nieprzeczytanej wiadomości"
 
 #: src/toolbar.c:247
 msgid "Mark Message"
-msgstr "Oznacz wiadomość"
+msgstr "Oznacza wiadomość"
 
 #: src/toolbar.c:248
 msgid "Unmark Message"
-msgstr "Usuń oznaczenie wiadomości"
+msgstr "Usuwa oznaczenie wiadomości"
 
 #: src/toolbar.c:249
 msgid "Lock Message"
-msgstr "Zablokuj wiadomość"
+msgstr "Blokuje wiadomość"
 
 #: src/toolbar.c:250
 msgid "Unlock Message"
-msgstr "Odblokuj wiadomość"
+msgstr "Odblokowuje wiadomość"
 
 #: src/toolbar.c:251
 msgid "Mark all Messages as read"
-msgstr "Oznacz wszystkie wiadomości jako przeczytane"
+msgstr "Oznacza wszystkie wiadomości jako przeczytane"
 
 #: src/toolbar.c:252
 msgid "Mark all Messages as unread"
-msgstr "Oznacz wszystkie wiadomości jako nieprzeczytane"
+msgstr "Oznacza wszystkie wiadomości jako nieprzeczytane"
 
 #: src/toolbar.c:253
 msgid "Mark Message as read"
-msgstr "Oznacz wiadomość jako przeczytaną"
+msgstr "Oznacza wiadomość jako przeczytaną"
 
 #: src/toolbar.c:254
 msgid "Mark Message as unread"
-msgstr "Oznacz wiadomość jako nieprzeczytaną"
+msgstr "Oznacza wiadomość jako nieprzeczytaną"
 
 #: src/toolbar.c:255
 msgid "Run folder processing rules"
-msgstr "Wykonaj zasady przetwarzania katalogu"
+msgstr "Wykonuje zasady przetwarzania katalogu"
 
 #: src/toolbar.c:257 src/toolbar.c:525
 msgid "Print"
-msgstr "Wydrukuj"
+msgstr "Drukuje"
 
 #: src/toolbar.c:258
 msgid "Learn Spam or Ham"
-msgstr "Zapamiętaj jako Spam lub Ham"
+msgstr "Zapamiętuje jako Spam lub Ham"
 
 #: src/toolbar.c:259
 msgid "Open folder/Go to folder list"
-msgstr "Otwórz katalog/Przejdź do spisu katalogów"
+msgstr "Otwiera katalog/Przechodzi do spisu katalogów"
 
 #: src/toolbar.c:262 src/toolbar.c:2524
 msgid "Send Message"
-msgstr "Wyślij wiadomość"
+msgstr "Wysyła wiadomość"
 
 #: src/toolbar.c:263 src/toolbar.c:2528
 msgid "Put into queue folder and send later"
@@ -20089,63 +20106,63 @@ msgstr ""
 
 #: src/toolbar.c:264 src/toolbar.c:2532
 msgid "Save to draft folder"
-msgstr "Zapisz w katalogu roboczych"
+msgstr "Zapisuje w katalogu roboczych"
 
 #: src/toolbar.c:265 src/toolbar.c:2536
 msgid "Insert file"
-msgstr "Wstaw plik"
+msgstr "Wstawia plik"
 
 #: src/toolbar.c:266 src/toolbar.c:2540
 msgid "Attach file"
-msgstr "Załącz plik"
+msgstr "Załącza plik"
 
 #: src/toolbar.c:267 src/toolbar.c:2544
 msgid "Insert signature"
-msgstr "Wstaw podpis"
+msgstr "Wstawia podpis"
 
 #: src/toolbar.c:268 src/toolbar.c:2548
 msgid "Replace signature"
-msgstr "Zastąp podpis"
+msgstr "Zastępuje podpis"
 
 #: src/toolbar.c:269 src/toolbar.c:2552
 msgid "Edit with external editor"
-msgstr "Edytuj w zewnętrznym edytorze"
+msgstr "Edytuje w zewnętrznym edytorze"
 
 #: src/toolbar.c:270 src/toolbar.c:2556
 msgid "Wrap long lines of current paragraph"
-msgstr "Zawiń długie wiersze w bieżącym akapicie"
+msgstr "Zawija długie wiersze w bieżącym akapicie"
 
 #: src/toolbar.c:271 src/toolbar.c:2560
 msgid "Wrap all long lines"
-msgstr "Zawiń wszystkie długie wiersze"
+msgstr "Zawija wszystkie długie wiersze"
 
 #: src/toolbar.c:274 src/toolbar.c:542 src/toolbar.c:2569
 msgid "Check spelling"
-msgstr "Sprawdź pisownię"
+msgstr "Sprawdza pisownię"
 
 #: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2574
 msgid "Sign"
-msgstr "Podpisz"
+msgstr "Podpisuje"
 
 #: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
 msgid "Encrypt"
-msgstr "Zaszyfruj"
+msgstr "Szyfruje"
 
 #: src/toolbar.c:278
 msgid "Claws Mail Actions Feature"
-msgstr "Cechy działań Claws Mail"
+msgstr "Działania Claws Mail"
 
 #: src/toolbar.c:279 src/toolbar.c:2601
 msgid "Cancel receiving"
-msgstr "Odwołaj pobierania"
+msgstr "Odwołuje pobieranie"
 
 #: src/toolbar.c:281 src/toolbar.c:2609
 msgid "Cancel receiving/sending"
-msgstr "Odwołaj pobieranie/wysyłanie"
+msgstr "Odwołuje pobieranie/wysyłanie"
 
 #: src/toolbar.c:282 src/toolbar.c:2349
 msgid "Close window"
-msgstr "Zamknij okno"
+msgstr "Zamyka okno"
 
 #: src/toolbar.c:284
 msgid "Claws Mail Plugins"
@@ -20158,7 +20175,7 @@ msgstr "Kosz"
 
 #: src/toolbar.c:495
 msgid "Get Mail"
-msgstr "Pobierz pocztę"
+msgstr "Pobierz wiadomości"
 
 #: src/toolbar.c:496
 msgid "Get"
@@ -20167,20 +20184,20 @@ msgstr "Pobierz"
 #: src/toolbar.c:498 src/toolbar.c:499
 msgctxt "Toolbar"
 msgid "Compose"
-msgstr "Nowa wiadomość"
+msgstr "Napisz wiadomość"
 
 #: src/toolbar.c:501
 msgctxt "Toolbar"
 msgid "Sender"
-msgstr "Nadawca"
+msgstr "Nadawcy"
 
 #: src/toolbar.c:502
 msgid "All"
-msgstr "Wszystkie"
+msgstr "Wszystkim"
 
 #: src/toolbar.c:503
 msgid "List"
-msgstr "Lista"
+msgstr "Na listę"
 
 #: src/toolbar.c:508 src/toolbar.c:2402 src/toolbar.c:2411
 msgid "Delete duplicates"
@@ -20248,11 +20265,11 @@ msgstr "Zatrzymaj wszystko"
 
 #: src/toolbar.c:968
 msgid "Compose News message"
-msgstr "Utwórz nową wieść"
+msgstr "Napisz nową wieść"
 
 #: src/toolbar.c:1007
 msgid "Learn spam"
-msgstr "Zapamiętaj jako spam"
+msgstr "Zapamiętuje jako spam"
 
 #: src/toolbar.c:1016
 msgid "Ham"
@@ -20260,7 +20277,7 @@ msgstr "Dobra"
 
 #: src/toolbar.c:1018
 msgid "Learn ham"
-msgstr "Zapamiętaj jako ham"
+msgstr "Zapamiętuje jako ham"
 
 #: src/toolbar.c:1956
 msgid "Message will be signed"
@@ -20280,11 +20297,11 @@ msgstr "Wiadomość nie zostanie zaszyfrowana"
 
 #: src/toolbar.c:2331
 msgid "Go to folder list"
-msgstr "Przejdź do listy katalogów"
+msgstr "Przejdź do spisu katalogów"
 
 #: src/toolbar.c:2337
 msgid "Receive Mail from selected Account"
-msgstr "Pobiera Poczty z wybranego konta"
+msgstr "Pobiera wiadomości z wybranego konta"
 
 #: src/toolbar.c:2353
 msgid "Open preferences"
@@ -20292,7 +20309,7 @@ msgstr "Otwórz Ustawienia"
 
 #: src/toolbar.c:2364
 msgid "Compose with selected Account"
-msgstr "Utwórz, używając wybranego konta"
+msgstr "Pisze wiadomość z wybranego konta"
 
 #: src/toolbar.c:2385
 msgid "Learn as..."
@@ -20300,11 +20317,11 @@ msgstr "Rozpoznaj jako..."
 
 #: src/toolbar.c:2395
 msgid "Learn as _Spam"
-msgstr "Zapamiętaj jako _Spam"
+msgstr "Zapamiętuje jako _Spam"
 
 #: src/toolbar.c:2396
 msgid "Learn as _Ham"
-msgstr "Zapamiętaj jako _Ham"
+msgstr "Zapamiętuje jako _Ham"
 
 #: src/toolbar.c:2403
 msgid "Delete duplicates options"
@@ -20356,12 +20373,12 @@ msgstr "W tej wiadomości nie ma żadnych adresów URL."
 
 #: src/uri_opener.c:129
 msgid "Included URLs:"
-msgstr "Załączone adresy URL:"
+msgstr "Adresy URL w treści:"
 
 #: src/uri_opener.c:209
 msgctxt "Dialog title"
 msgid "Open URLs"
-msgstr "Otwórz adresy URL"
+msgstr "Otwieranie adresów URL"
 
 #: src/uri_opener.c:225
 msgid "Open in browser"
@@ -20369,8 +20386,7 @@ msgstr "Otwórz w przeglądarce"
 
 #: src/uri_opener.c:237
 msgid "Any phishing URLs are shown in red, followed by the actual URL."
-msgstr ""
-"Każdy wyłudzający adres URL jest pokazywany na czerwono, a za nim sam adres."
+msgstr "Wyłudzające adresy URL zapisano na czerwono, a po nich same adresy."
 
 #: src/uri_opener.c:245
 msgid "Select All"
@@ -20429,28 +20445,28 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Witamy w Claws Mail\n"
+"Witaj w Claws Mail\n"
 "-----------------------\n"
 "\n"
-"Twoje konto pocztowe zostało już ustawione, więc możesz pobierać \n"
-"swoją pocztę naciskając na przycisk \"Pobierz Pocztę\" z paska "
-"narzędzi. \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"
 "\n"
 "Możliwości programu Claws Mail można rozszerzać za pomocą dodatkowych "
 "wtyczek,\n"
 "takich jak do filtrowania niechcianych wiadomości (spamu)\n"
 "z mechanizmem uczenia się (przy użyciu Bogofilter lub SpamAssassin), wtyczki "
 "do ochrony prywatności (PGP/Mime), agregator RSS, kalendarz i wiele innych\n"
-"Wszystkie wtyczki można włączyć i wyłączyć wybierając z menu Ustawienia/"
+"Wszystkie wtyczki można włączyć i wyłączyć, wybierając z menu Ustawienia/"
 "Wtyczki.\n"
 "\n"
 "Możesz w każdej chwili zmienić parametry swojego konta wybierając z menu\n"
-"\"/Ustawienia/Ustawiania dla bieżącego konta\"\n"
-"Parametry bardziej ogólne (dotyczące pracy całego programu) dostępne są w\n"
-"/Ustawienia/Ustawienia\n"
+"\"/Ustawienia/Dostosuj bieżące konto...\"\n"
+"Ustawienia bardziej ogólne (dotyczące pracy całego programu) dostępne są w\n"
+"/Ustawienia/Ustawienia...\n"
 "\n"
 "Po więcej szczegółów odnośnie pracy z programem zajrzyj do podręcznika\n"
-"użytkownika Claws Mail. Można go przeczytać wybierając\n"
+"użytkownika Claws Mail. Można go przeczytać, wybierając\n"
 "/Pomoc/Podręcznik użytkownika\n"
 "lub w internecie pod podanymi poniżej adresami.\n"
 "\n"
@@ -20472,34 +20488,34 @@ msgstr ""
 "\n"
 "DAROWIZNY\n"
 "-------\n"
-"Jeżeli chcesz przekazać jakikolwiek dar pieniężny \n"
+"Jeżeli chcesz przekazać jakikolwiek dar pieniężny\n"
 "dla projektu Claws Mail, to możesz to zrobić\n"
 "pod adresem <%s>.\n"
 "\n"
 
 #: src/wizard.c:620
 msgid "Please enter the mailbox name."
-msgstr "Proszę podać nazwę skrzynki (mailbox)."
+msgstr "Wpisz nazwę skrzynki pocztowej."
 
 #: src/wizard.c:648
 msgid "Please enter your name and email address."
-msgstr "Proszę podać swoje imię i nazwisko oraz adres email."
+msgstr "Wpisz swoje imię i nazwisko oraz adres pocztowy."
 
 #: src/wizard.c:659
 msgid "Please enter your receiving server and username."
-msgstr "Proszę podać adres serwera do pobierania poczty i nazwę użytkownika."
+msgstr "Wpisz adres serwera do pobierania wiadomości i nazwę użytkownika."
 
 #: src/wizard.c:669
 msgid "Please enter your username."
-msgstr "Proszę podać swoją nazwę użytkownika (login)."
+msgstr "Wpisz swoją nazwę użytkownika."
 
 #: src/wizard.c:679
 msgid "Please enter your SMTP server."
-msgstr "Proszę podać adres serwera SMTP."
+msgstr "Wpisz adres serwera SMTP."
 
 #: src/wizard.c:690
 msgid "Please enter your SMTP username."
-msgstr "Proszę podać swoją nazwę użytkownika (login) SMTP."
+msgstr "Wpisz swoją nazwę użytkownika SMTP."
 
 #: src/wizard.c:968
 msgid "Your name:"
@@ -20507,7 +20523,7 @@ msgstr "Twoje imię:"
 
 #: src/wizard.c:981
 msgid "Your email address:"
-msgstr "Twój adres e-mail:"
+msgstr "Twój adres pocztowy:"
 
 #: src/wizard.c:994
 msgid "Your organization:"
@@ -20515,7 +20531,7 @@ msgstr "Twoja organizacja:"
 
 #: src/wizard.c:1029
 msgid "Mailbox name:"
-msgstr "Nazwa skrzynki:"
+msgstr "Nazwa skrzynki pocztowej:"
 
 #: src/wizard.c:1036
 msgid ""
@@ -20532,11 +20548,11 @@ msgstr "Możesz podać numer portu dopisując go na końcu: \"mail.serwer.com:25
 
 #: src/wizard.c:1109
 msgid "SMTP server address:"
-msgstr "Adres serwer SMTP:"
+msgstr "Adres serwera SMTP:"
 
 #: src/wizard.c:1124
 msgid "(empty to use the same as receive)"
-msgstr "(pozostaw pusta, aby użyć tego samego co przy pobieraniu)"
+msgstr "(pozostaw pustym, aby użyć tego samego co przy pobieraniu)"
 
 #: src/wizard.c:1139
 msgid "SMTP username:"
@@ -20548,7 +20564,7 @@ msgstr "Hasło SMTP:"
 
 #: src/wizard.c:1169
 msgid "Use TLS to connect to SMTP server"
-msgstr "Użyj TLS przy połączeniu z serwerem SMTP"
+msgstr "Użyj TLS do łączenia z serwerem SMTP"
 
 #: src/wizard.c:1180 src/wizard.c:1623
 msgid "Use STARTTLS command to start encryption"
@@ -20568,7 +20584,7 @@ msgstr "Adres serwera:"
 
 #: src/wizard.c:1338
 msgid "Local mailbox:"
-msgstr "Lokalna skrzynka:"
+msgstr "Miejscowa skrzynka:"
 
 #: src/wizard.c:1506
 msgid "Server type:"
@@ -20583,15 +20599,15 @@ msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
-"Możesz podać numer portu dopisując go na końcu: \"mail.serwer.com:110\""
+"Możesz podać numer portu, dopisując go na końcu: \"mail.serwer.com:110\""
 
 #: src/wizard.c:1612
 msgid "Use TLS to connect to receiving server"
-msgstr "Użyj TLS do połączenia z serwerem pobierającym"
+msgstr "Użyj TLS do łączenia z serwerem pobierającym"
 
 #: src/wizard.c:1690
 msgid "IMAP server directory:"
-msgstr "Katalog serwera IMAP4:"
+msgstr "Katalog serwera IMAP:"
 
 #: src/wizard.c:1701
 msgid "Show only subscribed folders"
@@ -20607,7 +20623,7 @@ msgstr ""
 
 #: src/wizard.c:1828
 msgid "Claws Mail Setup Wizard"
-msgstr "Pomocnik ustawiania Claws Mail"
+msgstr "Pomocnik ustawień Claws Mail"
 
 #: src/wizard.c:1862
 msgid "Welcome to Claws Mail"
@@ -20621,12 +20637,11 @@ msgid ""
 "common mail options so that you can start to use Claws Mail in less than "
 "five minutes."
 msgstr ""
-"Witaj w pomocniku ustawiania Claws Mail.\n"
+"Witaj w pomocniku ustawień Claws Mail.\n"
 "\n"
-"Ten pomocnik pomoże określić podstawowe dane\n"
-"użytkownika, oraz parametrach konta pocztowego. \n"
-"Dzięki czemu po mniej niż pięciu minutach \n"
-"Claws Mail będzie gotowy do pracy."
+"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"
@@ -20657,5 +20672,58 @@ msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
-"Claws Mail jest gotowy.\n"
-"Naciśnij Zapisz, aby rozpocząć jego używanie."
+"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 16c87bcd4..2709285c2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,8 +9,8 @@ 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-03-27 09:41+0100\n"
-"PO-Revision-Date: 2022-03-31 22:45-0300\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"
 "Language-Team: Portuguese <translators at lists.claws-mail.org>\n"
 "Language: pt_BR\n"
@@ -56,7 +56,7 @@ 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/mainwindow.c:518 src/messageview.c:213
+#: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Editar"
@@ -85,7 +85,7 @@ 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:552
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copiar"
@@ -133,19 +133,20 @@ msgstr " Definir como conta _padrão "
 #: 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/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:926 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:841 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: 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/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/prefs_actions.c:920 src/prefs_actions.c:946 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/summary_search.c:495
-#: src/summary_search.c:785
+#: 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/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -178,24 +179,24 @@ msgstr "Excluir conta"
 #: 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:10736
-#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
-#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
-#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: 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/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/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1193 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:890 src/main.c:2286 src/mainwindow.c:4009
-#: src/mainwindow.c:4212 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:1818
-#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
-#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
+#: 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/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
@@ -206,7 +207,7 @@ msgstr "Excluir conta"
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
 #: src/plugins/keyword_warner/keyword_warner.c:196
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
 #: src/plugins/managesieve/sieve_editor.c:435
 #: src/plugins/managesieve/sieve_editor.c:632
@@ -218,21 +219,20 @@ msgstr "Excluir conta"
 #: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2030
 #: 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_actions.c:1315
-#: src/prefs_customheader.c:177 src/prefs_customheader.c:693
-#: 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_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:294 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/toolbar.c:3108
-#: src/wizard.c:1833
+#: 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_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/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -240,11 +240,11 @@ msgstr "_Cancelar"
 #: 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/plugins/att_remover/att_remover.c:429
-#: src/plugins/mailmbox/plugin_gtk.c:335
+#: 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:2032 src/prefs_actions.c:1105
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "E_xcluir"
@@ -263,17 +263,17 @@ msgstr "'Receber mensagem' busca as mensagens das contas marcadas"
 #: 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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1860
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: 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
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -329,13 +329,13 @@ msgstr ""
 "%s"
 
 #: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9751 src/ldaputil.c:334
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1829
-#: src/plugins/vcalendar/vcal_folder.c:1847
-#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
+#: 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
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -483,13 +483,13 @@ msgstr ""
 "Deseja realmente substituir todos os nomes de\n"
 "atributos pelos valores originais?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:1673 src/main.c:412
-#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -501,13 +501,14 @@ msgstr ""
 msgid "_No"
 msgstr "_Não"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -542,7 +543,7 @@ msgid "New attribute name:"
 msgstr "Novo nome de atributo:"
 
 #: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
 #: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
@@ -555,14 +556,13 @@ 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/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: 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/mimeview.c:1819 src/password_gtk.c:213
-#: src/plugins/archive/archiver_gtk.c:575
+#: 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
@@ -626,7 +626,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:474 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Endereço"
@@ -662,7 +662,7 @@ msgid "Contact"
 msgstr "Contato"
 
 #: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1303 src/editgroup.c:290
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Notas"
 
@@ -679,7 +679,7 @@ 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/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: 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"
@@ -688,7 +688,7 @@ msgstr "Endereço de email"
 msgid "_Book"
 msgstr "Li_vro"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Ferramentas"
@@ -791,7 +791,7 @@ 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/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: 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
@@ -950,7 +950,7 @@ msgstr ""
 "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:334 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Excluir a pasta"
 
@@ -1063,7 +1063,7 @@ msgid "Person"
 msgstr "Pessoa"
 
 #: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Pasta"
 
@@ -1188,18 +1188,18 @@ 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:9825
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Nota"
 
 #: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: 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
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Erro"
@@ -1318,63 +1318,63 @@ 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:1251
+#: src/common/session.c:201 src/imap.c:1261
 msgid "TLS handshake failed\n"
 msgstr "Não foi possível efetuar o handshake do TLS\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "Nenhum método SMTP AUTH disponível\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "O método SMTP AUTH selecionado não está disponível\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "resposta incorreta do SMTP\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 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:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "não foi possível iniciar a sessão STARTTLS\n"
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Tempo limite para o socket I/O.\n"
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Tempo esgotado na conexão.\n"
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: falha na conexão (%s).\n"
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: endereço desconhecido.\n"
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: falha na procura pelo endereço (%s).\n"
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escrever em fd%d: %s\n"
@@ -1711,7 +1711,7 @@ msgstr ""
 msgid "_Add..."
 msgstr "_Adicionar..."
 
-#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: 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/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
@@ -1724,7 +1724,7 @@ msgstr "_Remover"
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Mensagem"
 
@@ -1736,7 +1736,7 @@ msgstr "Orto_grafia"
 msgid "_Options"
 msgstr "_Opções"
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -1796,7 +1796,7 @@ msgstr "Com _quebra de linhas"
 msgid "_Unwrapped"
 msgstr "_Sem quebra de linhas"
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Selecionar _tudo"
@@ -1901,47 +1901,47 @@ msgstr "Sistema de _privacidade"
 msgid "_Priority"
 msgstr "_Prioridade"
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Codificação dos caracteres"
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Europeu Ocidental"
 
-#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chinês"
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tailandês"
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Livro de endereços"
 
@@ -1949,11 +1949,11 @@ msgstr "_Livro de endereços"
 msgid "_Template"
 msgstr "_Modelo"
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "_Ações"
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_Sobre"
 
@@ -1989,12 +1989,12 @@ msgstr "Exibir _régua"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Todos"
 
-#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Remetente"
@@ -2019,27 +2019,27 @@ msgstr "_Baixa"
 msgid "_Lowest"
 msgstr "Bai_xíssima"
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automática"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 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:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "U_nicode (UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 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:896 src/messageview.c:365
+#: src/compose.c:764 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:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turco (ISO-8859-_9)"
 
@@ -2167,7 +2167,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Tem certeza?"
 
-#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2227,7 +2227,7 @@ 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/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Enviar"
 
@@ -2393,7 +2393,7 @@ msgstr "A conta selecionada não é NNTP: é impossível enviar a mensagem."
 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:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Cancelar o envio"
 
@@ -2423,9 +2423,11 @@ msgstr ""
 msgid "Mime type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:468
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Tamanho"
 
@@ -2550,47 +2552,58 @@ msgstr ""
 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."
+"A comunicação via socket com um editor externo não está disponível no "
+"Windows."
 
 #: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Não foi possível gerar o seguinte comando:\n"
+"Não foi possível gerar o seguinte comando de editor externo:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9750
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "O editor externo encerrou com um erro: %s"
 
-#: src/compose.c:9822
+#: src/compose.c:9828
+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
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %"
+"%s"
 msgstr ""
 "O editor externo ainda está ativo.\n"
 "Deseja forçar o término do processo?\n"
-"Id do processo: %"
+"%s"
 
-#: src/compose.c:10229 src/messageview.c:1094
+#: src/compose.c:10245 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:10432
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
-#: src/compose.c:10436
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Não foi possível salvar o rascunho"
 
-#: src/compose.c:10437
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2598,24 +2611,24 @@ msgstr ""
 "Não foi possível salvar o rascunho.\n"
 "Deseja cancelar a saída ou descartar essa mensagem?"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "_Cancelar a saída"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "_Descartar a mensagem"
 
-#: src/compose.c:10627 src/compose.c:10641
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Selecione o arquivo"
 
-#: src/compose.c:10655
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
-#: src/compose.c:10657
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2624,50 +2637,50 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
-#: src/compose.c:10734
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
-#: src/compose.c:10735
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: src/compose.c:10736 src/compose.c:10741
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: src/compose.c:10740
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Essa mensagem foi modificada. Deseja salvar as últimas alterações?"
 
-#: src/compose.c:10741
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Não salvar"
 
-#: src/compose.c:10812
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
-#: src/compose.c:10814
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
-#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10834 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:10892
+#: src/compose.c:10911
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2676,7 +2689,7 @@ msgstr ""
 "O tamanho do texto a ser colado excede o limite (%dKiB) para colagens.\n"
 "Anexe-o como um arquivo."
 
-#: src/compose.c:11708
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2691,20 +2704,20 @@ msgstr[1] ""
 "Você deseja inserir o conteúdo dos %d arquivos no corpo da mensagem ou anexá-"
 "los ao email?"
 
-#: src/compose.c:11714
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
-#: src/compose.c:11715
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "_Anexar"
 
-#: src/compose.c:11930
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Erro no formato da citação, na linha %d."
 
-#: src/compose.c:12226
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2735,7 +2748,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Relatório de depuração"
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
 #: src/uri_opener.c:226
 msgid "Close"
 msgstr "Fechar"
@@ -2922,7 +2935,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:2443
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Arquivo"
 
@@ -2930,52 +2943,48 @@ msgstr "Arquivo"
 msgid "Add New Addressbook"
 msgstr "Adicionar um novo Livro de Endereços"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Você deve informar um nome para o grupo."
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
+#: src/editgroup.c:292
+msgid "Edit group data"
 msgstr "Editar os dados do grupo"
 
-#: src/editgroup.c:323 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Endereços no grupo"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Endereços disponíveis"
 
-#: src/editgroup.c:452
-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"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Endereços no grupo"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
+#: src/editgroup.c:494
+msgid "Edit group details"
 msgstr "Editar os detalhes do grupo"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "Adicionar um novo grupo"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Editar a pasta"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
@@ -3004,13 +3013,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:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
 #: 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:3197
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Porta"
@@ -3073,7 +3082,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4227
 msgid "TLS"
 msgstr "TLS"
 
@@ -3095,8 +3104,8 @@ msgid ""
 "sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
-"Habilitar conexão segura com o servidor LDAP via TLS. Caso a conexão não "
-"se efetue, certifique-se de verificar a configuração correta em ldap.conf "
+"Habilitar conexão segura com o servidor LDAP via TLS. Caso a conexã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:487
@@ -3243,8 +3252,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:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Exibir a senha"
@@ -3268,7 +3277,7 @@ msgstr ""
 "O número máximo de entradas que devem ser apresentadas como resultado da "
 "pesquisa."
 
-#: src/editldap.c:776 src/prefs_account.c:4044
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Básico"
 
@@ -3356,11 +3365,11 @@ msgstr "Adicionar uma nova entrada vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Impossível configurar o certificado do cliente.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "não foi possível obter a extensão do xover\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "não foi possível obter a extensão do xhdr\n"
 
@@ -3427,8 +3436,8 @@ 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:1178 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: 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
 msgid "None"
 msgstr "Nenhum"
@@ -3439,7 +3448,7 @@ msgstr "Nenhum"
 msgid "Default"
 msgstr "Padrão"
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Completo"
@@ -3682,7 +3691,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:8485
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 
@@ -3767,11 +3776,19 @@ msgstr ""
 "O arquivo %s está vazio ou foi corrompido. Deseja usar o arquivo de backup "
 "de %s?"
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr "a regra não é associada à conta\n"
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+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"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3780,137 +3797,151 @@ msgstr ""
 "a regra é associada à conta [id=%d, nome='%s'], correspondendo à conta "
 "atualmente usada para recuperar as mensagens\n"
 
-#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
-#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
-#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "NON_EXISTENT"
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
-"a regra é associada a conta, não correspondendo à conta atualmente usada "
+"a regra é associada à conta, não correspondendo à conta atualmente usada "
 "para recuperar as mensagens\n"
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
-"a regra é associada a conta [id=%d, nome='%s'], não correspondendo à conta "
+"a regra é associada à conta [id=%d, nome='%s'], não correspondendo à conta "
 "atualmente usada para recuperar as mensagens [id=%d, nome='%s']\n"
 
-#: src/filtering.c:646
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"a regra não é associada a conta, entretanto todas as regras serão aplicadas "
-"a pedido do usuário\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:652
+#: 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"
+
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
-"a regra não é associada a conta [id=%d, nome='%s'], entretanto todas as "
-"regras serão aplicadas a pedido do usuário\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:670
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "a regra é associada a conta, ignorada a pedido do usuário\n"
+
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "a regra é associada a conta [id=%d, nome='%s'], ignorada a pedido do "
 "usuário\n"
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
-msgstr "a regra é associada a conta, ignorada a pedido do usuário\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "a regra é associada a conta, correspondendo à conta atual\n"
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"a regra é associada a conta [id=%d, nome='%s'], não correspondendo à conta "
+"a regra é associada a conta [id=%d, nome='%s'], correspondendo à conta "
 "atual [id=%d, nome='%s']\n"
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr "a regra é associada a conta, não correspondendo à conta atual\n"
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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 ""
-"a regra é associada a conta [id=%d, nome='%s'], conta atual [id=%d, "
-"nome='%s']\n"
+"a regra é associada a conta [id=%d, nome='%s'], não correspondendo à conta "
+"atual [id=%d, nome='%s']\n"
 
-#: src/filtering.c:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "aplicando a ação [ %s ]\n"
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "não foi possível aplicar a ação\n"
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "não outro processamento após a ação [ %s ]\n"
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "regra de processamento '%s' [ %s ]\n"
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "regra de processamento <sem nome> [ %s ]\n"
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "regra desabilitada '%s' [ %s ]\n"
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "regra desabilitada <sem nome> [ %s ]\n"
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "indeterminado"
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "incorporação"
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr "manualmente"
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "processamento da pasta"
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "pré-processamento"
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "pós-processamento"
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3927,11 +3958,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -4013,17 +4044,17 @@ 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:433
+#: 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:2104
+#: src/plugins/vcalendar/vcal_folder.c:2102
 #, 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:445 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2111
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2109
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
@@ -4055,7 +4086,7 @@ msgstr "Marcar recursi_vamente todas como não lidas"
 msgid "R_un processing rules"
 msgstr "E_xecutar regras de processamento"
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Pesquisar na pasta..."
 
@@ -4108,10 +4139,10 @@ msgstr "Marcar todas como lidas"
 
 #: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
-"Deseja realmente marcar todas as mensagens dessa pasta e suas sub-pastas "
+"Deseja realmente marcar todas as mensagens desta pasta e suas sub-pastas "
 "como lidas?"
 
 #: src/folderview.c:873 src/summaryview.c:4273
@@ -4124,22 +4155,22 @@ msgstr "Marcar todas como não lidas"
 
 #: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
-"Deseja realmente marcar todas as mensagens dessa pasta e suas sub-pastas "
+"Deseja realmente marcar todas as mensagens desta pasta e suas sub-pastas "
 "como não lidas?"
 
 #: src/folderview.c:879 src/summaryview.c:4319
 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:4693
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Vasculhando a pasta %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Vasculhando a pasta %s..."
@@ -4186,7 +4217,7 @@ msgstr "Abrindo a pasta %s..."
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 
@@ -4198,7 +4229,7 @@ msgstr "Excluir todas as mensagens da Lixeira?"
 msgid "_Empty trash"
 msgstr "_Esvaziar a Lixeira"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 
@@ -4312,7 +4343,7 @@ msgstr "Nome do newsgroup"
 msgid "Messages"
 msgstr "Mensagens"
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Tipo"
 
@@ -4338,11 +4369,11 @@ msgstr "desconhecido"
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista do newsgroup."
 
-#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Pronto."
 
-#: src/grouplistdialog.c:503
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups recebidos (%s lidos)"
@@ -4371,7 +4402,7 @@ 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:862
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4460,48 +4491,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "adiciona suporte a conexões criptografadas a servidores\n"
 
 #: src/gtk/about.c:463
-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"
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "permite a conversão de e para diferentes conjuntos de caracteres\n"
 
-#: src/gtk/about.c:484
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "adiciona suporte a endereços IPv6\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "adiciona suporte a livros de endereços do PalmOS\n"
 
-#: src/gtk/about.c:494
+#: 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"
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "adiciona suporte a servidores IMAP e NNTP\n"
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "adiciona suporte a temas SVG\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "adiciona suporte ao gerenciamento de seção\n"
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "adiciona suporte a detecção de mudanças na conexão de rede\n"
 
-#: src/gtk/about.c:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "adiciona suporte a temas SVG\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "adiciona suporte à autenticação OAuth2\n"
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4512,7 +4546,7 @@ msgstr ""
 "pela Free Software Foundation; tanto a versão 3, ou (opcionalmente) qualquer "
 "versão posterior."
 
-#: src/gtk/about.c:574
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4524,7 +4558,7 @@ msgstr ""
 "ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License para maiores "
 "detalhes."
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4532,73 +4566,73 @@ 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:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Estatísticas da sessão\n"
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Início: %s\n"
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Tráfego de entrada\n"
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mensagens recebidas: %d\n"
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Tráfego de saída\n"
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Mensagens novas/redirecionadas: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Mensagens respondidas: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Mensagens encaminhadas: %d\n"
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de mensagens enviadas: %d\n"
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "Sobre o Claws Mail"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Informação"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Autores"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "_Recursos"
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Licença"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "_Notas do lançamento"
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "_Estatísticas"
 
@@ -5077,7 +5111,7 @@ msgstr "Precedência"
 msgid "Precedence:"
 msgstr "Precedência:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Organização"
 
@@ -5290,7 +5324,7 @@ msgid "Folder contains marked messages"
 msgstr "A pasta contém mensagens marcadas"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+msgid "IMAP folder which contains subfolders only"
 msgstr "Pasta IMAP que contém somente sub-pastas"
 
 #: src/gtk/icon_legend.c:92
@@ -5461,15 +5495,15 @@ msgstr "_Aplicar"
 msgid "Page Index"
 msgstr "Índice"
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Esconder"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
 #: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
-#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Conta"
@@ -5932,8 +5966,7 @@ msgstr "(Sem assunto)"
 msgid "Error:"
 msgstr "Erro:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Nome do arquivo:"
@@ -5946,195 +5979,195 @@ msgstr "Tamanho do arquivo:"
 msgid "Load Image"
 msgstr "Carregar imagem"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "A conexão com o IMAP foi interrompida\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Erro no IMAP em %s:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "autenticado"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "não autenticado"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "estado ruim"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "erro no fluxo"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erro de análise (muito provavelmente uma submissão não-RFC do servidor)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "conexão recusada"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "erro de memória"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "erro fatal"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "erro de protocolo (muito provavelmente uma submissão não-RFC do servidor)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "conexão não aceita"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "erro no APPEND"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "erro no NOOP"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "erro no LOGOUT"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "erro no CAPABILITY"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "erro no CHECK"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "erro no CLOSE"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "erro no EXPUNGE"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "erro no COPY"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "erro no UID COPY"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "erro no CREATE"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "erro no DELETE"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "erro no EXAMINE"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "erro no FETCH"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "erro no UID FETCH"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "erro no LIST"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "erro no LOGIN"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "erro no LSUB"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "erro no RENAME"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "erro no SEARCH"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "erro no UID SEARCH"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "erro no SELECT"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "erro no STATUS"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "erro no STORE"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "erro no UID STORE"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "erro no SUBSCRIBE"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "erro no UNSUBSCRIBE"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "erro no STARTTLS"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "erro no INVAL"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "erro no EXTENSION"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "erro no SASL"
 
-#: src/imap.c:751
+#: src/imap.c:753
 msgid "TLS error"
 msgstr "erro no TLS"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Erro desconhecido [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6146,7 +6179,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:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6158,7 +6191,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:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6170,7 +6203,7 @@ 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:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6182,7 +6215,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:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6194,7 +6227,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:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -6204,37 +6237,37 @@ msgstr ""
 "\n"
 "Erro no OAuth2. Verifique e corrija as configurações do OAuth2 da sua conta."
 
-#: src/imap.c:1004
+#: src/imap.c:1014
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Erro na conexão com %s: login recusado.%s"
 
-#: src/imap.c:1008
+#: src/imap.c:1018
 #, 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:1026
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1043 src/imap.c:1046
 #, 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:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 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:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 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:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 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"
@@ -6242,113 +6275,113 @@ msgid ""
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
-"Essa conexão está configurada para ser segura usando TLS, mas o TLS "
-"não está disponível nessa compilação do Claws Mail. \n"
+"Essa conexão está configurada para ser segura usando TLS, mas o TLS não está "
+"disponível nessa compilação do Claws Mail. \n"
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 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:1192
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor IMAP: %s:%d..."
 
-#: src/imap.c:1257
+#: src/imap.c:1267
 #, 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:1260
+#: src/imap.c:1270
 #, 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:1292 src/imap.c:4164
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "Não foi possível iniciar sessão STARTTLS.\n"
 
-#: src/imap.c:1364
+#: src/imap.c:1374
 #, 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:1367
+#: src/imap.c:1377
 #, 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:1795
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: src/imap.c:2526
+#: src/imap.c:2536
 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:2610
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
-#: src/imap.c:2992
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Procurando por pastas não inscritas em %s..."
 
-#: src/imap.c:2995
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Procurando por sub-pastas de %s..."
 
-#: src/imap.c:3286
+#: src/imap.c:3296
 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:3299
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
-#: src/imap.c:3429
+#: src/imap.c:3439
 #, 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:3542
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
-#: src/imap.c:3821
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
-#: src/imap.c:3906
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Marcando as mensagens..."
 
-#: src/imap.c:4009
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
-#: src/imap.c:4161
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "O servidor depende do STARTTLS para efetuar a autenticação.\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
-#: src/imap.c:4176
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6357,20 +6390,20 @@ 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:4184
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
-#: src/imap.c:4407
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
-#: src/imap.c:5108
+#: src/imap.c:5118
 #, 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:6143
+#: src/imap.c:6153
 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"
@@ -6421,7 +6454,7 @@ msgstr "_Inscrições"
 msgid "_Subscribe..."
 msgstr "I_nscrever..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "Cance_lar inscrição..."
 
@@ -6453,21 +6486,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:422 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 #, 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:423
+#: 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:2097
+#: src/plugins/vcalendar/vcal_folder.c:2095
 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:453 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2117
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2115
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6475,32 +6508,33 @@ msgstr ""
 "Não foi possível renomear a pasta.\n"
 "O nome fornecido não é permitido."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Selecione a pasta para onde a pasta '%s' será movida"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 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/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
+#: src/plugins/rssyl/rssyl_cb_menu.c:190
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"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"
+"Todas as pastas e mensagens dentro de '%s' serão excluídas permanentemente.\n"
+"Não será possível recuperá-las.\n"
 "\n"
 "Confirma a exclusão?"
 
-#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: 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:2050
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."
@@ -6527,7 +6561,7 @@ msgstr "_Pesquisar"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Selecione uma sub-pasta de %s para inscrever: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Inscrever"
 
@@ -6764,142 +6798,142 @@ msgstr "Selecione o arquivo do Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "O Claws Mail necessita de acesso à rede para obter as mensagens."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s falhou\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Recebendo novas mensagens"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Recebendo"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Pronto (%d mensagem, (%s) recebida)"
 msgstr[1] "Pronto (%d mensagens, (%s) recebidas)"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Pronto (não há novas mensagens)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Ocorreu uma falha na conexão"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: 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
 msgid "Locked"
 msgstr "Travada"
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Tempo esgotado"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Concluído (%d mensagem nova)"
 msgstr[1] "Concluído (%d mensagens novas)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Concluído (não há novas mensagens)"
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor POP3: %s:%d..."
 
-#: src/inc.c:930
+#: 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"
 
-#: src/inc.c:934
+#: 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"
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Recuperando mensagens de %s (%s)..."
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando a mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recebendo (%d mensagem), (%s) recebida)"
 msgstr[1] "Recebendo (%d mensagens, (%s) recebidas)"
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Ocorreu uma falha na conexão com %s:%d."
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro durante o processamento da mensagem."
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6908,37 +6942,37 @@ msgstr ""
 "Ocorreu um erro durante o processamento da mensagem:\n"
 "%s"
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Erro de socket."
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo servidor remoto."
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "A conexão com %s:%d foi fechada pelo servidor remoto."
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "A caixa postal está travada."
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6947,11 +6981,11 @@ msgstr ""
 "A caixa postal está travada:\n"
 "%s"
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6960,7 +6994,7 @@ msgstr ""
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6968,46 +7002,46 @@ msgstr ""
 "O tempo da sessão está esgotado. Você pode recuperá-la aumentando o valor do "
 "tempo limite em Preferências/Outros/Miscelânea."
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Tempo esgotado na conexão com %s:%d."
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "A incorporação foi cancelada\n"
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: 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:1834
+#: 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
 msgid "seconds"
 msgstr "segundos"
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/inc.c:1661
+#: 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?"
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sVocê está trabalhando em modo desconectado. Redefinir?"
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "Apenas _uma vez"
 
@@ -7437,829 +7471,829 @@ msgstr "NetworkManager: a rede está conectada.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: a rede está desconectada.\n"
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "E_xibir"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "_Configurações"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "Adicionar caixa _postal"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Mudar a ordenação da caixa postal..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "Importar arquivo _mbox..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "Exporta para arquivo m_box..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "Exportar a seleção para um _arquivo mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "Esvaziar todas as _Lixeiras"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "Salvar a _mensagem como..."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "Salvar a _parte como..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Con_figuração da página..."
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "_Sincronizar pastas"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Selecionar _discussão"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Localizar na mensagem atual..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "Pesquisa _rápida"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "_Mostrar ou esconder"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "_Barra de ferramentas"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Definir colu_nas visíveis"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "Na lista de _pastas..."
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "Na lista de _mensagens..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "_Aparência"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "_Atrair pelo assunto"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "E_xpandir todas as discussões"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "Recolher _todas as discussões"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Ir para"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "Mensagem _anterior"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Próxima mensagem"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Mensagem não _lida anterior"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Próxima mensagem _não lida"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "_Mensagem nova anterior"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Próxima m_ensagem nova"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Mensagem ma_rcada anterior"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Próxima mensa_gem marcada"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Mensagem rot_ulada anterior"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Próxima mensagem ro_tulada"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:594
 msgid "Previously opened message"
 msgstr "Mensagem aberta anterior"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Próxima mensagem aberta"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Mensagem pai"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Próxima pa_sta não lida"
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "P_asta..."
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Próxima parte"
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Parte anterior"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Rolagem da mensagem"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Linha anterior"
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Próxima linha"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Próxima página"
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "_Decodificação"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "Abrir em uma nova _janela"
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Código-_fonte da mensagem"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Parte da mensagem"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Visualizar como texto"
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Abrir"
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Ci_tações"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "At_ualizar sumário"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "_Receber"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Receber da conta _atual"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Receber de _todas as contas"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "_Cancelar a recepção"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "_Enviar mensagens da Fila de Saída"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "Escrever uma mensa_gem de email"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "Escrever artigo de _Newsgroup"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:665 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Responder _para"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "_Lista de discussão"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "_Acompanhar o assunto e responder"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Encaminhar como _anexo"
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
 #: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Re_direcionar"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "_Lista de discussão"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Enviar _mensagem"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "_Ajuda"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Cancelar inscrição"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "_Ver arquivo"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "_Contatar o administrador"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "M_over..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Mover para a _Lixeira"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "E_xcluir..."
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Mover a discussão para a _Lixeira"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "_Excluir a discussão"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Cancelar uma mensagem de Ne_wsgroup"
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "_Marcar"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "_Desmarcar"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Marcar como _lida"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Marcar como _não lida"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Marcar todas na pasta como lidas"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Marcar todas na pasta como não lidas"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorar discussão"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Deixar de ignorar discussão"
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Observar discussão"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Deixar de observar discussão"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Marcar como _spam"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Marcar como _não-spam"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Ró_tulo colorido"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "E_tiquetas"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "Reedi_tar"
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Verificar assinatura"
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Adicionar remetente ao Li_vro de Endereços"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "_Coletar endereços"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Da _pasta atual..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Das _mensagens selecionadas..."
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "Filtrar _todas as mensagens da pasta"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "Filtrar as mensagens _selecionadas"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "E_xecutar regras de processamento da pasta"
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Criar regra de _filtragem"
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automaticamente"
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Pelo _remetente (De:)"
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Pelo _destinatário (Para:)"
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Pelo a_ssunto"
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Pelo _emissor"
 
-#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Criar re_gra de processamento"
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Listar _URLs..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "Procurar por _novas mensagens em todas as pastas"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Excluir mensagens _duplicadas"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "Na pasta _selecionada"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "Em _todas as pastas"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "_Executar"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "Exp_urgar"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr "Cert_ificados TLS"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Relatório de _filtragem"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Relatório da _rede"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Relatório de _depuração"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "Es_quecer todas as senhas da sessão"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr "Es_quecer a senha primária"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "M_udar conta atual"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "Preferências da _conta atual..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "Criar uma _nova conta..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "_Editar contas..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "_Preferências..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "P_ré-processamento..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "Pó_s-processamento..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Filtragem..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "_Modelos..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Ações..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "E_tiquetas..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "_Plugins..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ na Internet (contribuição dos usuários)"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "_Legendas dos ícones"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Definir como o cliente padrão"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "Modo _desconectado"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Barra de men_u"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "Visualização da _mensagem"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "Barra de _status"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "_Cabeçalhos das colunas"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "A_grupar por assunto"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Ocultar discussões lidas"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "Ocultar mensagens _lidas"
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Ocultar as mensagens excluídas"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "_Tela inteira"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Mostrar todos os cabeçal_hos"
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Recolher _tudo"
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Recolher a partir do nível _2"
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Recolher a partir do nível _3"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Texto _abaixo do ícones"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Texto ao _lado do ícones"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Somente í_cones"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Somente _texto"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "_Padrão"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "_Três colunas"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "Ampliar a área de _mensagens"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "Amplicar a _lista de mensagens"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "_Tela pequena"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "Pelo _número"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "Pelo _tamanho"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "Pela _data"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Pela data da discussão"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Pelo a_ssunto"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "Pela _cor do rótulo"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Pela etiqueta"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "Pela _marca"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "Pelo s_tatus"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "Pelo ane_xo"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Pela _pontuação"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Pelo tra_vamento"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "Não _ordenar"
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Crescente"
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Decrescente"
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Autodetectar"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6489
 msgid "Modify tags..."
 msgstr "Modificar etiquetas..."
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Ocorreram alguns erros. Clique aqui para ver o relatório."
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Selecione a conta"
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Relatório da rede"
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Relatório de depuração da filtragem/processamento"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "relatório de filtragem habilitado\n"
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "relatório de filtragem desabilitado\n"
 
-#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
-#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
+#: 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
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Excluir todas as mensagens da Lixeira?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "Não sair"
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Adicionar caixa postal"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8273,18 +8307,18 @@ msgstr ""
 "Se for especificada a localização de uma caixa postal já\n"
 "existente, ela será verificada automaticamente."
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa postal '%s' já existe."
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Caixa postal"
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8294,58 +8328,58 @@ msgstr ""
 "Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
 "pasta."
 
-#: src/mainwindow.c:3389
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Sair do Claws Mail?"
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Sincronizar"
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Não foi encontrada nenhuma mensagem duplicada na pasta selecionada.\n"
 
-#: src/mainwindow.c:4711
+#: src/mainwindow.c:4709
 #, 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:4715
+#: src/mainwindow.c:4713
 #, 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"
@@ -8354,61 +8388,61 @@ msgstr[0] ""
 msgstr[1] ""
 "%d mensagens duplicadas foram marcadas para exclusão na pasta selecionada.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Excluindo mensagens duplicadas em todas as pastas..."
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4757
 #, 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:4764
+#: src/mainwindow.c:4762
 #, 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:4926 src/messageview.c:2647
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Selecione a pasta de destino"
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
-#: src/mainwindow.c:5037
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
-#: src/mainwindow.c:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5156
 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:5249
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "O Claws Mail foi registrado como o cliente padrão."
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5249
 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:5265 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Vasculhando a pasta %s%c%s..."
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8733,7 +8767,7 @@ msgstr ""
 "  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:7290
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
@@ -8773,7 +8807,7 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Remover a caixa postal"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -8847,8 +8881,8 @@ msgstr ""
 #, 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."
+"Erro durante a checagem da assinatura. Clique no ícone ou pressione '%s' "
+"para tentar novamente."
 
 #: src/mimeview.c:1231
 msgid "Checking signature..."
@@ -8858,9 +8892,9 @@ msgstr "Verificando a assinatura..."
 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
-#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
-#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
-#: src/plugins/fancy/fancy_viewer.c:538
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -8871,68 +8905,68 @@ msgstr ""
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 
-#: src/mimeview.c:1839
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"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 salvamento da parte #%d da mensagem. Deseja cancelar a "
+"Ocorreu um erro no salvamento da parte %d da mensagem. Deseja cancelar a "
 "operação ou ignorar o erro e continuar?"
 
-#: src/mimeview.c:1842
-msgid "Error saving all message parts"
-msgstr "Erro no salvamento de todas as partes da mensagem"
-
 #: src/mimeview.c:1843
-msgid "Skip"
+msgid "Error saving message part"
+msgstr "Erro no salvamento de parte da mensagem"
+
+#: src/mimeview.c:1844
+msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/mimeview.c:1843
-msgid "Skip all"
-msgstr "Ignorar tudo"
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "Ignorar todos"
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1856
 #, 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:1861
+#: src/mimeview.c:1868
 #, 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:1866
+#: src/mimeview.c:1873
 #, 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:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1910 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:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1917 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:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
 #: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Salvar como"
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Abrir com"
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8941,7 +8975,7 @@ msgstr ""
 "Digite o comando para abrir o arquivo:\n"
 "('%s' será substituído pelo nome do arquivo)"
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8952,11 +8986,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Executar binário não confiável?"
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8968,20 +9002,20 @@ msgstr ""
 "\n"
 "Deseja executar esse arquivo?"
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Executar o binário"
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9094,79 +9128,79 @@ msgstr "Cancelar a inscrição no Newsgroup"
 msgid "Rename newsgroup folder"
 msgstr "Renomear a pasta do Newsgroup"
 
-#: src/oauth2.c:239
+#: src/oauth2.c:241
 msgid "OAuth2 missing authorization code\n"
 msgstr "Falta o código de autorização do OAuth2\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "Erro na conexão com o OAuth2\n"
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:257 src/oauth2.c:397
 msgid "OAuth2 TLS connection error\n"
 msgstr "Erro na conexão TLS com o OAuth2\n"
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "O token de acesso ao OAuth2 foi obtido\n"
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "O token de acesso ao OAuth2 não foi obtido\n"
 
-#: src/oauth2.c:355
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "O token de atualização do OAuth2 foi obtido\n"
 
-#: src/oauth2.c:357
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "O token de atualização do OAuth2 não foi obtido\n"
 
-#: src/oauth2.c:489
+#: src/oauth2.c:479
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "O token de substituição do OAuth2 foi fornecido\n"
 
-#: src/oauth2.c:491
+#: src/oauth2.c:481
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "O token de substituição do OAuth2 não foi fornecido\n"
 
-#: src/oauth2.c:522
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "Erro na escrita do socket do OAuth2\n"
 
-#: src/oauth2.c:544
+#: src/oauth2.c:534
 msgid "OAuth2 socket timeout error\n"
 msgstr "Erro de limite de tempo do socket do OAuth2\n"
 
-#: src/oauth2.c:638
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "O token de acesso ao OAuth2 ainda está válido\n"
 
-#: src/oauth2.c:645
+#: src/oauth2.c:635
 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:649
+#: src/oauth2.c:639
 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:666
+#: src/oauth2.c:656
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "O token de acesso e atualização ao OAuth2 foi atualizado\n"
 
-#: src/oauth2.c:698
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 original: %s\n"
 
-#: src/oauth2.c:699
+#: src/oauth2.c:689
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 codificado: %s\n"
 
-#: src/oauth2.c:700
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9664,7 +9698,7 @@ msgstr "Localização e nome do pacote"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Selecionar"
 
@@ -9836,6 +9870,10 @@ msgstr "Renomear"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Selecione essa opção para excluir as mensagens após o empacotamento"
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Nome do arquivo"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Remover anexos"
@@ -9948,9 +9986,8 @@ msgstr "anexo"
 msgid ""
 "Warn when one of the following regular expressions is matched (one per line)"
 msgstr ""
-"Avisar quando for encontrada correspondência para uma das seguintes"
-" expressões "
-"regulares (uma por linha)"
+"Avisar quando for encontrada correspondência para uma das seguintes "
+"expressões regulares (uma por linha)"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:88
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:88
@@ -10143,7 +10180,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:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
 msgid "KiB"
 msgstr "KiB"
 
@@ -10667,14 +10704,14 @@ msgid "Render embedded objects using plugins"
 msgstr "Renderizar objetos incorporados usando plugins"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
-msgstr "Abrir no visualizador (o conteúdo remoto está habilitado)"
+msgid "Open in Viewer (remote content is enabled)"
+msgstr "Abrir no visualizador (conteúdo remoto está habilitado)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 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:4254
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
 #: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Proxy"
@@ -10715,7 +10752,7 @@ msgid "When clicking on a link, by default"
 msgstr "Ao clicar em um link, por padrão"
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
+msgid "Open in External Browser"
 msgstr "Abra em um navegador externo"
 
 #: src/plugins/fancy/fancy_prefs.c:300
@@ -10725,7 +10762,7 @@ msgstr "O CSS desse arquivo será aplicado em todas as partes 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:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "E_xplorar"
@@ -10734,86 +10771,86 @@ msgstr "E_xplorar"
 msgid "Select stylesheet"
 msgstr "Selecione a folha de estilos"
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "A recuperação de conteúdo remoto está desabilitada."
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Carregar imagens"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Habilitar conteúdo remoto"
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Habilitar Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Habilitar plugins"
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Habilitar Java"
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Abrir os links com um navegador externo"
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ocorreu um erro: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:853
 #, 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:874
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Abrir no visualizador"
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Abrir no navegador"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Abrir a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Copiar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Baixar o link"
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Salvar imagem como"
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Copiar a imagem"
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Importar a fonte"
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Visualizador HTML Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -11051,7 +11088,7 @@ 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:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Autenticação"
 
@@ -11114,8 +11151,8 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Uma palavra-chave foi usada na mensagem que você está enviando. Ela "
-"aparece na linha %d, que começa com o texto: %s\n"
+"Uma palavra-chave foi usada na mensagem que você está enviando. Ela aparece "
+"na linha %d, que começa com o texto: %s\n"
 "\n"
 "%s"
 
@@ -11134,8 +11171,8 @@ 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 ""
-"Exibe um aviso ao enviar ou enfileirar uma mensagem e uma referência para uma "
-"ou mais palavras-chave forem encontradas no corpo dessa mensagem."
+"Exibe um aviso ao enviar ou enfileirar uma mensagem e uma referência para "
+"uma ou mais palavras-chave forem encontradas no corpo dessa mensagem."
 
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:138
 msgid "Don't check for keywords when forwarding or redirecting messages"
@@ -11275,8 +11312,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:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "horas"
 
@@ -11466,15 +11503,6 @@ msgstr ""
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 
-#: src/plugins/mailmbox/plugin_gtk.c:332
-#, 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?"
-
 #: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Nenhum método de autenticação Sieve disponível\n"
@@ -11668,7 +11696,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Habilitar Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Informações do servidor"
 
@@ -11720,27 +11748,27 @@ 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:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 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/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:134
+#: 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
 msgid "Password"
 msgstr "Senha"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: 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
 msgid "Automatic"
 msgstr "Automático"
@@ -11757,20 +11785,20 @@ msgstr "O servidor Sieve não foi informado."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Não foi possível registrar o gancho de newmail"
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Não foi possível abrir o arquivo de relatório: %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11787,7 +11815,7 @@ msgstr ""
 "\n"
 "O relatório atual é %s"
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Arquivo de relatório"
 
@@ -12054,7 +12082,7 @@ msgid "Show banner"
 msgstr "Mostrar letreiro"
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nunca"
@@ -12397,68 +12425,68 @@ msgstr "de %d"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "A renderização para PDF falhou por um motivo desconhecido."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Índice do documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "Primeira página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Próxima página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Última página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Aumentar zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Diminuir zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Ajustar a página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Ajustar a largura da página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Girar para a esquerda"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Girar para a direita"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Imprimir documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Informações do documento"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Número da página"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Fator de zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12471,13 +12499,13 @@ msgstr ""
 "\n"
 "Qualquer retorno é bem-vindo: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "Visualizador PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12539,7 +12567,8 @@ msgstr "Importação de chaves"
 msgid ""
 "This key is not in your keyring. Do you want Claws Mail to try to import it?"
 msgstr ""
-"Essa chave não está no seu chaveiro. Deseja que o Claws Mail tente importá-la?"
+"Essa chave não está no seu chaveiro. Deseja que o Claws Mail tente importá-"
+"la?"
 
 #: src/plugins/pgpcore/pgp_viewer.c:182
 msgid "from keyserver"
@@ -12672,8 +12701,8 @@ 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:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
+#: src/prefs_account.c:2162 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minutos"
 
@@ -12738,66 +12767,66 @@ msgstr "GPG"
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr ""
 "Não foi encontrada nenhuma equivalência para '%s'; por favor, selecione a "
 "chave."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Coletando informações para '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Máximo"
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Selecione as chaves"
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "ID da chave"
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Confiar"
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Outro"
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "_Não criptografar"
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Adicionar chave"
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Informe outro usuário ou ID da chave:"
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Criptografar como %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -13283,8 +13312,8 @@ msgstr "Exibir o console Python..."
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Navegar"
@@ -13480,19 +13509,6 @@ msgstr "Digite a URL da fonte de notícias à qual você deseja assinar:"
 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:190
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be permanently deleted.\n"
-"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 permanentemente.\n"
-"Não será possível recuperá-las.\n"
-"\n"
-"Confirma a exclusão?"
-
 #: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
@@ -13627,7 +13643,7 @@ msgstr "Buscar comentários em publicações mais recentes que"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dias"
 
@@ -13773,7 +13789,7 @@ 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:1628
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Requer autorização)"
 
@@ -13782,7 +13798,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Não autorizado)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Não encontrado)"
 
@@ -14478,63 +14494,63 @@ msgstr "Participantes:"
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nova reunião..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exportar agenda..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "_Assinar o Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "_Atualizar assinaturas"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "Visão em _lista"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "Visão _semanal"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "Visão _mensal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Reuniões"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "no passado"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "hoje"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "amanhã"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "essa semana"
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "mais tarde"
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14543,21 +14559,21 @@ msgstr ""
 "\n"
 "Esses são os eventos planejados %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: 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"
 
-#: src/plugins/vcalendar/vcal_folder.c:1631
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Não autorizado)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Erro %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14570,7 +14586,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14581,46 +14597,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, 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:1918
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1929
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Buscando a agenda de %s ..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "nova assinatura"
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1939
 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:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Assinar o Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Digite a URL do WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "Não foi possível analisar a URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Deseja realmente cancelar a assinatura?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Excluir a assinatura"
 
@@ -15097,95 +15113,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:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "Erro do protocolo POP\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL inválida: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Excluindo a mensagem expirada %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Ignorando mensagem %d [%s] (%d bytes)\n"
 
-#: src/pop.c:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "a caixa postal está travada\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Tempo da sessão esgotado\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "comando não suportado\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "ocorreu um erro na sessão POP\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Nenhum (somente SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Nome da conta"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Definir como padrão"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Informações pessoais"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "Endereço de email"
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Configuração automática"
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15193,81 +15209,81 @@ msgstr ""
 "Aviso: essa versão do Claws Mail\n"
 "foi compilada sem suporte a IMAP e Newsgroups."
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Servidor de news"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Caixa postal local"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Caixa de Entrada padrão"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "Autenticar antes da conexão POP"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Remover após"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dia e 0 hora: excluir imediatamente"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15275,94 +15291,94 @@ 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:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Mostrar apenas pastas inscritas"
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 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:1798
+#: src/prefs_account.c:1831
 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:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificação automática"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Usar as configurações globais"
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Verificar por novas mensagens a cada"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permite filtrar usando plugins, durante o recebimento"
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
-#: src/prefs_account.c:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:1996 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:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "Enviar o endereço de email da conta na Message-ID"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Adicionar cabeçalho user agent"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15370,218 +15386,218 @@ msgstr ""
 "Deixe estes campos em branco, para utilizar os mesmos usuário e senha de "
 "recebimento."
 
-#: src/prefs_account.c:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Autenticar via POP antes de enviar"
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "Tempo esgotado para autenticação POP"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Autorização"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Selecione o provedor de serviço de email OAuth2"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "ID do cliente"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "Segredo do cliente"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Obter código de autorização"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
 msgstr "Abrir o navegador padrão ao requisitar"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Copiar o link"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Código de autorização"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2361
 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:2331
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Autorização completa"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "Inserir a assinatura automaticamente"
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Saída do comando"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "Dicionários de checagem ortográfica"
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2596 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:2643 src/prefs_account.c:4116
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
 #: 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:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Responder"
 
-#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2711 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:2720
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr "Sempre assinar as mensagens em resposta a mensagens assinadas"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2797
 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:2761
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
 msgid "Don't use TLS"
 msgstr "Não usar TLS"
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usar o comando STARTTLS para iniciar sessão criptografada"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3003
 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:2976
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Certificados do cliente"
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Certificado para recebimento"
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificado do cliente como um arquivo PKCS12 ou PEM"
 
-#: src/prefs_account.c:3012
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Certificado para envio"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Automatically accept valid TLS certificates"
 msgstr "Aceitar automaticamente certificados TLS válidos"
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3093
 msgid "Use non-blocking TLS"
 msgstr "Utilizar TLS não bloqueador"
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3105
 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:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Usar um servidor proxy"
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3206
 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:3170
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Usar as configurações de servidor proxy do sistema"
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Usar o servidor proxy para envio"
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15590,27 +15606,27 @@ msgstr ""
 "com o servidor de envios configurado, ignorando qualquer servidor proxy "
 "configurado."
 
-#: src/prefs_account.c:3354
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "Porta SMTP"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "Porta POP"
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "Porta IMAP"
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "Porta NNTP"
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15618,156 +15634,177 @@ 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:3398
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 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:3456
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "O endereço de email não foi informado."
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "O servidor POP não foi informado."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "A pasta padrão da Caixa de Entrada não existe."
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "O servidor IMAP não foi informado."
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "o comando de email não foi informado."
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3632
 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:3601
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "A senha não pode conter um caractere de quebra de linha."
 
-#: src/prefs_account.c:3636
+#: src/prefs_account.c:3676
 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:3641
+#: src/prefs_account.c:3681
 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:3733
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "o domínio não está especificado."
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "a pasta Enviados não está selecionada."
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "a pasta Fila de Saída não está selecionada."
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "a pasta Rascunhos não está selecionada."
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "a pasta Lixeira não está selecionada."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Enviar"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Preferências da nova conta"
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Falha (endereço errado)"
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Selecione o arquivo do certificado"
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin não carregado)"
 
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Autorização concluída"
+
+#: src/prefs_account.c:6139
+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
+msgid "Authorisation NOT completed"
+msgstr "Autorização NÃO concluída"
+
+#: src/prefs_account.c:6143
+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"
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Configuração de ações"
@@ -15902,10 +15939,9 @@ msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar mesmo assim?"
 
 #: 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:2168 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "Con_tinuar editando"
 
@@ -16033,8 +16069,8 @@ msgid ""
 "Opening the filter action dialog will clear current modifications of the "
 "command-line."
 msgstr ""
-"Abrir a janela de ação do filtro eliminará as modificações da linha "
-"de comando."
+"Abrir a janela de ação do filtro eliminará as modificações da linha de "
+"comando."
 
 #: src/prefs_actions.c:1324 src/prefs_filtering.c:1062
 #: src/prefs_filtering.c:1120
@@ -16107,8 +16143,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "Alertar ao inserir um arquivo maior que"
 
 #: src/prefs_compose_writing.c:205
-msgid "KiB into message body "
-msgstr "Kib no corpo da mensagem "
+msgid "KiB into message body"
+msgstr "KiB no corpo da mensagem "
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -16165,65 +16201,69 @@ msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 
 #: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Dois pontos (:) não é permitido em um cabeçalho personalizado."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Esse nome não é permitido para um cabeçalho personalizado."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Selecione um arquivo PNG"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Selecione um arquivo XBM"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Selecione um arquivo de texto"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Esse arquivo não é uma imagem."
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "A imagem selecionada não possui o tamanho correto (48x48)."
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "A imagem é muito grande; ela deve possuir, no máximo, 725 bytes."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "A imagem não está no formato correto (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "A imagem não está no formato correto (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Não foi possível executar o `compface`. Certifique-se que ele esteja no seu "
 "$PATH."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Erro no compface: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Esse arquivo possui quebras de linhas."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Excluir cabeçalho"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Deseja realmente excluir esse cabeçalho?"
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Cabeçalhos personalizados atuais"
 
@@ -16906,7 +16946,7 @@ 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 marcado, ativa o relatório das regras de filtragem e processamento.\n"
+"Se marcada, ativa o relatório das regras de filtragem e processamento.\n"
 "O relatório pode ser acessado em 'Ferramentas/Relatório de filtragem'.\n"
 "Atenção: habilitar essa opção tornará a filtragem/processamento mais lentos, "
 "isso pode se tornar crítico ao se aplicar muitas regras sobre milhares de "
@@ -17636,9 +17676,8 @@ msgid ""
 "Target folder is used when the option 'Execute immediately when moving or "
 "deleting messages' is turned off"
 msgstr ""
-"A pasta de destino é utilizada quando a opção 'Executar imediatamente ao"
-" mover "
-"ou excluir mensagens' está desativada"
+"A pasta de destino é utilizada quando a opção 'Executar imediatamente ao "
+"mover ou excluir mensagens' está desativada"
 
 #: src/prefs_msg_colors.c:370
 msgctxt "Tooltip and Dialog title"
@@ -17679,16 +17718,8 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Escolha entre atalhos de teclado pré-definidos"
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Selecionar pré-definido:"
-
-#: src/prefs_other.c:138
-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."
+msgid "Select preset keyboard shortcuts:"
+msgstr "Escolha entre atalhos de teclado pré-definidos:"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
@@ -17806,9 +17837,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 senhas salvas das suas contas serão protegidas por uma"
-" senha "
-"primária. Caso não exista uma senha primária, será solicitada uma a você."
+"Se selecionado, as senhas salvas das suas contas serão protegidas por uma "
+"senha primária. Caso não exista uma senha primária, será solicitada uma a "
+"você."
 
 #: src/prefs_other.c:615
 msgid "Change primary passphrase"
@@ -18060,8 +18091,8 @@ msgstr ""
 "Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-"
 "ASCII"
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Envio"
 
@@ -18224,8 +18255,8 @@ msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
 msgstr ""
-"Executar regras de processamento antes de marcar todas as mensagens "
-"em uma pasta como lidas ou não lidas"
+"Executar regras de processamento antes de marcar todas as mensagens em uma "
+"pasta como lidas ou não lidas"
 
 #: src/prefs_summaries.c:426
 msgid "Abbreviate newsgroup names longer than"
@@ -18828,35 +18859,35 @@ msgstr "Quebrar o texto em"
 msgid "Wrapping"
 msgstr "Quebra de linhas"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Visualização da impressão"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "Primeira página"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Última página"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "Zoom 100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Ajustar zoom"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Aumentar o zoom"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Reduzir o zoom"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Página %d"
@@ -19235,88 +19266,88 @@ msgstr "Digite o texto para substituir '%s'"
 msgid "Enter variable"
 msgstr "Digite a variável"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Enviando a mensagem usando o comando: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Não foi possível executar o comando: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ocorreu um erro na execução do comando: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Executando verificação POP antes do SMTP..."
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP antes do SMTP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Conta '%s': Conectando ao servidor SMTP: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "A mensagem foi enviada com sucesso."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "Enviando MENSAGEM..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando a mensagem (%d / %d bytes)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19779,7 +19810,7 @@ msgstr "Criptografada"
 msgid "Has attachment(s)"
 msgstr "Possui anexo(s)"
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19788,11 +19819,11 @@ msgstr ""
 "Erro na expressão regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8405
 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:8406
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Voltar à lista de pastas"
 
@@ -20651,3 +20682,61 @@ 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/ru.po b/po/ru.po
index ce79d9300..f99977d02 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 4.0.0\n"
+"Project-Id-Version: Claws Mail 4.1.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-03-27 09:41+0100\n"
-"PO-Revision-Date: 2022-03-27 18:06+0300\n"
+"POT-Creation-Date: 2022-10-11 10:26+0100\n"
+"PO-Revision-Date: 2022-10-13 00:02+0300\n"
 "Last-Translator: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language-Team: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language: ru\n"
@@ -65,7 +65,7 @@ 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/mainwindow.c:518 src/messageview.c:213
+#: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Правка"
@@ -94,7 +94,7 @@ 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:552
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Копировать"
@@ -142,19 +142,20 @@ msgstr " _Использовать как учётную запись по ум
 #: 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/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:926 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:841 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: 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/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/prefs_actions.c:920 src/prefs_actions.c:946 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/summary_search.c:495
-#: src/summary_search.c:785
+#: 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/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Закрыть"
 
@@ -187,24 +188,24 @@ msgstr "Удалить учётную запись"
 #: 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:10736
-#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
-#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
-#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: 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/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/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1193 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:890 src/main.c:2286 src/mainwindow.c:4009
-#: src/mainwindow.c:4212 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:1818
-#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
-#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
+#: 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/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
@@ -215,7 +216,7 @@ msgstr "Удалить учётную запись"
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
 #: src/plugins/keyword_warner/keyword_warner.c:196
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
 #: src/plugins/managesieve/sieve_editor.c:435
 #: src/plugins/managesieve/sieve_editor.c:632
@@ -227,21 +228,20 @@ msgstr "Удалить учётную запись"
 #: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2030
 #: 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_actions.c:1315
-#: src/prefs_customheader.c:177 src/prefs_customheader.c:693
-#: 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_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:294 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/toolbar.c:3108
-#: src/wizard.c:1833
+#: 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_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/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Отменить"
 
@@ -249,11 +249,11 @@ msgstr "_Отменить"
 #: 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/plugins/att_remover/att_remover.c:429
-#: src/plugins/mailmbox/plugin_gtk.c:335
+#: 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:2032 src/prefs_actions.c:1105
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "_Удалить"
@@ -272,17 +272,17 @@ msgstr "'Получить Почту' проверяет письма в ука
 #: 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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1860
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: 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
 msgid "Name"
 msgstr "Имя"
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -338,13 +338,13 @@ msgstr ""
 "%s"
 
 #: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9751 src/ldaputil.c:334
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1829
-#: src/plugins/vcalendar/vcal_folder.c:1847
-#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
+#: 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
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -489,13 +489,13 @@ msgstr ""
 "Вы действительно хотите заменить все имена\n"
 "свойств набором имён по умолчанию?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:1673 src/main.c:412
-#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -507,13 +507,14 @@ msgstr ""
 msgid "_No"
 msgstr "_Нет"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -548,7 +549,7 @@ msgid "New attribute name:"
 msgstr "Имя нового свойства:"
 
 #: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
 #: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
@@ -561,14 +562,13 @@ 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/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: 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/mimeview.c:1819 src/password_gtk.c:213
-#: src/plugins/archive/archiver_gtk.c:575
+#: 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
@@ -630,7 +630,7 @@ msgid "Duplicate email addresses"
 msgstr "Дублирующиеся почтовые адреса"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Адрес"
@@ -664,7 +664,7 @@ msgid "Contact"
 msgstr "Контакт"
 
 #: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1303 src/editgroup.c:290
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Примечания"
 
@@ -681,7 +681,7 @@ msgid "Can't add the specified address"
 msgstr "Не удалось добавить указанный адрес"
 
 #: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
-#: src/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: 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 "Почтовый Адрес"
@@ -690,7 +690,7 @@ msgstr "Почтовый Адрес"
 msgid "_Book"
 msgstr "_Книга"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Сервис"
@@ -793,7 +793,7 @@ msgid "_Browse Entry"
 msgstr "_Просмотр Записи"
 
 #: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: 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
@@ -950,7 +950,7 @@ msgstr ""
 "адреса будут перемещены в родительскую папку."
 
 #: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:334 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1062,7 +1062,7 @@ msgid "Person"
 msgstr "Контакт"
 
 #: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Папка"
 
@@ -1186,18 +1186,18 @@ msgstr "Обновить адрес(а)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Ошибка обновления. Изменения не записаны в Каталог."
 
-#: src/alertpanel.c:154 src/compose.c:9825
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Уведомление"
 
 #: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: 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
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Ошибка"
@@ -1313,63 +1313,63 @@ 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:1251
+#: src/common/session.c:201 src/imap.c:1261
 msgid "TLS handshake failed\n"
 msgstr "Ошибка TLS соединения\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "Не найдено подходящего метода SMTP аутентификации\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Выбранный метод SMTP аутентификации недоступен\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "неверный ответ SMTP\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "ошибка во время SMTP сессии\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "возникла ошибка при аутентификации\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Сообщение слишком большое (Макс. размер %s)\n"
 
-#: src/common/smtp.c:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "не удалось начать STARTTLS сессию\n"
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Превышен интервал ожидания IO сокета.\n"
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Превышен интервал ожидания.\n"
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: ошибка соединения (%s).\n"
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: неизвестный узел.\n"
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: ошибка поиска узла (%s).\n"
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "записать в fd%d: %s\n"
@@ -1705,7 +1705,7 @@ msgstr ""
 msgid "_Add..."
 msgstr "_Добавить..."
 
-#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: 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/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
@@ -1718,7 +1718,7 @@ msgstr "_Удалить"
 msgid "_Properties..."
 msgstr "_Свойства..."
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Сообщение"
 
@@ -1730,7 +1730,7 @@ msgstr "_Орфография"
 msgid "_Options"
 msgstr "_Параметры"
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Справка"
 
@@ -1790,7 +1790,7 @@ msgstr "_С переносами"
 msgid "_Unwrapped"
 msgstr "_Без переносов"
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Выделить _всё"
@@ -1895,47 +1895,47 @@ msgstr "Система _Конфиденциальности"
 msgid "_Priority"
 msgstr "_Приоритет"
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Кодировка _символов"
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Западно-европейская"
 
-#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Балтийская"
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Арабская"
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Кириллица"
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Японская"
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Китайская"
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Корейская"
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Тайская"
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Адресная книга"
 
@@ -1943,11 +1943,11 @@ msgstr "_Адресная книга"
 msgid "_Template"
 msgstr "_Шаблон"
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Дейст_вия"
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_О Claws Mail"
 
@@ -1983,12 +1983,12 @@ msgstr "Показать _линейку"
 msgid "_Normal"
 msgstr "_Обычный режим"
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Всем"
 
-#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Отправителю"
@@ -2013,27 +2013,27 @@ msgstr "Низ_кий"
 msgid "_Lowest"
 msgstr "_Самый низкий"
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Автоматически"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 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:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Юникод (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 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:896 src/messageview.c:365
+#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/compose.c:769 src/mainwindow.c:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Турецкая (ISO-8859-9)"
 
@@ -2157,7 +2157,7 @@ msgstr "Вы собираетесь вставить файл размером %
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Вставить"
 
@@ -2217,7 +2217,7 @@ 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/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Отправить"
 
@@ -2384,7 +2384,7 @@ msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 "Файл %s, который вы вложили в сообщение, больше не существует. Игнорировать?"
 
-#: src/compose.c:6430 src/mainwindow.c:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Отменить отправку"
 
@@ -2413,9 +2413,11 @@ msgstr "Использовать <Tab> для автозавершения из
 msgid "Mime type"
 msgstr "Mime тип"
 
-#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:468
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Размер"
 
@@ -2544,42 +2546,52 @@ msgstr "Связь через сокет с внешним редактором
 #: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Не удалось вызвать следующую команду:\n"
+"Не удалось вызвать следующую команду внешнего редактора:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9750
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Внешний редактор остановлен с ошибкой: %s"
 
-#: src/compose.c:9822
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr "идентификатор процесса: %"
+
+#: src/compose.c:9830
+#, c-format
+msgid "process id: %d"
+msgstr "идентификатор процесса: %d"
+
+#: src/compose.c:9835
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %"
+"%s"
 msgstr ""
 "Внешний редактор всё ещё работает.\n"
 "Завершить процесс принудительно?\n"
-"id процесса: %"
+"%s"
 
-#: src/compose.c:10229 src/messageview.c:1094
+#: src/compose.c:10245 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail требуется доступ к сети для отправки письма."
 
-#: src/compose.c:10432
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Не удалось сохранить черновик."
 
-#: src/compose.c:10436
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Не удалось сохранить черновик"
 
-#: src/compose.c:10437
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2587,24 +2599,24 @@ msgstr ""
 "Не удалось сохранить черновик.\n"
 "Отказаться от написанного сообщения?"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "_Отменить выход"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "_Отказаться от письма"
 
-#: src/compose.c:10627 src/compose.c:10641
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:10655
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Файл '%s' не может быть прочитан."
 
-#: src/compose.c:10657
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2613,50 +2625,50 @@ msgstr ""
 "Файл '%s' содержал неверные символы\n"
 "для текущей кодировки, вставка может быть неправильной."
 
-#: src/compose.c:10734
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Отказаться от сообщения"
 
-#: src/compose.c:10735
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Это сообщение было изменено. Отказаться от него?"
 
-#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Отказаться"
 
-#: src/compose.c:10736 src/compose.c:10741
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "_Сохранить в Черновики"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: src/compose.c:10740
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Это сообщение было изменено. Сохранить изменения?"
 
-#: src/compose.c:10741
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Не сохранять"
 
-#: src/compose.c:10812
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Вы хотите применить шаблон '%s' ?"
 
-#: src/compose.c:10814
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10834 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:10892
+#: src/compose.c:10911
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2665,7 +2677,7 @@ msgstr ""
 "Размер вставляемого текста превышает ограничение (%dКБ) для вставки.\n"
 "Вместо этого прикрепите как файл."
 
-#: src/compose.c:11708
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2683,20 +2695,20 @@ msgstr[2] ""
 "Вы хотите вставить содержимое %d файлов в тело сообщения или вложить "
 "(прикрепить) в письмо?"
 
-#: src/compose.c:11714
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Вставить или вложить?"
 
-#: src/compose.c:11715
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "_Вложить"
 
-#: src/compose.c:11930
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Неверный формат цитирования в строке %d."
 
-#: src/compose.c:12226
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2728,7 +2740,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Журнал отладки"
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
 #: src/uri_opener.c:226
 msgid "Close"
 msgstr "Закрыть"
@@ -2915,7 +2927,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:2443
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Файл"
 
@@ -2923,53 +2935,48 @@ msgstr "Файл"
 msgid "Add New Addressbook"
 msgstr "Добавить Новую Адресную Книгу"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Должно быть указано Имя Группы."
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
-msgstr "Изменение Данных Группы"
+#: src/editgroup.c:292
+msgid "Edit group data"
+msgstr "Изменить данные группы"
 
-#: src/editgroup.c:323 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Имя Группы"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Адреса в Группе"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Доступные Адреса"
 
-#: src/editgroup.c:452
-msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr ""
-"Помещайте Электронные Адреса в или из Группы с помощью кнопок со стрелками"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Адреса в Группе"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
-msgstr "Правка Данных Группы"
+#: src/editgroup.c:494
+msgid "Edit group details"
+msgstr "Изменить сведения о группе"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
-msgstr "Добавить Новую Группу"
+#: src/editgroup.c:496
+msgid "Add new group"
+msgstr "Добавить новую группу"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Правка папки"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
@@ -2998,13 +3005,13 @@ msgstr "Добавить Новый Элемент JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Правка LDAP - Выбрать Базу Поиска"
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
 #: 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:3197
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Порт"
@@ -3065,7 +3072,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4227
 msgid "TLS"
 msgstr "TLS"
 
@@ -3229,8 +3236,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:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Показать пароль"
@@ -3253,7 +3260,7 @@ msgid ""
 msgstr ""
 "Максимальное число записей, которые должны возвращаться в результат поиска."
 
-#: src/editldap.c:776 src/prefs_account.c:4044
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Основные"
 
@@ -3341,11 +3348,11 @@ msgstr "Добавить Новую Запись vCard"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Невозможно выбрать клиентский сертификат.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "не удалось получить область xover\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "не удалось получить область xhdr\n"
 
@@ -3410,8 +3417,8 @@ 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:1178 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: 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
 msgid "None"
 msgstr "Никакой"
@@ -3422,7 +3429,7 @@ msgstr "Никакой"
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Полное"
@@ -3661,7 +3668,7 @@ msgstr "Экспорт Адресной Книги в LDIF Файл"
 msgid "Distinguished Name"
 msgstr "Характерное Имя"
 
-#: src/export.c:112 src/summaryview.c:8485
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Экспорт в mbox файл"
 
@@ -3744,11 +3751,19 @@ msgid ""
 msgstr ""
 "Файл %s пуст или повреждён! Желаете использовать файл из резервной копии %s?"
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr "правило не относится к учётной записи\n"
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"правило относится к учётной записи, соответствует учетной записи "
+"используемой для получения сообщений\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3757,13 +3772,13 @@ msgstr ""
 "правило относится к учётной записи [id=%d, name='%s'], данная учётная запись "
 "используется сейчас для получения сообщений\n"
 
-#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
-#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
-#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "НЕ_СУЩЕСТВУЕТ"
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
@@ -3771,7 +3786,7 @@ msgstr ""
 "правило относится к учётной записи, другая учётная запись используется "
 "сейчас для получения сообщений\n"
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
@@ -3780,117 +3795,129 @@ msgstr ""
 "правило относится к учётной записи [id=%d, name='%s'], другая учётная запись "
 "используется сейчас для получения сообщений [id=%d, name='%s']\n"
 
-#: src/filtering.c:646
+#: src/filtering.c:658
+msgid ""
+"rule is not account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"правило не относится к учётной записи, но все правила в любом случае "
+"применяются по запросу пользователя\n"
+
+#: src/filtering.c:665
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"правило не относится к учётной записи, все правила применяются по запросу "
-"пользователя в любом случае\n"
+"правило не относится к учётной записи, но все правила в любом случае "
+"применяются по запросу пользователя\n"
 
-#: src/filtering.c:652
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
-"правило относится к учётной записи [id=%d, name='%s'], но все правила "
-"применяются по запросу пользователя\n"
+"правило относится к учётной записи [id=%d, name='%s'], но все правила в "
+"любом случае применяются по запросу пользователя\n"
+
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr ""
+"правило относится к учётной записи, игнорируется в случае запроса "
+"пользователя\n"
 
-#: src/filtering.c:670
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "правило относится к учётной записи [id=%d, name='%s'], игнорируется в случае "
 "запроса пользователя\n"
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
 msgstr ""
-"правило относится к учётной записи, игнорируется в случае запроса "
-"пользователя\n"
+"правило относится к учётной записи, соответствует текущей учетной записи\n"
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"правило относится к учётной записи [id=%d, name='%s'], не соответствует "
-"текущей учётной записи [id=%d, name='%s']\n"
+"правило относится к учётной записи [id=%d, name='%s'], соответствует текущей "
+"учётной записи [id=%d, name='%s']\n"
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr ""
 "правило относится к учётной записи, не соответствует текущей учётной записи\n"
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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"
+"правило относится к учётной записи [id=%d, name='%s'], не соответствует "
+"текущей учётной записи [id=%d, name='%s']\n"
 
-#: src/filtering.c:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "применение действия [ %s ]\n"
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "действие не может быть применено\n"
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "завершить обработку после действия [ %s ]\n"
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "правило обработки '%s' [ %s ]\n"
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "обработка правила <неназванный> [ %s ]\n"
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "отключить правило '%s' [ %s ]\n"
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "отключить правило <неназванный> [ %s ]\n"
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "неопределённое"
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "слияние"
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr "вручную"
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "обработка папки"
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "начальная обработка"
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "пост-обработка"
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3907,11 +3934,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3993,17 +4020,17 @@ 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:433
+#: 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:2104
+#: src/plugins/vcalendar/vcal_folder.c:2102
 #, 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:445 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2111
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2109
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Папка '%s' уже существует."
@@ -4035,7 +4062,7 @@ msgstr "Рекурсивно пометить все как непрочтённ
 msgid "R_un processing rules"
 msgstr "Зап_устить обработку"
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Поиск в папке..."
 
@@ -4088,11 +4115,11 @@ msgstr "Пометить все как прочтённые"
 
 #: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"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
 msgid "Do you really want to mark all mails in this folder as read?"
@@ -4104,22 +4131,22 @@ msgstr "Пометить все как непрочтённые"
 
 #: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"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
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Действительно пометить все сообщения в данной папке как непрочтённые?"
 
-#: src/folderview.c:1075 src/imap.c:4693
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Сканирование папки %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Сканирование папки %s..."
@@ -4164,7 +4191,7 @@ msgstr "Открывается папка %s..."
 msgid "Folder could not be opened."
 msgstr "Папка не может быть открыта."
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Очистить корзину"
 
@@ -4176,7 +4203,7 @@ msgstr "Удалить все сообщения в корзине?"
 msgid "_Empty trash"
 msgstr "_Очистить корзину"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Автономная работа"
 
@@ -4290,7 +4317,7 @@ msgstr "Имя группы новостей"
 msgid "Messages"
 msgstr "Сообщения"
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Тип"
 
@@ -4316,11 +4343,11 @@ msgstr "неизвестно"
 msgid "Can't retrieve newsgroup list."
 msgstr "Невозможно получить список групп новостей."
 
-#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Готово."
 
-#: src/grouplistdialog.c:503
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d групп новостей получено (%s прочтено)"
@@ -4349,7 +4376,7 @@ msgstr ""
 "GPL. Если Вы хотите оказать безвозмездную помощь проекту Claws Mail, Вы "
 "можете сделать это на:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:862
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4438,46 +4465,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "поддержка шифрования соединения с сервером\n"
 
 #: src/gtk/about.c:463
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "поддержка адресов IPv6, нового протокола адресации Интернета\n"
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "поддержка преобразования текста между различными кодировками\n"
 
-#: src/gtk/about.c:484
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "добавляет поддержку адресов IPv6\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "поддержка адресных книг PalmOS\n"
 
-#: src/gtk/about.c:494
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "поддержка адресных книг LDAP\n"
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "поддержка серверов IMAP и NNTP\n"
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "добавлена поддержка SVG тем\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "поддержка сессий\n"
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "поддержка изменений в состоянии сетевых подключений\n"
 
-#: src/gtk/about.c:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "добавлена поддержка SVG тем\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "добавлена поддержка аутентификации OAuth2\n"
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4488,7 +4520,7 @@ msgstr ""
 "опубликованной Free Software Foundation версии 3 либо (на ваш выбор) более "
 "поздней версии."
 
-#: src/gtk/about.c:574
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4501,7 +4533,7 @@ msgstr ""
 "получения более подробной информации ознакомьтесь с GNU General Public "
 "License."
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4509,73 +4541,73 @@ msgstr ""
 "Вместе с данной программой вы должны были получить экземпляр GNU General "
 "Public License. Если нет, смотрите "
 
-#: src/gtk/about.c:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Статистика по сессиям\n"
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Начало: %s\n"
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Входящий трафик\n"
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Полученные сообщения: %d\n"
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Исходящий трафик\n"
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Новые/переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Сообщений-ответов: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Всего исходящих сообщений: %d\n"
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "О программе Claws Mail"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Информация"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Авторы"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "_Возможности"
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Лицензия"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "_О релизе"
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "_Статистика"
 
@@ -5052,7 +5084,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Организация"
 
@@ -5265,8 +5297,8 @@ msgid "Folder contains marked messages"
 msgstr "Папка содержит помеченные сообщения"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
-msgstr "Только папки IMAP с подпапками"
+msgid "IMAP folder which contains subfolders only"
+msgstr "Папка IMAP, содержащая только подпапки"
 
 #: src/gtk/icon_legend.c:92
 msgid "IMAP mailbox showing only subscribed folders"
@@ -5436,15 +5468,15 @@ msgstr "_Применить"
 msgid "Page Index"
 msgstr "Список"
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Скрыть"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
 #: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
-#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Учётная запись"
@@ -5903,8 +5935,7 @@ msgstr "(Нет поля 'Тема')"
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Имя файла:"
@@ -5917,195 +5948,195 @@ msgstr "Размер файла:"
 msgid "Load Image"
 msgstr "Загрузить Изображение"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "Соединение IMAP прервано\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Ошибка IMAP в %s:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "аутентифицировано"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "не аутентифицировано"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "некорректное состояние"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "ошибка потока"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "ошибка анализатора (скорее всего, не соответствующий RFC ответ от сервера)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "в соединении отказано"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "ошибка выделения памяти"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "фатальная ошибка"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 "ошибка протокола (скорее всего, не соответствующий RFC ответ от сервера)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "соединение не принято"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "Ошибка APPEND"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "Ошибка NOOP"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "Ошибка LOGOUT"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "Ошибка CAPABILITY"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "Ошибка CHECK"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "Ошибка CLOSE"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "Ошибка EXPUNGE"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "Ошибка COPY"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "Ошибка UID COPY"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "Ошибка CREATE"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "Ошибка DELETE"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "Ошибка EXAMINE"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "Ошибка FETCH"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "Ошибка UID FETCH"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "Ошибка LIST"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "Ошибка LOGIN"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "Ошибка LSUB"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "Ошибка RENAME"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "Ошибка SEARCH"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "Ошибка UID SEARCH"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "Ошибка SELECT"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "Ошибка STATUS"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "Ошибка STORE"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "Ошибка UID STORE"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "Ошибка SUBSCRIBE"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "Ошибка UNSUBSCRIBE"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "Ошибка STARTTLS"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "Ошибка INVAL"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "Ошибка EXTENSTION"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "Ошибка SASL"
 
-#: src/imap.c:751
+#: src/imap.c:753
 msgid "TLS error"
 msgstr "Ошибка TLS"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Неизвестная ошибка [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6117,7 +6148,7 @@ msgstr ""
 "CRAM-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен CRAM-MD5 SASL модуль."
 
-#: src/imap.c:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6129,7 +6160,7 @@ msgstr ""
 "DIGEST-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен DIGEST-MD5 SASL модуль."
 
-#: src/imap.c:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6141,7 +6172,7 @@ msgstr ""
 "SCRAM-SHA-1 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен SCRAM SASL модуль."
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6153,7 +6184,7 @@ msgstr ""
 "PLAIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен PLAIN SASL модуль."
 
-#: src/imap.c:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6165,7 +6196,7 @@ msgstr ""
 "LOGIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен LOGIN SASL модуль."
 
-#: src/imap.c:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -6175,36 +6206,36 @@ msgstr ""
 "\n"
 "Ошибка OAuth2. Проверьте и исправьте настройки учетной записи OAuth2."
 
-#: src/imap.c:1004
+#: src/imap.c:1014
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s"
 
-#: src/imap.c:1008
+#: src/imap.c:1018
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Соединение с %s прошло неудачно: логин отвергнут. %s\n"
 
-#: src/imap.c:1026
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Соединение с %s прошло неудачно"
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1043 src/imap.c:1046
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP соединение с %s было разорвано. Повторное подключение...\n"
 
-#: src/imap.c:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail необходимо сетевое подключение для доступа к серверу IMAP."
 
-#: src/imap.c:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Незащищенное подключение"
 
-#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 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"
@@ -6217,108 +6248,108 @@ msgstr ""
 "\n"
 "Продолжить подключение к серверу? Соединение не будет безопасным."
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "Прод_олжить подключение"
 
-#: src/imap.c:1192
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Учётная запись '%s': Подключение к IMAP серверу: %s:%d..."
 
-#: src/imap.c:1257
+#: src/imap.c:1267
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Не удалось подключиться к IMAP серверу: %s:%d"
 
-#: src/imap.c:1260
+#: src/imap.c:1270
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "Не удалось подключиться к IMAP серверу: %s:%d\n"
 
-#: src/imap.c:1292 src/imap.c:4164
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "Не удалось начать STARTTLS сессию.\n"
 
-#: src/imap.c:1364
+#: src/imap.c:1374
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Не удалось подключиться к серверу IMAP %s.\n"
 
-#: src/imap.c:1367
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Не удалось подключиться к серверу IMAP %s."
 
-#: src/imap.c:1795
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Добавление сообщения..."
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Копирование сообщения..."
 
-#: src/imap.c:2526
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "Поиск прерван из-за ошибки сервера."
 
-#: src/imap.c:2610
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "невозможно установить флаг удаления\n"
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "невозможно стереть\n"
 
-#: src/imap.c:2992
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Поиск подписанных папок в %s..."
 
-#: src/imap.c:2995
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Ищутся подпапки %s..."
 
-#: src/imap.c:3286
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удалось создать почтовый ящик: LIST завершился с ошибкой\n"
 
-#: src/imap.c:3299
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "не удалось создать почтовый ящик\n"
 
-#: src/imap.c:3429
+#: src/imap.c:3439
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удалось переименовать почтовый ящик: %s в %s\n"
 
-#: src/imap.c:3542
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "не удалось удалить почтовый ящик\n"
 
-#: src/imap.c:3821
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST завершился с ошибкой\n"
 
-#: src/imap.c:3906
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Помечаются сообщения..."
 
-#: src/imap.c:4009
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: src/imap.c:4161
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Сервер требует STARTTLS для входа.\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Не удалось обновить.\n"
 
-#: src/imap.c:4176
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6327,20 +6358,20 @@ msgstr ""
 "Не удалось соединиться с %s: сервер требует STARTTLS, но Claws Mail собран "
 "без поддержки STARTTLS.\n"
 
-#: src/imap.c:4184
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Сбой входа на сервер.\n"
 
-#: src/imap.c:4407
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Получение сообщения..."
 
-#: src/imap.c:5108
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "невозможно установить флаг удаления: %d\n"
 
-#: src/imap.c:6143
+#: src/imap.c:6153
 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"
@@ -6390,7 +6421,7 @@ msgstr "П_одписки"
 msgid "_Subscribe..."
 msgstr "_Подписаться..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Отписаться..."
 
@@ -6422,21 +6453,21 @@ msgstr ""
 "а не писем, то добавьте '/' в конце имени)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:422 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 #, 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:423
+#: 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:2097
+#: src/plugins/vcalendar/vcal_folder.c:2095
 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:453 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2117
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2115
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6444,21 +6475,22 @@ msgstr ""
 "Не удалось переименовать папку.\n"
 "Имя новой папки не допустимо."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Выберите, куда следует переместить папку '%s'"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 msgid "Select folder to copy folder '%s' to"
 msgstr "Выберите, куда следует скопировать папку '%s'"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203
+#: 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
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
@@ -6467,9 +6499,9 @@ msgstr ""
 "\n"
 "Действительно хотите удалить папку?"
 
-#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: 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:2050
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не удалось удалить папку '%s'."
@@ -6496,7 +6528,7 @@ msgstr "_Поиск"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Выберите подпапку %s для подписки: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -6732,32 +6764,32 @@ msgstr "Выбрать Pine Файл"
 msgid "Import Pine file into Address Book"
 msgstr "Импорт Pine файла в адресную книгу"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail нужно сетевое подключение для получения писем."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "Не удалось выполнить %s\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6765,28 +6797,28 @@ msgstr[0] "Завершено (%d сообщение (%s) получено)"
 msgstr[1] "Завершено (%d сообщения (%s) получено)"
 msgstr[2] "Завершено (%d сообщений (%s) получено)"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Сбой подключения"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Ошибка аутентификации"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: 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
 msgid "Locked"
 msgstr "Заблокирован"
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Время ожидания"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6794,66 +6826,66 @@ msgstr[0] "Завершено (%d новое сообщение)"
 msgstr[1] "Завершено (%d новых сообщения)"
 msgstr[2] "Завершено (%d новых сообщений)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Учётная запись '%s': Соединение с POP3 сервером: %s:%d..."
 
-#: src/inc.c:930
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не удалось соединиться с POP3 сервером: %s:%d"
 
-#: src/inc.c:934
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с POP3 сервером: %s:%d\n"
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Получение сообщений с %s (%s)..."
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6861,16 +6893,16 @@ msgstr[0] "Получение (%d сообщение (%s) получено)"
 msgstr[1] "Получение (%d сообщения (%s) получено)"
 msgstr[2] "Получение (%d сообщений (%s) получено)"
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Соединение с %s:%d прошло неудачно."
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "Ошибка при обработки почты."
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6879,37 +6911,37 @@ msgstr ""
 "Ошибка при обработки почты:\n"
 "%s"
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "Недостаточно места на диске."
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Не удалось записать в файл."
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Ошибка сокета при соединении с %s:%d."
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Соединение прервано удалённым узлом."
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Соединение с %s:%d прервано удалённым узлом."
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик заблокирован."
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6918,11 +6950,11 @@ msgstr ""
 "Почтовый ящик заблокирован:\n"
 "%s"
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6931,7 +6963,7 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6939,48 +6971,48 @@ msgstr ""
 "Превышено время ожидания. Вы можете попробовать исправить эту проблему, "
 "увеличив время ожидания в /Настройки/Параметры/Другие/Разное."
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Соединение с %s:%d прошло неудачно."
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Слияние отменено\n"
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: 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:1834
+#: 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
 msgid "seconds"
 msgstr "секунд"
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минуты"
 msgstr[2] "минут"
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часа"
 msgstr[2] "часов"
 
-#: src/inc.c:1661
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sВы работаете автономно. Отменить это на %d %s?"
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sВы работаете автономно. Отменить?"
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "Одн_ократно"
 
@@ -7406,830 +7438,830 @@ msgstr "NetworkManager: сеть доступна.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: сеть недоступна.\n"
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Файл"
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "_Вид"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "_Настройки"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "_Добавить почтовый ящик"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "В формате MH..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Изменить порядок папок..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "_Импортировать mbox-файл..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "_Экспорт в mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "_Экспорт выбранных сообщений в mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "Очистить все _Корзины"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Сохранить сообщение как..."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Сохранить часть как..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Параметры страницы..."
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "Синхронизировать папки"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "В_ыход"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Выделить _цепочку"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "_Быстрый поиск"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "Показывать или ск_рывать"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "_Панель инструментов"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Отображаемые _столбцы"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "В _списке папок..."
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "В _списке сообщений..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "Ра_сположение"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "_Сортировка"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "_Сгруппировать по теме"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "Р_азвернуть все цепочки"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "Св_ернуть все цепочки"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Перейти к"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Предыдущему сообщению"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Следующему сообщению"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "П_редыдущему непрочтённому сообщению"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Сле_дующему непрочтённому сообщению"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Предыдущему но_вому сообщению"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Сл_едующему новому сообщению"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Предыдущему _помеченному сообщению"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Следующему п_омеченному сообщению"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Предыдущему с _цветной меткой"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Следующему с цв_етной меткой"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:594
 msgid "Previously opened message"
 msgstr "Предыдущее открытое сообщение"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Следующее открытое сообщение"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Сообщению на уровень выше"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Следующей непрочтённой _папке"
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "П_апка..."
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Следующая часть"
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Предыдущая часть"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Прокрутка сообщения"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Предыдущая строка"
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Следующая строка"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Декодировать"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "Открыть в новом окне"
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Исхо_дный текст сообщения"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Часть сообщения"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Показать как текст"
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Открыть"
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Открыть с помощью..."
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Цитирование"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "_Обновить сводку"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "Получ_ить"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Получить для _текущей учётной записи"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Получить для _всех учётных записей"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "Отменить получени_е"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "_Отправить сообщения из очереди"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "Составить по_чтовое сообщение"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "Составить сообщение новостей"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:665 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Отве_тить"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "Список _рассылки"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "Дополнить и ответить"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "_Переслать"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Пер_еслать как вложение"
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
 #: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Перенаправи_ть"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "Список _Рассылки"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Написать"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "Справка"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "Смотреть архив"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "Связаться с владельцем"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "П_ереместить..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Переместить в _корзину"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "_Удалить..."
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Переместить цепочку в ко_рзину"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "Удалить ц_епочку"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Отменить сообщение новостей"
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "_Пометить"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "_Снять пометку"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Пометить как прочтё_нное"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Пометить как непрочт_ённое"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Пометить в папке все как прочтённые"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Пометить в папке все как непрочтённые"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Игнорировать цепочку"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Перестать игнорировать цепочку"
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Следить за цепочкой"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Перестать отслеживать цепочку"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Пометить как _спам"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Пометить как _не спам"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Разблокировать"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Цветные ме_тки"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "Те_ги"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "Заново _отредактировать"
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Проверить подпись"
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Добавить отправителя в адресную кн_игу"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "С_обрать адреса"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Из текущей _папки..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Из выделенных _сообщений..."
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "_Фильтровать все сообщения в папке"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "Фильтровать _выделенные сообщения"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "Запустить обр_аботку писем"
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "_Создать правило фильтрации"
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Автоматически"
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "По _Отправителю"
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "По _Получателю"
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "По _Теме"
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "По О_тправителю"
 
-#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Создать правило обработки"
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Список _Ссылок..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "Проверить новые сообщения для всех папок"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Удалить ко_пии сообщений"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "В текущей папке"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "Во всех папках"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "В_ыполнить"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "Сте_реть удалённые"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr "Серти_фикаты TLS"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Журнал Фил_ьтрации"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Журнал _Сети"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Журнал _Отладки"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "_Забыть все пароли текущей сессии"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr "Забыть основную _парольную фразу"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "И_зменить текущую учётную запись"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "_Параметры текущей учётной записи..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "Создать _новую учётную запись..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "_Редактировать учётные записи..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "П_араметры..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "Начальная об_работка..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "Пост-обр_аботка..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Фильтрация..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "_Шаблоны..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Действия..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "Теги..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "Модули..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Руководство"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "ЧАВО (онлайн)"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "Объяснение _Значков"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Установить в качестве почтового клиента по умолчанию"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "Автономный _режим"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Стр_ока меню"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "_Просмотр сообщения"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "Стр_ока состояния"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Заголовки столбцов"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "Пр_осмотр в виде цепочек"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Скрыть прочтённые цепочки"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "_Скрыть прочтённые"
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Скрыть удалённые сообщения"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "Во весь _экран"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Показать все _заголовки"
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Свернуть все цепочки"
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Свернуть по _второму уровню"
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Свернуть по _третьему уровню"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Текст _под значками"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Текст р_ядом со значками"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "_Только значки"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "_Только текст"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "_Стандартное (классическое)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "_Три колонки"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "_Широкий просмотр сообщений"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "Ш_ирокий список сообщений"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "Д_ля небольшого экрана"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "По _номеру"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "По р_азмеру"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "По _дате"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "По дате цепочки"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "По т_еме"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "По _цветным меткам"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "По тегу"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "По _пометке"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "По _статусу"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "По в_ложению"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "По счёту"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "По блокировке"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "Н_е сортировать"
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "По возрастанию"
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "По убыванию"
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Автоопределение"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6489
 msgid "Modify tags..."
 msgstr "Изменить теги..."
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Произошли ошибки. Нажмите здесь для просмотра журнала."
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться"
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Выберите учётную запись"
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Журнал сети"
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Журнал отладки фильтрации/обработки"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "журнал фильтрации включён\n"
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "журнал фильтрации выключен\n"
 
-#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
-#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
+#: 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
 msgid "Untitled"
 msgstr "Безымянный"
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "никакой"
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения в корзине?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "Отменить выход"
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8243,18 +8275,18 @@ msgstr ""
 "Если указан существующий почтовый ящик, он\n"
 "будет проверен автоматически."
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8264,51 +8296,51 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или у вас нет прав на запись в "
 "указанный каталог."
 
-#: src/mainwindow.c:3389
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Отправлять не разрешено"
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Ошибка импорта mbox файла."
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Неудачный экспорт в mbox файл."
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Выйти из Claws Mail?"
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "_Выход"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Синхронизация папок"
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Вы хотите синхронизировать ваши папки сейчас?"
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Синхронизировать"
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Удаление копий сообщений..."
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "В выбранной папке дубликатов сообщений не найдено.\n"
 
-#: src/mainwindow.c:4711
+#: src/mainwindow.c:4709
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8316,7 +8348,7 @@ msgstr[0] "Удален %d дубликат сообщений в выбранн
 msgstr[1] "Удалено %d дубликата сообщений в выбранной папке.\\\n"
 msgstr[2] "Удалено %d дубликатов сообщений в выбранной папке.\\\n"
 
-#: src/mainwindow.c:4715
+#: src/mainwindow.c:4713
 #, 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"
@@ -8324,11 +8356,11 @@ msgstr[0] "Помечен %d дубликат сообщений для удал
 msgstr[1] "Помечено %d дубликата сообщений для удаления в выбранной папке.\n"
 msgstr[2] "Помечено %d дубликатов сообщений для удаления в выбранной папке.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Удаление дубликатов сообщений во всех папках..."
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8336,50 +8368,50 @@ msgstr[0] "Удалено %d копий сообщения в %d папках.\n
 msgstr[1] "Удалено %d копии сообщений в %d папках.\n"
 msgstr[2] "Удалено %d копий сообщений в %d папках.\n"
 
-#: src/mainwindow.c:4764
+#: src/mainwindow.c:4762
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Не найдено дубликатов сообщений в %d папках.\n"
 
-#: src/mainwindow.c:4926 src/messageview.c:2647
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Выберите папку для перехода"
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Обработка правил для применения перед правилами папки"
 
-#: src/mainwindow.c:5037
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Обработка правил для применения после правил папки"
 
-#: src/mainwindow.c:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Настройка фильтрации"
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5156
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: не удалось "
 "определить путь к программе."
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail установлен в качестве почтового клиента по умолчанию."
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5249
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: невозможно "
 "произвести запись в реестр."
 
-#: src/mainwindow.c:5265 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Сканирование папки %s%c%s..."
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8704,7 +8736,7 @@ msgstr ""
 "  Сообщение было удалено или перемещено в другую папку"
 
 #: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7290
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "При обучении произошла ошибка.\n"
 
@@ -8744,7 +8776,7 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -8828,9 +8860,9 @@ msgstr "Проверка подписи..."
 msgid "Go back to email"
 msgstr "Вернуться к письму"
 
-#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
-#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
-#: src/plugins/fancy/fancy_viewer.c:538
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Не удалось сохранить часть составного сообщения: %s"
@@ -8840,28 +8872,28 @@ msgstr "Не удалось сохранить часть составного 
 msgid "Overwrite existing file '%s'?"
 msgstr "Перезаписать существующий файл '%s'?"
 
-#: src/mimeview.c:1839
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"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:1842
-msgid "Error saving all message parts"
-msgstr "Ошибка при сохранении всех частей сообщения"
+"Произошла ошибка при сохранении части сообщения %d. Вы хотите отменить "
+"сохранение или проигнорировать ошибку и продолжить?"
 
 #: src/mimeview.c:1843
-msgid "Skip"
-msgstr "Пропустить"
+msgid "Error saving message part"
+msgstr "Ошибка сохранения части сообщения"
 
-#: src/mimeview.c:1843
-msgid "Skip all"
-msgstr "Пропустить все"
+#: src/mimeview.c:1844
+msgid "Ignore"
+msgstr "Игнорировать"
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "Игнорировать все"
+
+#: src/mimeview.c:1856
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8869,7 +8901,7 @@ msgstr[0] "%d файл сохранен успешно."
 msgstr[1] "%d файла сохранено успешно."
 msgstr[2] "%d файлов сохранено успешно."
 
-#: src/mimeview.c:1861
+#: src/mimeview.c:1868
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8877,7 +8909,7 @@ msgstr[0] "%d файл сохранен успешно"
 msgstr[1] "%d файла сохранено успешно"
 msgstr[2] "%d файлов сохранено успешно"
 
-#: src/mimeview.c:1866
+#: src/mimeview.c:1873
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8885,26 +8917,26 @@ msgstr[0] "%s, %d файл сохранён неудачно."
 msgstr[1] "%s, %d файла сохранено неудачно."
 msgstr[2] "%s, %d файлов сохранено неудачно."
 
-#: src/mimeview.c:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Выберите папку назначения"
 
-#: src/mimeview.c:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' не является каталогом."
 
-#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
 #: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Сохранить как"
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Открыть с помощью"
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8913,7 +8945,7 @@ msgstr ""
 "Введите команду для открытия файла:\n"
 "('%s' будет заменено на имя файла)"
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8924,11 +8956,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Запустить программу?"
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8940,20 +8972,20 @@ msgstr ""
 "\n"
 "Вы уверены, что хотите запустить этот файл?"
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Запустить программу"
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9064,77 +9096,77 @@ msgstr "Отписаться от группы новостей"
 msgid "Rename newsgroup folder"
 msgstr "Переименовать папку группы новостей"
 
-#: src/oauth2.c:239
+#: src/oauth2.c:241
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 отсутствует код аутентификации\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 ошибка соединения\n"
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:257 src/oauth2.c:397
 msgid "OAuth2 TLS connection error\n"
 msgstr "OAuth2 TLS ошибка соединения\n"
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2 токен доступа получен\n"
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2 токен доступа не получен\n"
 
-#: src/oauth2.c:355
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2 обновлённый токен получен\n"
 
-#: src/oauth2.c:357
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2 обновлённый токен не получен\n"
 
-#: src/oauth2.c:489
+#: src/oauth2.c:479
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "OAuth2 обновлённый токен получен\n"
 
-#: src/oauth2.c:491
+#: src/oauth2.c:481
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "OAuth2 обновлённый токен не получен\n"
 
-#: src/oauth2.c:522
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 ошибка записи сокета\n"
 
-#: src/oauth2.c:544
+#: src/oauth2.c:534
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 ошибка превышения времени ожидания сокета\n"
 
-#: src/oauth2.c:638
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 токен доступа еще действительный\n"
 
-#: src/oauth2.c:645
+#: src/oauth2.c:635
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 получение токена доступа с использованием токена обновления\n"
 
-#: src/oauth2.c:649
+#: src/oauth2.c:639
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 пытается получить новый токен доступа с кодом авторизации\n"
 
-#: src/oauth2.c:666
+#: src/oauth2.c:656
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 токен доступа и обновления обновлен\n"
 
-#: src/oauth2.c:698
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 оригинал: %s\n"
 
-#: src/oauth2.c:699
+#: src/oauth2.c:689
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 зашифрованный: %s\n"
 
-#: src/oauth2.c:700
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9631,7 +9663,7 @@ msgstr "Расположение и имя архива"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Выбрать"
 
@@ -9802,6 +9834,10 @@ msgstr "Переименовать"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Удалить сообщения после архивирования"
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Имя файла"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Удалить вложения"
@@ -10105,7 +10141,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:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
 msgid "KiB"
 msgstr "КБ"
 
@@ -10625,14 +10661,14 @@ msgid "Render embedded objects using plugins"
 msgstr "Прорисовка внедрённых объектов  используя модули"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
-msgstr "Открыть в просмотрщике (внешнее содержимое включено)"
+msgid "Open in Viewer (remote content is enabled)"
+msgstr "Открыть в Просмотрщике (внешнее содержимое включено)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Ничего не делать (внешнее содержимое отключено)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4254
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
 #: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Прокси"
@@ -10674,8 +10710,8 @@ msgid "When clicking on a link, by default"
 msgstr "При нажатии на ссылку, по умолчанию"
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
-msgstr "Открывать во внешнем браузере"
+msgid "Open in External Browser"
+msgstr "Открывать во Внешнем Браузере"
 
 #: src/plugins/fancy/fancy_prefs.c:300
 msgid "The CSS in this file will be applied to all HTML parts"
@@ -10684,7 +10720,7 @@ msgstr "CSS в этом файле будет применяться для вс
 #: 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:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Просмотр"
@@ -10693,86 +10729,86 @@ msgstr "Просмотр"
 msgid "Select stylesheet"
 msgstr "Выберите таблицу стилей"
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "Загрузка внешнего содержимого отключена."
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Загружать изображения"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Отображать внешнее содержимое"
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Разрешить JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Разрешить Модули"
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Разрешить Java"
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Открывать ссылки во внешнем браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Произошла ошибка: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:853
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "Поток %s имеет некорректный или неподдерживаемый формат"
 
-#: src/plugins/fancy/fancy_viewer.c:874
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Открыть в Просмотрщике"
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Открыть в Браузере"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Открыть Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Копировать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Скачать Ссылку"
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Сохранить Изображение Как"
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Копировать Изображение"
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Импортировать поток"
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Просмотрщик"
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -11004,7 +11040,7 @@ 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:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Аутентификация"
 
@@ -11223,8 +11259,8 @@ msgid "Cache refresh interval"
 msgstr "Период обновления кэша"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "часов"
 
@@ -11414,15 +11450,6 @@ msgstr ""
 "Если указан существующий почтовый ящик, он \n"
 "будет проверен автоматически."
 
-#: src/plugins/mailmbox/plugin_gtk.c:332
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be deleted.\n"
-"Do you really want to delete?"
-msgstr ""
-"Все папки и сообщения ниже '%s' будут удалены.\n"
-"Действительно хотите удалить?"
-
 #: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Не найдено подходящего метода аутентификации Sieve\n"
@@ -11614,7 +11641,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Включить Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Информация о сервере"
 
@@ -11665,27 +11692,27 @@ 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:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 msgid "User ID"
 msgstr "Пользователь"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:382
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:134
+#: 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
 msgid "Password"
 msgstr "Пароль"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Метод аутентификация"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: 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
 msgid "Automatic"
 msgstr "Автоматически"
@@ -11702,20 +11729,20 @@ msgstr "Sieve сервер не введён."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Не удалось зарегистрировать hook получения писем"
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Не удалось открыть файл журнала событий %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11732,7 +11759,7 @@ msgstr ""
 "\n"
 "Текущий журнал %s"
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Журнал событий"
 
@@ -11992,7 +12019,7 @@ msgid "Show banner"
 msgstr "Показывать баннер"
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Никогда"
@@ -12338,68 +12365,68 @@ msgstr "из %d"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Отображение PDF не удалось по неизвестным причинам."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Список Документов"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "Первая Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Предыдущая Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Следующая Страницы"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Последняя Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Крупнее"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Мельче"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Страница Целиком"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "По Ширине Страницы"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Повернуть Налево"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Повернуть Направо"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Распечатать Документ"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Информация о Документе"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Страница"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Масштаб"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12411,13 +12438,13 @@ msgstr ""
 "помощью библиотеки Poppler %s и программы gs.\n"
 "Авторы будут благодарны за любые комментарии: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "Просмотрщик PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12610,8 +12637,8 @@ 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:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
+#: src/prefs_account.c:2162 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "минут"
 
@@ -12676,64 +12703,64 @@ msgstr "GPG"
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "Не найдено точного совпадения для '%s'; пожалуйста, выберите ключ."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Сбор информации для '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Неопределённое"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Ограниченное"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Абсолютное"
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Выбор Ключей"
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "Идентификатор ключа"
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Доверенный"
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Другой"
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "_Не шифровать"
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Добавить ключ"
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Введите другое имя пользователя или идентификатор ключа:"
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Шифрование %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -13218,8 +13245,8 @@ msgstr "Показать Python консоль..."
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Просмотр"
@@ -13412,19 +13439,6 @@ msgstr "Введите адрес потока, на который вы хот
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' не может использоваться в имени папки."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be permanently deleted.\n"
-"Recovery will not be possible.\n"
-"\n"
-"Do you really want to delete?"
-msgstr ""
-"Все папки и сообщения ниже '%s' будут удалены. Восстановление будет "
-"невозможно.\n"
-"\n"
-"Действительно хотите удалить папку?"
-
 #: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
@@ -13559,7 +13573,7 @@ msgstr "Получать комментарии для постов не ста
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "дней"
 
@@ -13705,7 +13719,7 @@ msgid "Updating comments for '%s'..."
 msgstr "Обновление комментариев для '%s'..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1628
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Требуется авторизация)"
 
@@ -13714,7 +13728,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Запрещено)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Документ не найден)"
 
@@ -14406,63 +14420,63 @@ msgstr "Участники:"
 msgid "Action:"
 msgstr "Действие:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Новая встреча..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Экспортировать календарь..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "_Подписаться на webCal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "_Переименовать..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Об_новить подписки"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "Обзор _списка"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "Обзор _недели"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "Обзор _месяца"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Встречи"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "прошедшие"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "сегодня"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "завтра"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "на этой неделе"
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "в будущем"
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14471,21 +14485,21 @@ msgstr ""
 "\n"
 "Запланированы следующие события %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "Истекло время ожидания (%d секунд) при подключении к %s\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1631
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Не авторизован)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Ошибка %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14498,7 +14512,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14509,46 +14523,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Невозможно создать директорию %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1918
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail требуется доступ к сети, чтобы обновить поток Webcal."
 
-#: src/plugins/vcalendar/vcal_folder.c:1929
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Извлечение календаря для %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "новая подписка"
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1939
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail требуется доступ к сети, чтобы обновить подписку."
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Подписать на WebCal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Введите ссылку на Webcal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "Не удалось разобрать ссылку."
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Вы действительно хотите отписаться?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Удалить подписку"
 
@@ -15022,95 +15036,95 @@ msgstr "Ошибка синтаксиса временной метки в пр
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "Ошибка синтаксиса временной метки в приветствии (не ASCII)\n"
 
-#: src/pop.c:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "Ошибка протокола POP\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "неверный UIDL ответ: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Удаление устаревшего сообщения %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Пропуск сообщения %d [%s] (%d байт)\n"
 
-#: src/pop.c:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "почтовый ящик заблокирован\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Истекло время ожидания\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "команда не поддерживается\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "ошибка во время POP сессии\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "Команда ТОР не поддерживается\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "Новости (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Локальный mbox файл"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Никакой (только SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Имя учётной записи"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Использовать по умолчанию"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Полное имя"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "Почтовый адрес"
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Авто-настройка"
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15118,81 +15132,81 @@ msgstr ""
 "Предупреждение: эта версия Claws Mail\n"
 "была собрана без поддержки IMAP и NNTP."
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Этот сервер требует аутентификацию"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Удостоверять при подключении"
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Сервер для получения"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Локальный ящик"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "SMTP сервер (отправка)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Использовать почтовую команду, а не SMTP сервер"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "команда для отправки почты"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Локальный узел"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "'Входящие' по умолчанию"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Неотфильтрованные сообщения помещаются в эту папку"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "Аутентифицировать перед POP подключением"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после получения"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Удалить по истечении"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 дней 0 часов : удалять немедленно"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Ограничение размера получаемых сообщений"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15200,95 +15214,95 @@ msgstr ""
 "Сообщения, превышающие данный лимит загружаются частично. При их выборе, "
 "возможно получить полное сообщение, либо удалить его."
 
-#: src/prefs_account.c:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Максимальное количество статей для загрузки"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "неограниченно, если указан 0"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(обычно пусто)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Показывать только подписанные папки"
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Режим экономии трафика (не получать теги с сервера)"
 
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:1831
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 "Этот режим использует меньше трафика, но может быть медленнее с некоторыми "
 "серверами."
 
-#: src/prefs_account.c:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Автоматическая проверка"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Использовать глобальные настройки"
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Проверять ящик каждые"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при получении"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "Использовать модули фильтрации при получении"
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Получить почту' проверяет наличие новых сообщений данной учётной записи"
 
-#: src/prefs_account.c:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:1996 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:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Генерировать идентификатор сообщения"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "Включать почтовый адрес в идентификатор сообщения"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Добавить заголовок агента пользователя"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Добавить заданный заголовок"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Аутентификация (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15296,217 +15310,217 @@ msgstr ""
 "Пустое поле означает использовать имя пользователя и пароль те же, что и при "
 "получении."
 
-#: src/prefs_account.c:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Авторизация с POP перед отправкой"
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "Время ожидания аутентификации POP"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Авторизация"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Выберите Поставщика Услуг OAuth2 Почты"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "ID клиента"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "Секрет клиента"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Получить код авторизации"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
 msgstr "Открыть браузер по умолчанию с запросом"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Копировать ссылку"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Код авторизации"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2361
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
 "Вставьте полный URL из браузера или предоставленный токен аутентификации"
 
-#: src/prefs_account.c:2331
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Завершить авторизацию"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Авторизовать"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "Автоматически вставлять подпись"
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Отделять подпись"
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Автоматически установить следующие адреса"
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "Словари проверки орфографии"
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Словарь по умолчанию"
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
 #: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Альтернативный словарь по умолчанию"
 
-#: src/prefs_account.c:2643 src/prefs_account.c:4116
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
 #: 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:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2711 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:2720
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Система конфиденциальности по умолчанию"
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Всегда подписывать сообщения"
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Всегда шифровать сообщения"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr "Всегда подписывать сообщение при ответе на подписанное сообщение"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Всегда шифровать сообщение при ответе на зашифрованное сообщение"
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2797
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Шифровать отправленные сообщения своим ключом в дополнение к ключу получателя"
 
-#: src/prefs_account.c:2761
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Сохранять отправленные зашифрованные сообщения как простой текст"
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
 msgid "Don't use TLS"
 msgstr "Не использовать TLS"
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Использовать команду STARTTLS для запуска зашифрованной сессии"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3003
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Не использовать TLS (но при необходимости, использовать STARTTLS)"
 
-#: src/prefs_account.c:2976
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Клиентские сертификаты"
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Сертификат для получения"
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Клиентский сертификат в виде файла PKCS12 или PEM"
 
-#: src/prefs_account.c:3012
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Сертификат для отправки"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Automatically accept valid TLS certificates"
 msgstr "Автоматически принимать действительный TLS сертификат"
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3093
 msgid "Use non-blocking TLS"
 msgstr "Использовать неблокируемый TLS"
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3105
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Отключите при обнаружении проблем с TLS соединением"
 
-#: src/prefs_account.c:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Использовать прокси сервер"
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3206
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Использовать значения по умолчанию"
 
-#: src/prefs_account.c:3170
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Использовать глобальные настройки прокси сервера"
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Использовать прокси сервер для отправки"
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15514,27 +15528,27 @@ msgstr ""
 "Если выключено, сообщения будут отправлены через прямое подключение, "
 "игнорируя все настройки прокси сервера."
 
-#: src/prefs_account.c:3354
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "Порт POP"
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "Порт IMAP"
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15542,156 +15556,177 @@ msgstr ""
 "Доменное имя будет использоваться в сгенерированном Message-ID, и при "
 "подключении к серверам SMTP."
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Использовать команду для связи с сервером"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Пометить перекрёстные сообщения как прочтённые и цветом:"
 
-#: src/prefs_account.c:3456
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Поместить отправленные сообщения в"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Поместить исходящие сообщения в"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Поместить черновые сообщения в"
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Поместить удалённые сообщения в"
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "Имя учётной записи не введено."
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "Почтовый адрес не введён."
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "SMTP сервер не введён."
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "Имя пользователя не введено."
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "POP сервер не введён."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "Папка по умолчанию 'Входящие' не существует."
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "IMAP сервер не введён."
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "NNTP сервер не введён."
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "имя файла локального ящика не введено."
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "команда приёма почты не введена."
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "Имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3601
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "Пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3636
+#: src/prefs_account.c:3676
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3641
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3733
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "домен не указан."
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "папка отправки не выбрана."
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "папка очереди не выбрана."
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "папка черновиков не выбрана."
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "папка мусорной корзины не выбрана."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Получить"
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Отправить"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Дополнительные"
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Параметры для новой учётной записи"
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "Параметры учётной записи - %s"
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Ошибка (неправильный адрес)"
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Выбрать файл подписи"
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Выбрать файл сертификата"
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (модуль не загружен)"
 
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Авторизация завершена"
+
+#: src/prefs_account.c:6139
+msgid "Your OAuth2 authorisation code has been received by Claws Mail"
+msgstr "Ваш код авторизации OAuth2 получен Claws Mail"
+
+#: src/prefs_account.c:6142
+msgid "Authorisation NOT completed"
+msgstr "Авторизация НЕ завершена"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "Ваш код авторизации OAuth2 не был получен Claws Mail"
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Настроить действия"
@@ -15826,10 +15861,9 @@ msgid "The entry was not saved. Close anyway?"
 msgstr "запись не сохранена. Все равно закрыть?"
 
 #: 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:2168 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Продолжить редактирование"
 
@@ -16026,8 +16060,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "Предупреждать при вставке файла размером более"
 
 #: src/prefs_compose_writing.c:205
-msgid "KiB into message body "
-msgstr "КБ в тело сообщения "
+msgid "KiB into message body"
+msgstr "КБ в тело сообщения"
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -16084,65 +16118,69 @@ msgid "Header name is not set."
 msgstr "Имя заголовка не указано."
 
 #: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Двоеточие (:) не допускается в пользовательском заголовке."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Это имя Заголовка не допускается как пользовательский заголовок."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Выбрать PNG файл"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Выбрать XBM файл"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Выбрать текстовый файл"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Файл не является изображением."
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Неверный размер изображения (48х48)."
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Изображение слишком большое; должно быть максимум 725 байт."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Неверный формат изображения (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Неверный формат изображения (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Не удалось выполнить `compface`. Убедитесь, что путь к нему есть в вашем "
 "$PATH."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Ошибка compface: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Этот файл содержит новые строки."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Удалить заголовок"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Действительно удалить этот заголовок?"
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Текущие пользовательские заголовки"
 
@@ -17597,17 +17635,8 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Горячие клавиши"
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Выбрать предустановку:"
-
-#: src/prefs_other.c:138
-msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
-msgstr ""
-"Вы также можете изменить горячие клавиши меню\n"
-"нажатием любой клавиши при наведении курсора\n"
-"мыши на элемент."
+msgid "Select preset keyboard shortcuts:"
+msgstr "Выберите предустановленные сочетания клавиш:"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
@@ -17979,8 +18008,8 @@ msgstr ""
 "Укажите Content-Transfer-Encoding для тела сообщений, содержащих не-ASCII "
 "символы"
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Отправка"
 
@@ -18747,35 +18776,35 @@ msgstr "Автоматически переносить строки длинн
 msgid "Wrapping"
 msgstr "Перенос строк"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Предпросмотр печати"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "Первая страница"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Последняя страница"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Уместить"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Крупнее"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Мельче"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Страница %d"
@@ -19152,88 +19181,88 @@ msgstr "Введите текст для замены '%s'"
 msgid "Enter variable"
 msgstr "Введите переменную"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Отправка сообщения командой: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Невозможно выполнить команду: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Возникла ошибка при выполнении команды: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Обрабатывать POP перед SMTP..."
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP перед SMTP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Учётная запись '%s': Соединение с SMTP сервером: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "Почта отправлена успешно."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "Отправка HELO..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "Отправка EHLO..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "Отправка MAIL FROM..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "Отправка RCPT TO..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "Отправка DATA..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Завершение..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "При отправке сообщения возникла ошибка."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19703,7 +19732,7 @@ msgstr "Зашифровано"
 msgid "Has attachment(s)"
 msgstr "Сообщение с вложениями"
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19712,11 +19741,11 @@ msgstr ""
 "Ошибка в регулярном выражении (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8405
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Вернуться к списку папок (у Вас есть непрочтённые сообщения)"
 
-#: src/summaryview.c:8406
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Вернуться к списку папок"
 
diff --git a/po/sk.po b/po/sk.po
index dc2dbe89b..1bdebc887 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,15 +8,15 @@ 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-03-27 09:41+0100\n"
-"PO-Revision-Date: 2022-03-27 12:06+0200\n"
+"POT-Creation-Date: 2022-10-11 10:26+0100\n"
+"PO-Revision-Date: 2022-10-15 12:30+0200\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: slovenčina <linux at slavino.sk>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Geany / PoHelper 1.38\n"
+"X-Generator: Gtranslator 42.0\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/account.c:402 src/account.c:469
@@ -56,7 +56,7 @@ 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/mainwindow.c:518 src/messageview.c:213
+#: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Upraviť"
@@ -85,7 +85,7 @@ 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:552
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovať"
@@ -133,19 +133,20 @@ msgstr " _Nastaviť ako predvolený účet "
 #: 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/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:926 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:841 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: 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/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/prefs_actions.c:920 src/prefs_actions.c:946 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/summary_search.c:495
-#: src/summary_search.c:785
+#: 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/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Zavrieť"
 
@@ -178,24 +179,24 @@ msgstr "Zmazať účet"
 #: 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:10736
-#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
-#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
-#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: 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/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/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1193 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:890 src/main.c:2286 src/mainwindow.c:4009
-#: src/mainwindow.c:4212 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:1818
-#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
-#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
+#: 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/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
@@ -206,7 +207,7 @@ msgstr "Zmazať účet"
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
 #: src/plugins/keyword_warner/keyword_warner.c:196
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
 #: src/plugins/managesieve/sieve_editor.c:435
 #: src/plugins/managesieve/sieve_editor.c:632
@@ -218,21 +219,20 @@ msgstr "Zmazať účet"
 #: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2030
 #: 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_actions.c:1315
-#: src/prefs_customheader.c:177 src/prefs_customheader.c:693
-#: 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_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:294 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/toolbar.c:3108
-#: src/wizard.c:1833
+#: 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_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/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
@@ -240,11 +240,11 @@ msgstr "_Zrušiť"
 #: 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/plugins/att_remover/att_remover.c:429
-#: src/plugins/mailmbox/plugin_gtk.c:335
+#: 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:2032 src/prefs_actions.c:1105
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "O_dstrániť"
@@ -263,17 +263,17 @@ msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 #: 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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1860
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: 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
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -329,13 +329,13 @@ msgstr ""
 "%s"
 
 #: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9751 src/ldaputil.c:334
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1829
-#: src/plugins/vcalendar/vcal_folder.c:1847
-#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
+#: 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
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -480,13 +480,13 @@ msgstr ""
 "Naozaj chcete nahradiť všetky mená atribútov\n"
 "predvoleným nastavením?"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:1673 src/main.c:412
-#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -498,13 +498,14 @@ msgstr ""
 msgid "_No"
 msgstr "_Nie"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -539,7 +540,7 @@ msgid "New attribute name:"
 msgstr "Nové meno atribútu:"
 
 #: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
 #: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
@@ -552,14 +553,13 @@ 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/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: 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/mimeview.c:1819 src/password_gtk.c:213
-#: src/plugins/archive/archiver_gtk.c:575
+#: 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
@@ -620,7 +620,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplicitné adresy"
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adresa"
@@ -654,7 +654,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1303 src/editgroup.c:290
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -671,7 +671,7 @@ 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/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: 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"
@@ -680,7 +680,7 @@ msgstr "Emailová adresa"
 msgid "_Book"
 msgstr "_Adresár"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Nástroje"
@@ -783,7 +783,7 @@ 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/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: 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
@@ -940,7 +940,7 @@ msgstr ""
 "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:334 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
 
@@ -1052,7 +1052,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Zložka"
 
@@ -1175,18 +1175,18 @@ msgstr "Aktualizácia adries"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Aktualizácia zlyhala. Zmeny neboli zapísané do adresára."
 
-#: src/alertpanel.c:154 src/compose.c:9825
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Upozornenie"
 
 #: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: 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
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Chyba"
@@ -1307,63 +1307,63 @@ 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:1251
+#: src/common/session.c:201 src/imap.c:1261
 msgid "TLS handshake failed\n"
 msgstr "Zlyhalo vytvorenie spojenia TLS\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "Nie je dostupná žiadna metóda SMTP AUTH\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Zvolená metóda SMTP AUTH nie je dostupná\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "neplatná odozva SMTP\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "nastala chyba relácie SMTP\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "nastala chyba autentifikácie\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 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:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "nemožno vytvoriť reláciu STARTTLS\n"
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Časový limit soketu IO.\n"
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Uplynul časový limit spojenia.\n"
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: spojenie zlyhalo (%s).\n"
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: neznámy hostiteľ.\n"
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: hľadanie hostiteľa zlyhalo (%s).\n"
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "zápis na fd%d: %s\n"
@@ -1699,7 +1699,7 @@ msgstr ""
 msgid "_Add..."
 msgstr "_Pridať..."
 
-#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: 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/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
@@ -1712,7 +1712,7 @@ msgstr "_Odstrániť"
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "Sp_ráva"
 
@@ -1724,7 +1724,7 @@ msgstr "P_ravopis"
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -1784,7 +1784,7 @@ msgstr "_Zalomené"
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vy_brať všetko"
@@ -1889,47 +1889,47 @@ msgstr "_Súkromie"
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 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:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adresár"
 
@@ -1937,11 +1937,11 @@ msgstr "_Adresár"
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "A_kcie"
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_O programe"
 
@@ -1977,12 +1977,12 @@ msgstr "Zobraziť p_ravítko"
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 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:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "Odo_sielateľ"
@@ -2007,27 +2007,27 @@ msgstr "_Nízka"
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 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:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 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:896 src/messageview.c:365
+#: src/compose.c:764 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:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
@@ -2151,7 +2151,7 @@ msgstr "Do tela správy vkladáte súbor %s. Ste si istý, že to chcete urobiť
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Vložiť"
 
@@ -2211,7 +2211,7 @@ 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/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Odoslať"
 
@@ -2375,7 +2375,7 @@ msgstr "Zvolený účet nie je NNTP: Posielanie nie je možné."
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Príloha %s už neexistuje. Ignorovať?"
 
-#: src/compose.c:6430 src/mainwindow.c:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
@@ -2404,9 +2404,11 @@ msgstr "Na automatické doplnenie z adresára použite <TAB>"
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:468
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -2535,42 +2537,52 @@ msgstr "Socketová komunikácia s externým editorom nie je vo Widnows dostupná
 #: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Nemožno spustiť nasledujúci príkaz:\n"
+"Nemožno spustiť nasledujúci príkaz externého editora:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9750
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Externý editor skončil chybou: %s"
 
-#: src/compose.c:9822
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr "id procesu: %"
+
+#: src/compose.c:9830
+#, c-format
+msgid "process id: %d"
+msgstr "id procesu: %d"
+
+#: src/compose.c:9835
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %"
+"%s"
 msgstr ""
-"Externý editor je ešte stále aktívny.\n"
+"Externý editor ešte stále pracuje.\n"
 "Vynútiť ukončenie procesu?\n"
-"ID procesu: %"
+"%s"
 
-#: src/compose.c:10229 src/messageview.c:1094
+#: src/compose.c:10245 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:10432
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10436
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10437
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2578,24 +2590,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10627 src/compose.c:10641
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10655
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10657
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2604,50 +2616,50 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10734
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10735
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10736 src/compose.c:10741
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10740
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10741
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10812
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10814
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10834 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:10892
+#: src/compose.c:10911
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2656,7 +2668,7 @@ msgstr ""
 "Veľkosť vkladaného textu prekročila limit (%d kiB) vloženia.\n"
 "Namiesto toho pridajte prílohu."
 
-#: src/compose.c:11708
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2674,20 +2686,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:11714
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:11715
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11930
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:12226
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2718,7 +2730,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Ladiaci záznam"
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
 #: src/uri_opener.c:226
 msgid "Close"
 msgstr "Zavrieť"
@@ -2905,7 +2917,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:2443
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Súbor"
 
@@ -2913,54 +2925,48 @@ msgstr "Súbor"
 msgid "Add New Addressbook"
 msgstr "Pridať nový adresár"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Musíte zadať názov skupiny."
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
+#: src/editgroup.c:292
+msgid "Edit group data"
 msgstr "Upraviť údaje skupiny"
 
-#: src/editgroup.c:323 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Názov skupiny"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Adresy v skupine"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:452
-msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr ""
-"Emailové adresy môžete presúvať z alebo do skupiny pomocou tlačidiel so "
-"šípkami"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Adresy v skupine"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
-msgstr "Upraviť detaily skupiny"
+#: src/editgroup.c:494
+msgid "Edit group details"
+msgstr "Upraviť podrobnosti skupiny"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "Pridať novú skupinu"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Upraviť zložku"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov zložky:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Nová zložka"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov novej zložky:"
@@ -2989,13 +2995,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:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
 #: 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:3197
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3056,7 +3062,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4227
 msgid "TLS"
 msgstr "TLS"
 
@@ -3217,8 +3223,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:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Zobraziť heslo"
@@ -3240,7 +3246,7 @@ 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:4044
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Základné"
 
@@ -3327,11 +3333,11 @@ msgstr "Pridať nový vCard záznam"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Nemožno nastaviť certifikát klienta.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "nemožno získať rozsah xover\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "nemožno získať rozsah xhdr\n"
 
@@ -3396,8 +3402,8 @@ 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:1178 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: 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
 msgid "None"
 msgstr "Žiadna"
@@ -3408,7 +3414,7 @@ msgstr "Žiadna"
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Plné"
@@ -3646,7 +3652,7 @@ msgstr "Exportovať adresár do súboru LDIF"
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: src/export.c:112 src/summaryview.c:8485
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
@@ -3728,11 +3734,19 @@ msgid ""
 "%s?"
 msgstr "Súbor %s je prázdny alebo poškodený! Chcete použiť záložný súbor z %s?"
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr "pravidlo nie je závislé na účte\n"
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"pravidlo je závislé na účte, vyhovuje účtu práve použitému na získanie "
+"správ\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3741,13 +3755,13 @@ msgstr ""
 "pravidlo je závislé na účte [id=%d, názov='%s'], vyhovuje účtu práve "
 "použitému na získanie správ\n"
 
-#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
-#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
-#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "NE_EXISTUJÚCE"
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
@@ -3755,7 +3769,7 @@ msgstr ""
 "pravidlo je závislé na účte, nevyhovuje účtu práve použitému na získanie "
 "správ\n"
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
@@ -3764,114 +3778,125 @@ msgstr ""
 "pravidlo je závislé na účte [id=%d, názov='%s'], nevyhovuje účtu práve "
 "použitému na získanie správ [id=%d, názov='%s']\n"
 
-#: src/filtering.c:646
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"pravidlo nie je závislé na účte, na žiadosť používateľa boli i tak "
-"aplikované všetky pravidlá\n"
+"pravidlo nie je závislé na účte, na žiadosť používateľa sú aplikované všetky "
+"pravidlá\n"
 
-#: src/filtering.c:652
+#: src/filtering.c:665
+msgid ""
+"rule is account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"pravidlo je závislé na účte, na žiadosť používateľa sú aplikované všetky "
+"pravidlá\n"
+
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
-"pravidlo je závislé na účte [id=%d, názov='%s'], ale na žiadosť používateľa "
-"boli aplikované všetky pravidlá\n"
+"pravidlo je závislé na účte [id=%d, názov='%s'], na žiadosť používateľa sú "
+"aplikované všetky pravidlá\n"
+
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "pravidlo je závislé na účte, na žiadosť používateľa preskočené\n"
 
-#: src/filtering.c:670
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "pravidlo je závislé na účte [id=%d, názov='%s'], na žiadosť používateľa "
 "preskočené\n"
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
-msgstr "pravidlo je závislé na účte, na žiadosť používateľa preskočené\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "pravidlo je závislé na účte, vyhovuje práve použitému účtu\n"
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"pravidlo je závislé na účte [id=%d, názov='%s'], nevyhovuje práve použitému "
+"pravidlo je závislé na účte [id=%d, názov='%s'], vyhovuje práve použitému "
 "účtu [id=%d, názov='%s']\n"
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr "pravidlo je závislé na účte, nevyhovuje práve použitému účtu\n"
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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 ""
-"pravidlo je závislé na účte [id=%d, názov='%s'], práve použitý účet [id=%d, "
-"názov='%s']\n"
+"pravidlo je závislé na účte [id=%d, názov='%s'], nevyhovuje práve použitému "
+"účtu [id=%d, názov='%s']\n"
 
-#: src/filtering.c:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "aplikovanie akcie [ %s ]\n"
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "akciu nemožno aplikovať\n"
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "žiadne ďalšie spracovanie po akcii [ %s ]\n"
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "spracovanie pravidla „%s” [ %s ]\n"
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "spracovanie pravidla <bez mena> [ %s ]\n"
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "vypnuté pravidlo „%s” [ %s ]\n"
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "vypnuté pravidlo [ %s ]\n"
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "neurčené"
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "začlenenie"
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr "manuálne"
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "spracovanie zložky"
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "pred-spracovanie"
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "po-spracovanie"
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3888,11 +3913,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3974,17 +3999,17 @@ 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:433
+#: 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:2104
+#: src/plugins/vcalendar/vcal_folder.c:2102
 #, 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:445 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2111
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2109
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
@@ -4016,7 +4041,7 @@ msgstr "Označiť všetky ako neprečítané _rekurzívne"
 msgid "R_un processing rules"
 msgstr "Sp_ustiť pravidlá spracovania"
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "Pre_hľadať zložku..."
 
@@ -4069,7 +4094,7 @@ msgstr "Označiť všetky ako prečítané"
 
 #: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
@@ -4085,7 +4110,7 @@ msgstr "Označiť všetky ako neprečítané"
 
 #: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
 "Naozaj chcete označiť všetky správy tejto zložky a jej podzložiek ako "
@@ -4095,12 +4120,12 @@ msgstr ""
 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:4693
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prehľadávanie zložky %s/%s..."
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prehľadávanie zložky %s..."
@@ -4147,7 +4172,7 @@ msgstr "Otváram zložku %s..."
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
@@ -4159,7 +4184,7 @@ msgstr "Vymazať všetky správy z koša?"
 msgid "_Empty trash"
 msgstr "_Vyprázdniť kôš"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
@@ -4273,7 +4298,7 @@ msgstr "Názov diskusnej skupiny"
 msgid "Messages"
 msgstr "Správy"
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Typ"
 
@@ -4299,11 +4324,11 @@ msgstr "neznáme"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemožno získať zoznam diskusných skupín."
 
-#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/grouplistdialog.c:503
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
@@ -4331,7 +4356,7 @@ 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:862
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4420,46 +4445,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "pridáva podporu šifrovaných spojení so serverom\n"
 
 #: src/gtk/about.c:463
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "pridáva podporu adries IPv6, novej verzie protokolu IP\n"
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "umožňuje konverziu znakov medzi rôznymi kódovaniami\n"
 
-#: src/gtk/about.c:484
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "pridáva podporu adries IPv6\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "pridáva podporu adresárov PalmOS\n"
 
-#: src/gtk/about.c:494
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "pridáva podporu zdieľaných adresárov LDAP\n"
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "pridáva podporu protokolu serverov IMAP a NNTP\n"
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "pridáva podporu tém SVG\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "pridáva podporu správy relácií\n"
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "pridáva podporu detekcie zmien sieťového pripojenia\n"
 
-#: src/gtk/about.c:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "pridáva podporu tém SVG\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "pridáva podporu autentifikácie OAuth2\n"
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4470,7 +4500,7 @@ msgstr ""
 "Free Software Foundation, a to vo verzii 3 alebo (podľa svojho rozhodnutia) "
 "v akejkoľvek ďalšej verzii."
 
-#: src/gtk/about.c:574
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4481,7 +4511,7 @@ msgstr ""
 "ZÁRUKY; a to i bez predpokladanej záruky PREDAJNOSTI, či VHODNOSTI NA URČITÝ "
 "ÚČEL. Ďalšie podrobnosti nájdete v GNU General Public License."
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4489,73 +4519,73 @@ 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:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Štatistiky relácie\n"
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Začatá: %s\n"
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Došlá komunikácia\n"
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Prijaté správy: %d\n"
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Odoslaná komunikácia\n"
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/presmerované správy: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpovede na správy: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Presmerované správy: %d\n"
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Odoslané správy celkom: %d\n"
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "O programe Claws Mail"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Informácie"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Autori"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "_Poznámky k verzii"
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "Štati_stiky"
 
@@ -5032,7 +5062,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Organizácia"
 
@@ -5245,7 +5275,7 @@ msgid "Folder contains marked messages"
 msgstr "Zložka obsahuje označené správy"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+msgid "IMAP folder which contains subfolders only"
 msgstr "Zložka IMAP, ktorá obsahuje len podzložky"
 
 #: src/gtk/icon_legend.c:92
@@ -5415,15 +5445,15 @@ msgstr "_Použiť"
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Skryť"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
 #: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
-#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Účet"
@@ -5879,8 +5909,7 @@ msgstr "(bez Predmetu)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Názov súboru:"
@@ -5893,194 +5922,194 @@ msgstr "Veľkosť súboru:"
 msgid "Load Image"
 msgstr "Načítať obrázok"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "Spojenie IMAP prerušené\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "Chyba IMAP na %s:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "autentifikovaný"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "neautentifikovaný"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "zlý stav"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "chyba streamu"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 "chyba spracovania (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "spojenie odmietnuté"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "chyba pamäte"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "fatálna chyba"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "chyba protokolu (pravdepodobne server, ktorý nedodržiava štandard RFC)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "spojenie nebolo prijaté"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "Chyba pri APPEND"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "Chyba pri NOOP"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "Chyba pri LOGOUT"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "Chyba pri CAPABILITY"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "Chyba pri CHECK"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "Chyba pri CLOSE"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "Chyba pri EXPUNGE"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "Chyba pri COPY"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "Chyba pri UID COPY"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "Chyba pri CREATE"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "Chyba pri DELETE"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "Chyba pri EXAMINE"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "Chyba pri FETCH"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "Chyba pri UID FETCH"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "Chyba pri LIST"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "Chyba pri LOGIN"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "Chyba pri LSUB"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "Chyba pri RENAME"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "Chyba pri SEARCH"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "Chyba pri UID SEARCH"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "Chyba pri SELECT"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "Chyba pri STATUS"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "Chyba pri STORE"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "Chyba pri UID STORE"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "Chyba pri SUBSCRIBE"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "Chyba pri UNSUBSCRIBE"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "Chyba pri STARTTLS"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "Chyba pri INVAL"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "Chyba pri EXTENSION"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "Chyba pri SASL"
 
-#: src/imap.c:751
+#: src/imap.c:753
 msgid "TLS error"
 msgstr "Chyba TLS"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Neznáma chyba [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6092,7 +6121,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:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6104,7 +6133,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:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6116,7 +6145,7 @@ msgstr ""
 "Prihlásenie CRAM-SHA-1 funguje, len ak bola knižnica libetpan zostavená s "
 "podporou SASL, a je nainštalovaný zásuvný modul SCRAM SASL."
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6128,7 +6157,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:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6140,7 +6169,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:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -6150,36 +6179,36 @@ msgstr ""
 "\n"
 "Chyba OAuth2. Skontrolujte a opravte nastavenia OAuth2 svojho účtu."
 
-#: src/imap.c:1004
+#: src/imap.c:1014
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s"
 
-#: src/imap.c:1008
+#: src/imap.c:1018
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: prihlásenie odmietnuté.%s\n"
 
-#: src/imap.c:1026
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1043 src/imap.c:1046
 #, 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:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 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:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 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"
@@ -6193,108 +6222,108 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 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:1192
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru IMAP: %s: %d..."
 
-#: src/imap.c:1257
+#: src/imap.c:1267
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Nemožno sa pripojiť k serveru IMAP: %s:%d"
 
-#: src/imap.c:1260
+#: src/imap.c:1270
 #, 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:1292 src/imap.c:4164
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "Nemožno vytvoriť reláciu STARTTLS.\n"
 
-#: src/imap.c:1364
+#: src/imap.c:1374
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s.\n"
 
-#: src/imap.c:1367
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
-#: src/imap.c:1795
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Pridávam správy..."
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopírujem správy..."
 
-#: src/imap.c:2526
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "Hľadanie zlyhalo kvôli chybe servera."
 
-#: src/imap.c:2610
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "nemožno nastaviť príznak zmazania\n"
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "nemožno odstrániť\n"
 
-#: src/imap.c:2992
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Hľadám neodoberané zložky v %s..."
 
-#: src/imap.c:2995
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Hľadám podzložky %s..."
 
-#: src/imap.c:3286
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nemožno vytvoriť schránku: príkaz LIST zlyhal\n"
 
-#: src/imap.c:3299
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "nemožno vytvoriť schránku\n"
 
-#: src/imap.c:3429
+#: src/imap.c:3439
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nemožno premenovať schránku: %s na %s\n"
 
-#: src/imap.c:3542
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "nemožno odstrániť schránku \n"
 
-#: src/imap.c:3821
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST zlyhal\n"
 
-#: src/imap.c:3906
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Označujem správy..."
 
-#: src/imap.c:4009
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nemožno vybrať zložku: %s\n"
 
-#: src/imap.c:4161
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje STARTTLS.\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo  sa obnoviť možnosti servera.\n"
 
-#: src/imap.c:4176
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6303,20 +6332,20 @@ msgstr ""
 "Pripojenie k %s zlyhalo: server vyžaduje STARTTLS, ale Claws Mail bol "
 "zostavený bez podpory STARTTLS.\n"
 
-#: src/imap.c:4184
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
-#: src/imap.c:4407
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Sťahujem správu..."
 
-#: src/imap.c:5108
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "nemožno nastaviť príznaky zmazania: %d\n"
 
-#: src/imap.c:6143
+#: src/imap.c:6153
 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"
@@ -6367,7 +6396,7 @@ msgstr "_Odoberané zložky"
 msgid "_Subscribe..."
 msgstr "O_doberať..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Odhlásiť sa..."
 
@@ -6399,21 +6428,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:422 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 #, 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:423
+#: 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:2097
+#: src/plugins/vcalendar/vcal_folder.c:2095
 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:453 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2117
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2115
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6421,32 +6450,33 @@ msgstr ""
 "Nemožno premenovať zložku.\n"
 "Nový názov je neprípustný."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Zvoľte cieľovú zložku na presun zložky „%s”"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 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/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
+#: src/plugins/rssyl/rssyl_cb_menu.c:190
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"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"
+"Všetky zložky a správy v „%s” budú trvalo odstránené.\n"
+"Ich obnovenie nebude možné\n"
 "\n"
 "Naozaj chcete pokračovať?"
 
-#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: 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:2050
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemožno odstrániť zložku „%s”."
@@ -6473,7 +6503,7 @@ msgstr "_Hľadať"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Zvoľte podzložku %s, ktorú chcete odoberať: "
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Odoberať"
 
@@ -6707,32 +6737,32 @@ msgstr "Vyberte súbor Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail  potrebuje na prijatie pošty pripojenie k sieti."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s zlyhal\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
@@ -6740,28 +6770,28 @@ msgstr[0] "Hotovo (%d správa (%s) prijatá)"
 msgstr[1] "Hotovo (%d správy (%s) prijaté)"
 msgstr[2] "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Autentifikácia zlyhala"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: 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
 msgid "Locked"
 msgstr "Správa je zamknutá"
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Časový limit"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
@@ -6769,66 +6799,66 @@ msgstr[0] "Dokončené (%d nová správa)"
 msgstr[1] "Dokončené (%d nové správy)"
 msgstr[2] "Dokončené (%d nových správ)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru POP3: %s:%d..."
 
-#: src/inc.c:930
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d"
 
-#: src/inc.c:934
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autentifikácia..."
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Prijímanie správ z %s (%s)..."
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6836,16 +6866,16 @@ msgstr[0] "Prijímam (%d správa (%s) prijatá)"
 msgstr[1] "Prijímam (%d správy (%s) prijaté)"
 msgstr[2] "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty nastala chyba."
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6854,37 +6884,37 @@ msgstr ""
 "Pri spracovávaní pošty nastala chyba:\n"
 "%s"
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Nemožno zapisovať do súboru."
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba soketu pri pripojení k %s:%d."
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Vzdialený hostiteľ %s:%d ukončil spojenie."
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "Poštová schránka je zamknutá."
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6893,11 +6923,11 @@ msgstr ""
 "Poštová schránka je zamknutá:\n"
 "%s"
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autentifikácia zlyhala."
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6906,7 +6936,7 @@ msgstr ""
 "Autentifikácia zlyhala:\n"
 "%s"
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6914,48 +6944,48 @@ msgstr ""
 "Vypršal limit relácie. Môže pomôcť úprava (zvýšenie) hodnoty časového limitu "
 "spojení v Nastavenia/Ostatné/Rôzne."
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: 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:1834
+#: 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
 msgid "seconds"
 msgstr "sekúnd"
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minúta"
 msgstr[1] "minúty"
 msgstr[2] "minúty"
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodín"
 
-#: src/inc.c:1661
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sPracujete odpojený. Zmeniť na nasledujúcich %d %s?"
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete odpojený. Pripojiť?"
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "_Len raz"
 
@@ -7382,829 +7412,829 @@ msgstr "NetworkManager: sieť je pripojená.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "Zo_braziť"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "Nastav_enie"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "Pridať m_ailbox"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Zmeniť poradie schránok..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "_Importovať súbor mbox..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "Exportovať _výber do súboru mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "Vyčistiť všetky _koše"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Uložiť email ako..."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Uložiť časť ako..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Nastavenie strany..."
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "S_ynchronizovať zložky"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "_Skončiť"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Zvoliť _vlákno"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Nájsť v aktuálnej správe..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "_Rýchle vyhľadanie"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "_Ukázať alebo skryť"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "Panel nás_trojov"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Nastav_iť zobrazované stĺpce"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "V _zozname zložiek..."
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "V zozname _správ.."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "Rozmiestnenie _okien"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "_Radiť"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "Pre_jsť na"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Predošlá správa"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "Ďa_lšia správa"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Ďalšia _neprečítaná správa"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Predchádzajúca no_vá správa"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Ďalšia no_vá správa"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Predchádzajúca _označená správa"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Ďalšia _označená správa"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Predchádzajúca správa s návestí_m"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Ďalšia správa s návestí_m"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:594
 msgid "Previously opened message"
 msgstr "Naposledy otvorená správa"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Ďalšia o_tvorená správa"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Rodičovská správa"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Ďalšia nepr_ečítaná zložka"
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "_Zložka..."
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Predošlá časť"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Posúvanie správy"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Predošlý riadok"
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Ďalší riadok"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Predošlá strana"
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Ďalšia strana"
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Dekódovať"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Zdrojový kód správ_y"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Správová časť"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Zobraziť ako text"
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Otvoriť pomocou..."
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citácia"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "_Aktualizovať sumár"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "P_rijať"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Prijať z _aktuálneho účtu"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Prijať zo _všetkých účtov"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "_Zrušiť prijímanie"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "Odoslať _správy z fronty"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "_Napísať novú správu"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "Napísať nový príspevok"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:665 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "O_dpovedať komu"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "Emai_lová konferencia"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "Sledovať a odpovedať na"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "_Poslať ďalej"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Poslať ďale_j ako prílohu"
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
 #: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "P_resmerovať"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "Emai_lová-Konferencia"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "_Pomocník"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "_Odhlásiť sa"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "Zobraziť archív"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "Kontaktovať vlastníka"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "Pre_sunúť..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Presunúť _do koša"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "Z_mazať..."
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Presunúť vlákno do _koša"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "_Zmazať vlákno"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Zrušiť príspevo_k"
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "O_značiť"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "O_dznačiť"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Označiť ako _prečítané"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Označiť ako n_eprečítané"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Označiť všetky v priečinku ako prečítané"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Označiť všetky v priečinku ako neprečítané"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Zrušiť ignorovanie vlákna"
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Sledovať vlákno"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Zrušiť sledovanie vlákna"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Označiť ako _spam"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Označiť ako _nie spam"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Odomknúť"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "_Farebné označenie"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "Z_načky"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Overiť podpis"
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Pridať odosielateľa _do adresára"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "Zoz_bierať adresy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Z aktuálnej _zložky..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Z vybraných _správ..."
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "Filtrovať _všetky správy v zložke"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "Filtrovať _zvolené správy"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustiť sprac_ovanie pravidiel"
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Podľa _autora"
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Podľa a_dresáta"
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Podľa _odosielateľa"
 
-#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Vytvoriť pravidlo spracovania"
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Zobraziť všetky _URL..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "Skontrolovať nové správy vo všetkých pri_ečinkoch"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Zmazať du_plikované správy"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "V zvolenej zložke"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "Vo všetkých zložkách"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "Vyko_nať"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "V_ymazať"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr "Cer_tifikáty TLS"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Záznam _filtra"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Záznam _siete"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "_Ladiaci záznam"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "_Zabudnúť všetky heslá relácie"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr "Zabudnúť _hlavnú tajnú vetu"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "Z_meniť aktívny účet"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "Nastavenie aktívneho _účtu..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "Vytvoriť _nový účet..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "_Upraviť účty..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "Nas_tavenia..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "Pred-sprac_ovanie..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "Po-spra_covanie..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Filtrovanie..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "Ša_blóny..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Akcie..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "Z_načky..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "_Online používateľské FAQ"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "_Legenda k ikonám"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Nastaviť ako predvoleného klienta"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "Odpojený reži_m"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Panel nástr_ojov"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "Zobraze_nie správy"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "Stavový ria_dok"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Hlavičky stĺpcov"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "Zobraziť _vlákna"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Skryť prečítané vlákna"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "S_kryť prečítané správy"
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Zba_liť všetky"
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Zbaliť od úrovne _2"
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Zbaliť od úrovne _3"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Text _vedľa ikon"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Len _ikony"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Len _text"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "Šta_ndardný"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "_Tri stĺpce"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "Š_iroká správa"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "Široký _zoznam správ"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "Podľa _čísla"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "Podľa _veľkosti"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "Podľa _dátumu"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Podľa dátumu v_lákna"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "Podľa _farebnej menovky"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Podľa _značky"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "Podľa _označenia"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "Podľa _stavu"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "Podľa _prílohy"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Podľa s_kóre"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Podľa _zamknutia"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Zostupne"
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6489
 msgid "Modify tags..."
 msgstr "Zmeniť značky..."
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Nastala chyba(y). Kliknite tu na zobrazenie okna so záznamom."
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Zvoliť účet"
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Záznam komunikácie"
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Záznam ladenia filtrovania/spracovania"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "záznam filtrovania zapnutý\n"
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "záznam filtrovania vypnutý\n"
 
-#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
-#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
+#: 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
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8218,18 +8248,18 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, táto bude\n"
 "automaticky prehľadaná."
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka „%s” už existuje."
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8238,51 +8268,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:3389
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Skončiť"
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Synchronizovať"
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplicitné správy..."
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4703
 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:4711
+#: src/mainwindow.c:4709
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8290,7 +8320,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:4715
+#: src/mainwindow.c:4713
 #, 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"
@@ -8298,11 +8328,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:4753
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Mažem duplicitné správy vo všetkých zložkách..."
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8310,48 +8340,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:4764
+#: src/mainwindow.c:4762
 #, 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:4926 src/messageview.c:2647
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Zvoľte zložku na prechod"
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: src/mainwindow.c:5037
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5156
 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:5249
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5249
 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:5265 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prehľadávanie zložky %s%c%s..."
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8672,7 +8702,7 @@ msgstr ""
 "  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:7290
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
@@ -8712,7 +8742,7 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Otvoriť"
 
@@ -8793,9 +8823,9 @@ msgstr "Overovanie podpisu..."
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
-#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
-#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
-#: src/plugins/fancy/fancy_viewer.c:538
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nemožno uložiť časť viacdielnej správy: %s"
@@ -8805,28 +8835,28 @@ msgstr "Nemožno uložiť časť viacdielnej správy: %s"
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor „%s”?"
 
-#: src/mimeview.c:1839
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"An error has occurred while saving message part %d. Do you want to cancel "
+"saving or ignore error and continue?"
 msgstr ""
-"Pri ukladaní časti správy #%d nastala chyba. Chcete zrušiť operáciu alebo "
-"preskočiť chybu a pokračovať?"
-
-#: src/mimeview.c:1842
-msgid "Error saving all message parts"
-msgstr "Chyba pri ukladaní všetkých častí správy"
+"Pri ukladaní časti správy %d nastala chyba. Chcete zrušiť operáciu alebo "
+"ignorovať chybu a pokračovať?"
 
 #: src/mimeview.c:1843
-msgid "Skip"
-msgstr "Preskočiť"
+msgid "Error saving message part"
+msgstr "Chyba pri ukladaní časti správy"
 
-#: src/mimeview.c:1843
-msgid "Skip all"
-msgstr "Preskočiť všetko"
+#: src/mimeview.c:1844
+msgid "Ignore"
+msgstr "Ignorovať"
+
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "Ignorovať všetko"
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1856
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8834,7 +8864,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:1861
+#: src/mimeview.c:1868
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8842,7 +8872,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:1866
+#: src/mimeview.c:1873
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8850,26 +8880,26 @@ msgstr[0] "%s, súbor zlyhal."
 msgstr[1] "%s, %d súbory zlyhali."
 msgstr[2] "%s, %d súborov zlyhalo."
 
-#: src/mimeview.c:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1910 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:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
 #: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8878,7 +8908,7 @@ msgstr ""
 "Zadajte príkazový na otvorenie súboru:\n"
 "(„%s” bude nahradené názvom súboru)"
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8889,11 +8919,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Spustiť neznámy binárny súbor?"
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8905,20 +8935,20 @@ msgstr ""
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Spustiť binárny súbor"
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -9029,77 +9059,77 @@ msgstr "Odhlásiť sa z diskusnej skupiny"
 msgid "Rename newsgroup folder"
 msgstr "Premenovať diskusnú zložku"
 
-#: src/oauth2.c:239
+#: src/oauth2.c:241
 msgid "OAuth2 missing authorization code\n"
 msgstr "Chýba autorizačný kód OAuth2\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "Chyba spojenia OAuth2\n"
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:257 src/oauth2.c:397
 msgid "OAuth2 TLS connection error\n"
 msgstr "Chyba spojenia OAuth2 TLS\n"
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "Prístupový token OAuth2 získaný\n"
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "Prístupový token OAuth2 nezískaný\n"
 
-#: src/oauth2.c:355
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "Obnovovací token OAuth2 získaný\n"
 
-#: src/oauth2.c:357
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "Obnovovací token OAuth2 nezískaný\n"
 
-#: src/oauth2.c:489
+#: src/oauth2.c:479
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "Náhradný obnovovací token OAuth2 poskytnutý\n"
 
-#: src/oauth2.c:491
+#: src/oauth2.c:481
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "Náhradný obnovovací token OAuth2 neposkytnutý\n"
 
-#: src/oauth2.c:522
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "Chyba zápisu soketu OAuth2\n"
 
-#: src/oauth2.c:544
+#: src/oauth2.c:534
 msgid "OAuth2 socket timeout error\n"
 msgstr "Uplynul časový limit socketu OAuth2\n"
 
-#: src/oauth2.c:638
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "Prístupový token OAuth2 stále platný\n"
 
-#: src/oauth2.c:645
+#: src/oauth2.c:635
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "Získanie prístupového tokenu OAuth2 pomocou obnovovacieho tokenu\n"
 
-#: src/oauth2.c:649
+#: src/oauth2.c:639
 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:666
+#: src/oauth2.c:656
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "Prístupový a obnovovací token OAuth2 aktualizovaný\n"
 
-#: src/oauth2.c:698
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "Originál OAuth2: %s\n"
 
-#: src/oauth2.c:699
+#: src/oauth2.c:689
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "Kódovaný OAuth2: %s\n"
 
-#: src/oauth2.c:700
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9595,7 +9625,7 @@ msgstr "Umiestnenie a meno archívu"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Zvoliť"
 
@@ -9767,6 +9797,10 @@ msgstr "Premenovať"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Zvoľte túto možnosť na zmazanie správ po archivácii"
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Názov súboru"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Odstrániť prílohy"
@@ -10072,7 +10106,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:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
 msgid "KiB"
 msgstr "kiB"
 
@@ -10594,14 +10628,14 @@ msgid "Render embedded objects using plugins"
 msgstr "Spracovať zahrnuté objekty pomocou zásuvných modulov"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
+msgid "Open in Viewer (remote content is enabled)"
 msgstr "Otvoriť v prehliadači (vzdialený obsah je zapnutý)"
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "Neurobiť nič (vzdialený obsah je vypnutý)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4254
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
 #: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Proxy"
@@ -10643,7 +10677,7 @@ msgid "When clicking on a link, by default"
 msgstr "Pri kliknutí na odkaz, predvolene"
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
+msgid "Open in External Browser"
 msgstr "Otvoriť v externom prehliadači"
 
 #: src/plugins/fancy/fancy_prefs.c:300
@@ -10653,7 +10687,7 @@ msgstr "CSS v tomto súbore bude použité na všetky časti 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:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "P_rehliadať"
@@ -10662,86 +10696,86 @@ msgstr "P_rehliadať"
 msgid "Select stylesheet"
 msgstr "Vyberte štýlopis"
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "Načítavanie vzdialeného obsahu je vypnuté."
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Načítať obrázky"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Zapnúť vzdialený obsah"
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Povoliť JavaScript"
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Povoliť zásuvné moduly"
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Povoliť Java"
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Otvoriť odkazy v externom prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Nastala chyba: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:853
 #, 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:874
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Otvoriť v prehliadači"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Otvoriť obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Kopírovať odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Stiahnuť odkaz"
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Uložiť obrázok ako"
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Kopírovať obrázok"
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Importovať kanál"
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Vkusný"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Vkusný zobrazovač HTML"
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10975,7 +11009,7 @@ 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:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Autentifikácia"
 
@@ -11193,8 +11227,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:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "hodín"
 
@@ -11383,15 +11417,6 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, bude\n"
 "táto automaticky prehľadaná."
 
-#: src/plugins/mailmbox/plugin_gtk.c:332
-#, 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ť?"
-
 #: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Nie je dostupná metóda Sieve auth\n"
@@ -11582,7 +11607,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:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Informácie o servere"
 
@@ -11634,27 +11659,27 @@ 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:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:382
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:134
+#: 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
 msgid "Password"
 msgstr "Heslo"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: 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
 msgid "Automatic"
 msgstr "Automatické"
@@ -11671,20 +11696,20 @@ msgstr "Nebol zadaný server Sieve."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Zlyhala registrácia obsluhy udalosti „newmail”"
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Nemožno otvoriť súbor záznamu: %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11701,7 +11726,7 @@ msgstr ""
 "\n"
 "Aktuálny záznam je %s"
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Súbor záznamu"
 
@@ -11973,7 +11998,7 @@ msgid "Show banner"
 msgstr "Zobraziť titulkový pruh"
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Nikdy"
@@ -12319,68 +12344,68 @@ msgstr "z %d"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Spracovanie PDF zlyhalo z neznámeho dôvodu."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Obsah dokumentu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "Prvá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Predošlá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Ďalšia strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Posledná strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Zväčšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Zmenšiť"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Celá strana"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Celá šírka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Otočiť vľavo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Otočiť vpravo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Vytlačiť dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Informácie o dokumente"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Číslo strany"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Mierka"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12393,13 +12418,13 @@ msgstr ""
 "\n"
 "Akákoľvek spätná väzba je vítaná: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "Zobrazovať PDF"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12592,8 +12617,8 @@ 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:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
+#: src/prefs_account.c:2162 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minút"
 
@@ -12656,64 +12681,64 @@ msgstr "GPG"
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "Nenájdená presná zhoda s/so „%s”, prosím zvoľte kľúč."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Zhromažďujem informácie pre „%s” ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Nezadaná"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Čiastočná"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Úplná"
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Zvoľte kľúče"
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "ID kľúča"
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Dôveryhodný"
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Ostatné"
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "_Nešifrovať"
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Pridať kľúč"
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Zadajte iného používateľa alebo ID kľúča:"
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Šifrovanie pre %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -13195,8 +13220,8 @@ msgstr "Zobraziť konzolu Python..."
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Prechádzať"
@@ -13388,19 +13413,6 @@ msgstr "Zadajte URL kanála noviniek, ktoré chcete odoberať:"
 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:190
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be permanently deleted.\n"
-"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é.\n"
-"Ich obnovenie nebude možné\n"
-"\n"
-"Naozaj chcete pokračovať?"
-
 #: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
@@ -13532,7 +13544,7 @@ msgstr "Sťahovať komentáre príspevkov novšie ako"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "dní"
 
@@ -13674,7 +13686,7 @@ 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:1628
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Vyžadovaná autorizácia)"
 
@@ -13683,7 +13695,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Neprístupné)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Nenájdené)"
 
@@ -14372,63 +14384,63 @@ msgstr "Účastníci:"
 msgid "Action:"
 msgstr "Akcia:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nové stretnutie..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exportovať kalendár..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "Prihlá_siť sa do Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "P_remenovať..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Aktualizovať _prihlásenia"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "Zobrazenie _zoznamu"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Týždenný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "_Mesačný pohľad"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Stretnutia"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "v minulosti"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "dnes"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "zajtra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "tento týždeň"
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "neskôr"
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14437,21 +14449,21 @@ msgstr ""
 "\n"
 "Toto sú plánované udalosti %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, 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:1631
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Neautorizované)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Chyba %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14464,7 +14476,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14475,46 +14487,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Nemožno vytvoriť adresár %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1918
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1929
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Prijímanie kalendára pre %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "nové prihlásenie"
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1939
 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:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Prihlásiť sa do Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Zadajte URL WebCal:"
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "Nemožno spracovať URL."
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Naozaj sa chcete odhlásiť?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Odstrániť prihlásenie"
 
@@ -14990,95 +15002,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:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "Chyba protokolu POP\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatná UIDL odpoveď: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Odstraňujem starú správu %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Preskakujem správu %d [%s] (%d B)\n"
 
-#: src/pop.c:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "poštová schránka je zamknutá\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Čas spojenia vypršal\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "nastala chyba relácie POP\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "Príkaz TOP nie je podporovaný\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Žiadne (len SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Názov účtu"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Nastaviť ako predvolené"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "Emailová adresa"
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Automatická konfigurácia"
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -15086,81 +15098,81 @@ msgstr ""
 "Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP a News."
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentifikáciu"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Autentifikovať pri pripojení"
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Lokálna poštová schránka"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Lokálne"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Predvolený inbox"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tejto zložke"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "Autentifikovať pred pripojením POP"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "Zvoliť"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na servere po ich prijatí"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dní a 0 hodín: mazať ihneď"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15168,94 +15180,94 @@ msgstr ""
 "Správy väčšie ako táto hodnota budú stiahnuté čiastočne. Po ich zvolení ich "
 "bude možné buď stiahnuť úplne, alebo ich odstrániť."
 
-#: src/prefs_account.c:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "Zložka servera IMAP"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 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:1798
+#: src/prefs_account.c:1831
 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:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatická kontrola"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Použiť globálne nastavenia"
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Automaticky kontrolovať novú poštu každých"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 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:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:1996 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:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Pridať hlavičku „user agent”"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15263,216 +15275,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:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Autentifikovať cez POP pred odosielaním"
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "Časový limit autentifikácie POP"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Autorizácia"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Zvoľte Poskytovateľa OAuth2 emailovej služby"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "ID klienta"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "Heslo klienta"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Získať autorizačný kód"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
 msgstr "Otvoriť predvolený prehliadač s požiadavkou"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Kopírovať odkaz"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Autorizačný kód"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2361
 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:2331
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Dokončiť autorizáciu"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Autororizovať"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "Automaticky vložiť podpis"
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2596 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:2643 src/prefs_account.c:4116
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
 #: 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:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2711 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:2720
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2791
 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:2756
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2797
 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:2761
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
 msgid "Don't use TLS"
 msgstr "Nepoužívať TLS"
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
 msgid "Use TLS"
 msgstr "Použiť TLS"
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Použiť príkaz STARTTLS na vytvorenie šifrovanej relácie"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3003
 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:2976
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 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:3012
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Automatically accept valid TLS certificates"
 msgstr "Automaticky akceptovať platné certifikáty TLS"
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3093
 msgid "Use non-blocking TLS"
 msgstr "Použiť neblokujúce TLS"
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3105
 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:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Použiť proxy server"
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3206
 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:3170
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Použiť globálne nastavenia proxy servera"
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Používateľské meno"
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Na odosielanie použiť proxy server"
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15480,27 +15492,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:3354
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Doménové meno"
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15508,156 +15520,177 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 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:3456
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "Nebol zadaný POP server."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "Nebol zadaný IMAP server."
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "ID používateľa nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3601
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3636
+#: src/prefs_account.c:3676
 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:3641
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "Heslo SMTP nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3733
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "nie je zadaná doména."
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "nie je zvolená zložka odoslaných."
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "nie je zvolená zložka fronty."
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "nie je zvolená zložka konceptov."
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "nie je zvolená zložka koša."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Odoslať"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Nastavenie nového účtu"
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Zlyhalo (zlá adresa)"
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Zvoľte súbor certifikátu"
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (zásuvný modul nie je načítaný)"
 
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Autorizácia dokončená"
+
+#: src/prefs_account.c:6139
+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
+msgid "Authorisation NOT completed"
+msgstr "Autorizácia nebola dokončená"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "Váš autorizačný kód OAuth2 nebol v Claws Mail prijatý"
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Nastavenie akcií"
@@ -15789,13 +15822,12 @@ msgstr "Záznam nebol uložený"
 #: 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 "Položka nebola uložená. Zavrieť napriek tomu?"
+msgstr "Záznam nebol uložený. Zavrieť napriek tomu?"
 
 #: 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:2168 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Pokračovať v úprave"
 
@@ -15993,7 +16025,7 @@ msgid "Warn when inserting a file larger than"
 msgstr "Upozorniť pri vložení súboru väčšieho ako"
 
 #: src/prefs_compose_writing.c:205
-msgid "KiB into message body "
+msgid "KiB into message body"
 msgstr "kiB do tela správy"
 
 #: src/prefs_compose_writing.c:211
@@ -16051,63 +16083,67 @@ msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
 #: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Dvojbodka (:) nie je vo vlastnej hlavičke povolená."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Táto hlavička nie je povolená ako dodatočná."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Vyberte súbor PNG"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Vyberte súbor XBM"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Vyberte textový súbor"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Toto nie je obrázkový súbor."
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Zvolený obrázok nie je v požadovanej veľkosti (48x48)."
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Obrázok je príliš veľký, maximálna veľkosť je 725 bajtov."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Obrázok nie je v správnom formáte (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Obrázok nie je v správnom formáte (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "Nemožno vykonať `compface`. Preverte, či je v premennej $PATH."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Chyba compface: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Tento súbor obsahuje zalomenia riadkov."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Zmazať hlavičku"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Naozaj chcete zmazať túto hlavičku?"
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Aktuálne dodatočné hlavičky"
 
@@ -17557,16 +17593,8 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Zvoliť predvolené klávesové skratky"
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Zvoľte sadu klávesových skratiek:"
-
-#: src/prefs_other.c:138
-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 "Select preset keyboard shortcuts:"
+msgstr "Zvoliť predvolené klávesové skratky"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
@@ -17935,8 +17963,8 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá, keď bude "
 "správa obsahovať iné znaky ako ASCII"
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Odosielanie"
 
@@ -18700,35 +18728,35 @@ msgstr "Zalomiť text na"
 msgid "Wrapping"
 msgstr "Zalamovanie"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Náhľad tlače"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "Prvá strana"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Posledná strana"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "Veľkosť 100%"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Prispôsobiť veľkosť"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Zväčšiť"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Zmenšiť"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Strana %d"
@@ -19099,88 +19127,88 @@ msgstr "Zadajte text, ktorým má nahradiť „%s”"
 msgid "Enter variable"
 msgstr "Zadajte premennú"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Odosielam správu pomocou príkazu: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Nemožno vykonať príkaz: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Pri odosielaní správy nastala chyba: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Robím POP pred SMTP..."
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP pred SMTP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru SMTP: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "Správa bola odoslaná úspešne."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "Posielam HELO..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Autentifikácia"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Odosielam správu..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "Odosielam EHLO..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "Odosielam MAIL FROM..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "Odosielam RCPT TO..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "Odosielam DATA..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Odpájam sa..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Odosielam správu"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19641,7 +19669,7 @@ msgstr "Zašifrované"
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19650,11 +19678,11 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8405
 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:8406
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
@@ -20507,3 +20535,179 @@ 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 611191d9b..e15ad24dd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,15 +4,15 @@
 # as the Claws Mail package, see COPYING file.
 #
 # Anders Trobäck <sylpheed at troback.com>, 2006.
-# Andreas Rönnquist <andreas at ronnquist.net>, 2012-2020.
+# Andreas Rönnquist <andreas at ronnquist.net>, 2012-2022.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 3.17.2\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-09-14 23:33+0200\n"
-"PO-Revision-Date: 2020-09-14 23:31+0200\n"
+"POT-Creation-Date: 2022-10-10 14:32+0200\n"
+"PO-Revision-Date: 2022-10-11 15:17+0200\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 2.4\n"
+"X-Generator: Poedit 3.1.1\n"
 
 #: src/account.c:402 src/account.c:469
 msgid ""
@@ -48,61 +48,238 @@ msgstr ""
 "listan, kryssrutan indikerar vilka konton som kommer att inkluderas. Fet "
 "stil anger standardkontot."
 
-#: src/account.c:823
+#: src/account.c:781 src/foldersel.c:348
+msgid "_New"
+msgstr "_Ny"
+
+#: src/account.c:787
+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/mainwindow.c:516 src/messageview.c:213
+#: src/plugins/managesieve/sieve_editor.c:82
+msgid "_Edit"
+msgstr "_Redigera"
+
+#: src/account.c:795
+msgid "Edit preferences for the selected account"
+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/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
+#: src/prefs_actions.c:746 src/prefs_customheader.c:256
+#: src/prefs_filtering.c:472 src/prefs_filtering.c:1196
+#: src/prefs_filtering.c:1216 src/prefs_template.c:316 src/prefs_template.c:899
+#: src/prefs_template.c:912 src/prefs_toolbar.c:1010 src/ssl_manager.c:211
+#: src/ssl_manager.c:453
+msgid "D_elete"
+msgstr "Ta bort"
+
+#: src/account.c:803
+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/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
+msgid "_Copy"
+msgstr "_Kopiera"
+
+#: src/account.c:811
+msgid "Create a new copy of the selected account"
+msgstr "Skapa en ny kopia av det valda kontot"
+
+#: src/account.c:813 src/editaddress.c:1324 src/gtk/foldersort.c:318
+#: src/prefs_actions.c:401 src/prefs_customheader.c:289
+#: src/prefs_display_header.c:391 src/prefs_filtering_action.c:620
+#: src/prefs_filtering.c:538 src/prefs_folder_column.c:316
+#: src/prefs_matcher.c:831 src/prefs_summary_column.c:330
+#: src/prefs_summary_open.c:295 src/prefs_template.c:374
+#: src/prefs_toolbar.c:1058
+msgid "_Down"
+msgstr "Ner"
+
+#: src/account.c:819
+msgid "Move the selected account down"
+msgstr "Flytta ner det valda kontot"
+
+#: src/account.c:821 src/editaddress.c:1323 src/gtk/foldersort.c:312
+#: src/prefs_actions.c:393 src/prefs_customheader.c:283
+#: src/prefs_display_header.c:385 src/prefs_filtering_action.c:615
+#: src/prefs_filtering.c:530 src/prefs_folder_column.c:312
+#: src/prefs_matcher.c:826 src/prefs_summary_column.c:326
+#: src/prefs_summary_open.c:289 src/prefs_template.c:366
+#: src/prefs_toolbar.c:1054
+msgid "_Up"
+msgstr "_Upp"
+
+#: src/account.c:827
+msgid "Move the selected account up"
+msgstr "Flytta upp det valda kontot"
+
+#: src/account.c:834
 msgid " _Set as default account "
 msgstr " _Sätt som standardkonto "
 
-#: src/account.c:915
+#: 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/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/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/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/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/summary_search.c:495 src/summary_search.c:785
+msgid "_Close"
+msgstr "St_äng"
+
+#: src/account.c:926
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konton med fjärrmappar kan inte kopieras."
 
-#: src/account.c:922
+#: src/account.c:933
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopia av %s"
 
-#: src/account.c:1125
+#: src/account.c:1137
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Vill du verkligen ta bort konto '%s'?"
 
-#: src/account.c:1127
+#: src/account.c:1139
 msgid "(Untitled)"
 msgstr "(Ingen titel)"
 
-#: src/account.c:1128
+#: src/account.c:1140
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: src/account.c:1602
+#: src/account.c:1141 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/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/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/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/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/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/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
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:632
+#: 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/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcal_folder.c:2030
+#: 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_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/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/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/prefs_customheader.c:698 src/prefs_display_header.c:328
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+msgid "_Delete"
+msgstr "_Ta bort"
+
+#: src/account.c:1615
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: src/account.c:1608
+#: src/account.c:1621
 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:1615 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7488 src/editaddress.c:1474
-#: src/editaddress.c:1503 src/editaddress.c:1519
-#: src/editaddress_other_attributes_ldap.c:371
-#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
-#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
-#: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
+#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:128 src/compose.c:7500 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/plugins/pdf_viewer/poppler_viewer.c:1846
-#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
-#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
-#: src/prefs_themes.c:990
+#: 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
 msgid "Name"
 msgstr "Namn"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1644 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -142,7 +319,7 @@ msgstr ""
 "Ogiltig filteraktivitet(er):\n"
 "%s"
 
-#: src/action.c:997
+#: src/action.c:1000
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -153,35 +330,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5277 src/compose.c:5282 src/ldaputil.c:333
+#: 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/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:1831
-#: src/plugins/vcalendar/vcal_folder.c:1849
-#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1845
+#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/action.c:1218 src/action.c:1390
+#: src/action.c:1223 src/action.c:1397
 msgid "Completed"
 msgstr "Färdigt"
 
-#: src/action.c:1254
+#: src/action.c:1260
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Kör: %s\n"
 
-#: src/action.c:1258
+#: src/action.c:1264
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Avslutades: %s\n"
 
-#: src/action.c:1304
+#: src/action.c:1307
 msgid "Action's input/output"
 msgstr "Aktivitets in/ut data"
 
-#: src/action.c:1636
+#: src/action.c:1371
+msgid "_Execute"
+msgstr "_Kör"
+
+#: src/action.c:1406
+msgid "_Stop"
+msgstr "_Stopp"
+
+#: src/action.c:1648
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -192,11 +378,11 @@ msgstr ""
 "('%%h' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1641
+#: src/action.c:1653
 msgid "Action's hidden user argument"
 msgstr "Aktivitets gömda användarargument"
 
-#: src/action.c:1645
+#: src/action.c:1657
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -207,73 +393,73 @@ msgstr ""
 "('%%u' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1650
+#: src/action.c:1662
 msgid "Action's user argument"
 msgstr "Aktivitets användarargument"
 
-#: src/addrclip.c:481
+#: src/addrclip.c:483
 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:504
+#: src/addrclip.c:506
 msgid "Cannot copy an address book to itself."
 msgstr "Kan inte kopiera en adressbok till sig självt."
 
-#: src/addrclip.c:595
+#: src/addrclip.c:597
 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:5009
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addrcustomattr.c:65
+#: src/addrcustomattr.c:64
 msgid "date of birth"
 msgstr "födelsedag"
 
-#: src/addrcustomattr.c:66
+#: src/addrcustomattr.c:65
 msgid "address"
 msgstr "adress"
 
-#: src/addrcustomattr.c:67
+#: src/addrcustomattr.c:66
 msgid "phone"
 msgstr "telefonnummer"
 
-#: src/addrcustomattr.c:68
+#: src/addrcustomattr.c:67
 msgid "mobile phone"
 msgstr "mobiltelefon"
 
-#: src/addrcustomattr.c:69
+#: src/addrcustomattr.c:68
 msgid "organization"
 msgstr "organisation"
 
-#: src/addrcustomattr.c:70
+#: src/addrcustomattr.c:69
 msgid "office address"
 msgstr "jobbadress"
 
-#: src/addrcustomattr.c:71
+#: src/addrcustomattr.c:70
 msgid "office phone"
 msgstr "arbetstelefon"
 
-#: src/addrcustomattr.c:72
+#: src/addrcustomattr.c:71
 msgid "fax"
 msgstr "fax"
 
-#: src/addrcustomattr.c:73
+#: src/addrcustomattr.c:72
 msgid "website"
 msgstr "webbplats"
 
-#: src/addrcustomattr.c:146
+#: src/addrcustomattr.c:145
 msgid "Attribute name"
 msgstr "Attributnamn"
 
-#: src/addrcustomattr.c:161
+#: src/addrcustomattr.c:160
 msgid "Delete all attribute names"
 msgstr "Ta bort alla attributnamn"
 
-#: src/addrcustomattr.c:162
+#: src/addrcustomattr.c:161
 msgid "Do you really want to delete all attribute names?"
 msgstr "Vill du verkligen ta bort alla attributnamn?"
 
@@ -285,11 +471,11 @@ msgstr "Ta bort attributnamn"
 msgid "Do you really want to delete this attribute name?"
 msgstr "Vill du verkligen ta bort detta attributnamn?"
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:197
 msgid "Reset to default"
 msgstr "Återställ till standardval"
 
-#: src/addrcustomattr.c:197
+#: src/addrcustomattr.c:198
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
@@ -297,19 +483,49 @@ msgstr ""
 "Vill du verkligen ersätta alla attributnamn\n"
 "med standarduppsättningen?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
-#: src/addressbook.c:479 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
-msgid "_Delete"
-msgstr "_Ta bort"
-
-#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1701 src/prefs_template.c:1113
+#: src/addrcustomattr.c:199 src/compose.c:9838 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/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/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
+msgid "_No"
+msgstr "I_nga"
+
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: 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/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/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
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/addrcustomattr.c:219 src/edittags.c:298 src/prefs_actions.c:1106
+#: src/prefs_filtering.c:1690 src/prefs_template.c:1106
 msgid "Delete _all"
 msgstr "Ta bort _alla"
 
-#: src/addrcustomattr.c:219
+#: src/addrcustomattr.c:220
 msgid "_Reset to default"
 msgstr "_Återställ till standardval"
 
@@ -326,6 +542,48 @@ msgstr "Ändra attributnamn"
 msgid "New attribute name:"
 msgstr "Nytt attributnamn:"
 
+#: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
+#: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
+#: src/prefs_display_header.c:321 src/prefs_display_header.c:372
+#: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
+#: src/prefs_folder_column.c:271 src/prefs_matcher.c:791
+#: src/prefs_summary_column.c:285 src/prefs_summary_open.c:241
+#: src/prefs_template.c:299 src/prefs_toolbar.c:998
+msgid "_Add"
+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/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/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/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/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_summary_open.c:182 src/prefs_template.c:400
+msgid "_OK"
+msgstr "_OK"
+
 #: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
@@ -352,6 +610,11 @@ 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/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
+msgid "_Find"
+msgstr "_Sök"
+
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr "Inga dubbletter av e-postadresser hittades i adressboken"
@@ -360,9 +623,9 @@ msgstr "Inga dubbletter av e-postadresser hittades i adressboken"
 msgid "Duplicate email addresses"
 msgstr "Dubblerade e-postadress(er)"
 
-#: src/addrduplicates.c:443 src/addressadd.c:235
-#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
-#: src/toolbar.c:529
+#: src/addrduplicates.c:443 src/addressadd.c:233
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/toolbar.c:540
 msgid "Address"
 msgstr "Adress"
 
@@ -370,11 +633,11 @@ msgstr "Adress"
 msgid "Address book path"
 msgstr "Sökväg till adressbok"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
+#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1490
+#: src/addrduplicates.c:792 src/addressbook.c:1485
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(er)?"
 
@@ -382,286 +645,269 @@ msgstr "Vill du verkligen ta bort adress(er)?"
 msgid "Delete address"
 msgstr "Ta bort adress(er)"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1437
+#: src/addrduplicates.c:842 src/addressbook.c:1431
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Adressdatan är skrivskyddad och kan därför inte tas bort."
 
-#: src/addressadd.c:192 src/prefs_filtering_action.c:195
+#: src/addressadd.c:190 src/prefs_filtering_action.c:193
 msgid "Add to address book"
 msgstr "Lägg till i adressboken"
 
-#: src/addressadd.c:215
+#: src/addressadd.c:213
 msgid "Contact"
 msgstr "Kontakt"
 
-#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1302 src/editgroup.c:292
+#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Kommentarer"
 
-#: src/addressadd.c:289 src/addressbook_foldersel.c:158
+#: src/addressadd.c:288 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
+#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
 msgid "Add address(es)"
 msgstr "Lägg till adress(er)"
 
-#: src/addressadd.c:600
+#: src/addressadd.c:599
 msgid "Can't add the specified address"
 msgstr "Kan inte lägga till adressen"
 
-#: src/addressbook.c:129 src/addressbook.c:4997 src/editaddress.c:1247
-#: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
-#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
+#: src/addressbook.c:129 src/addressbook.c:4996 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:405
+#: src/addressbook.c:400
 msgid "_Book"
 msgstr "Adress_bok"
 
-#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
-#: src/addressbook.c:478 src/compose.c:614 src/mainwindow.c:523
-#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: src/addressbook.c:407 src/compose.c:619 src/mainwindow.c:526
-#: src/messageview.c:215
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/messageview.c:216
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: src/addressbook.c:410 src/addressbook.c:464
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Book"
 msgstr "Ny adress_bok"
 
-#: src/addressbook.c:411 src/addressbook.c:465
+#: src/addressbook.c:406 src/addressbook.c:460
 msgid "New _Folder"
 msgstr "Ny _katalog"
 
-#: src/addressbook.c:412
+#: src/addressbook.c:407
 msgid "New _vCard"
 msgstr "Nytt _vCard"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:411
 msgid "New _JPilot"
 msgstr "Nytt _JPilot"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:414
 msgid "New LDAP _Server"
 msgstr "Ny LDAP-_server"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:418
 msgid "_Edit book"
 msgstr "_Redigera adressbok"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:419
 msgid "_Delete book"
 msgstr "_Ta bort adressbok"
 
-#: src/addressbook.c:426 src/compose.c:631
+#: src/addressbook.c:421 src/compose.c:632 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:434
-#: src/plugins/managesieve/sieve_editor.c:633
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:634 src/wizard.c:1832
 msgid "_Save"
 msgstr "_Spara"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
-#: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:631
-msgid "_Close"
-msgstr "St_äng"
-
-#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
+#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
 msgid "_Select all"
 msgstr "Markera _allt"
 
-#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
+#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
-#: src/compose.c:643 src/mainwindow.c:557 src/messageview.c:228
-#: src/plugins/managesieve/sieve_editor.c:96
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "Kli_stra in"
 
-#: src/addressbook.c:439 src/addressbook.c:481
+#: src/addressbook.c:434 src/addressbook.c:476
 msgid "New _Address"
 msgstr "Ny _adress"
 
-#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
+#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
 msgid "New _Group"
 msgstr "Ny _grupp"
 
-#: src/addressbook.c:442 src/addressbook.c:488
+#: src/addressbook.c:437 src/addressbook.c:483
 msgid "_Mail To"
 msgstr "_Meddelande till"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Merge"
 msgstr "Sa_mmanfoga"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:442
 msgid "Import _LDIF file..."
 msgstr "Importera _LDIF fil..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:443
 msgid "Import M_utt file..."
 msgstr "Importera M_utt fil..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:444
 msgid "Import _Pine file..."
 msgstr "Importera _Pine fil..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:446
 msgid "Export _HTML..."
 msgstr "Exportera _HTML..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:447
 msgid "Export LDI_F..."
 msgstr "Exportera _LDIF..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:449
 msgid "Find duplicates..."
 msgstr "Hitta dubbletter..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:450
 msgid "Edit custom attributes..."
 msgstr "Ändra anpassade attribut..."
 
-#: src/addressbook.c:490
+#: src/addressbook.c:485
 msgid "_Browse Entry"
 msgstr "_Bläddra Post"
 
-#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
-#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
-#: src/prefs_themes.c:851 src/prefs_themes.c:852
+#: src/addressbook.c:499 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
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
+#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
 msgid "Success"
 msgstr "Klar"
 
-#: src/addressbook.c:512 src/importldif.c:122
+#: src/addressbook.c:507 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "Felaktiga argument"
 
-#: src/addressbook.c:513 src/importldif.c:123
+#: src/addressbook.c:508 src/importldif.c:123
 msgid "File not specified"
 msgstr "Fil inte specificerad"
 
-#: src/addressbook.c:514 src/importldif.c:124
+#: src/addressbook.c:509 src/importldif.c:124
 msgid "Error opening file"
 msgstr "Fel vid öppnande av fil"
 
-#: src/addressbook.c:515 src/importldif.c:125
+#: src/addressbook.c:510 src/importldif.c:125
 msgid "Error reading file"
 msgstr "Fel vid läsande av fil"
 
-#: src/addressbook.c:516 src/importldif.c:126
+#: src/addressbook.c:511 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "Nådde slutet på filen"
 
-#: src/addressbook.c:517 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "Kunde inte allokera minne"
 
-#: src/addressbook.c:518 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128
 msgid "Bad file format"
 msgstr "Fel filformat"
 
-#: src/addressbook.c:519 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: src/addressbook.c:520 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "Fel vid öppnande av katalog"
 
-#: src/addressbook.c:521 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131
 msgid "No path specified"
 msgstr "Ingen sökväg specificerad"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:526
 msgid "Error connecting to LDAP server"
 msgstr "Fel vid anslutning till LDAP server"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:527
 msgid "Error initializing LDAP"
 msgstr "Fel vid initiering av LDAP"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:528
 msgid "Error binding to LDAP server"
 msgstr "Fel vid bindandet till LDAP server"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:529
 msgid "Error searching LDAP database"
 msgstr "Fel vid sökning av LDAP databas"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:530
 msgid "Timeout performing LDAP operation"
 msgstr "Tidsgräns nådd vid LDAP operation"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error in LDAP search criteria"
 msgstr "Fel i LDAP-sökkriterie"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "No LDAP entries found for search criteria"
 msgstr "Inga LDAP objekt kunde hittas för sökkriteriet"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "LDAP search terminated on request"
 msgstr "LDAP sökning avbruten på begäran"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error starting STARTTLS connection"
 msgstr "Fel vid start av STARTTLS anslutning"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Distinguished Name (dn) is missing"
 msgstr "Distinguished Name (dn) saknas"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Missing required information"
 msgstr "Obligatorisk information saknas"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "Another contact exists with that key"
 msgstr "En annan kontakt finns med samma nyckel"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "Strong(er) authentication required"
 msgstr "Stark(are) autentisering krävs"
 
-#: src/addressbook.c:911
+#: src/addressbook.c:906
 msgid "Sources"
 msgstr "Källor"
 
-#: src/addressbook.c:915 src/prefs_matcher.c:643 src/prefs_other.c:493
-#: src/toolbar.c:268 src/toolbar.c:2522
+#: src/addressbook.c:910 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:1109 src/editldap.c:794
+#: src/addressbook.c:1103 src/editldap.c:777
 msgid "Search"
 msgstr "Sök"
 
-#: src/addressbook.c:1481
+#: src/addressbook.c:1475
 msgid "Delete group"
 msgstr "Ta bort grupp"
 
-#: src/addressbook.c:1482
+#: src/addressbook.c:1476
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -669,26 +915,26 @@ msgstr ""
 "Vill du verkligen ta bort grupp(er)?\n"
 "Adresserna som den innehåller kommer inte gå förlorade."
 
-#: src/addressbook.c:2209
+#: src/addressbook.c:2205
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Kan inte klistra in. Destinations adressboken är skrivskyddad."
 
-#: src/addressbook.c:2219
+#: src/addressbook.c:2215
 msgid "Cannot paste into an address group."
 msgstr "Kan inte klistra in i en adressgrupp."
 
-#: src/addressbook.c:2956
+#: src/addressbook.c:2950
 #, 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:2959 src/addressbook.c:2985 src/addressbook.c:2992
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
-#: src/toolbar.c:497
+#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: 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:2968
+#: src/addressbook.c:2963
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -697,20 +943,20 @@ msgstr ""
 "Vill du ta bort '%s' ? Om du bara tar bort mappen, så flyttas alla adresser "
 "till överliggande mapp."
 
-#: src/addressbook.c:2971 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
+#: 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
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:2972
+#: src/addressbook.c:2967
 msgid "Delete _folder only"
 msgstr "Ta endast bort _mapp"
 
-#: src/addressbook.c:2972
+#: src/addressbook.c:2968
 msgid "Delete folder and _addresses"
 msgstr "Ta bort mapp och _adresser"
 
-#: src/addressbook.c:2983
+#: src/addressbook.c:2979
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -719,7 +965,7 @@ msgstr ""
 "Vill du ta bort '%s'?\n"
 "Adresserna som den innehåller kommer inte gå förlorade."
 
-#: src/addressbook.c:2990
+#: src/addressbook.c:2986
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -728,28 +974,28 @@ msgstr ""
 "Vill du ta bort '%s'?\n"
 "Adresserna som den innehåller kommer att gå förlorade."
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3100
 #, c-format
 msgid "Search '%s'"
 msgstr "Sök '%s'"
 
-#: src/addressbook.c:3242 src/addressbook.c:3291
+#: src/addressbook.c:3238 src/addressbook.c:3288
 msgid "New Contacts"
 msgstr "Ny Kontakt"
 
-#: src/addressbook.c:4128
+#: src/addressbook.c:4127
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara innehållsfil."
 
-#: src/addressbook.c:4132
+#: src/addressbook.c:4131
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:4142
+#: src/addressbook.c:4141
 msgid "Old address book converted successfully."
 msgstr "Gammal adressbok framgångsrikt konverterad."
 
-#: src/addressbook.c:4147
+#: src/addressbook.c:4146
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -757,7 +1003,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil."
 
-#: src/addressbook.c:4160
+#: src/addressbook.c:4159
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -765,7 +1011,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:4166
+#: src/addressbook.c:4165
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -773,7 +1019,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa ny adressindexfil."
 
-#: src/addressbook.c:4171
+#: src/addressbook.c:4170
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -781,57 +1027,57 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:4178 src/addressbook.c:4184
+#: src/addressbook.c:4177 src/addressbook.c:4182
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:4299
+#: src/addressbook.c:4297
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:4300
+#: src/addressbook.c:4298
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:4631
+#: src/addressbook.c:4630
 msgid "Busy searching..."
 msgstr "Upptagen med att söka..."
 
-#: src/addressbook.c:4961 src/prefs_send.c:220
+#: src/addressbook.c:4960 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:4973
+#: src/addressbook.c:4972
 msgid "Address Books"
 msgstr "Adressböcker"
 
-#: src/addressbook.c:4985
+#: src/addressbook.c:4984
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:5021 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
+#: 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
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:5033
+#: src/addressbook.c:5032
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5045 src/addressbook.c:5057
+#: src/addressbook.c:5044 src/addressbook.c:5056
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5069
+#: src/addressbook.c:5068
 msgid "LDAP servers"
 msgstr "LDAP-servrar"
 
-#: src/addressbook.c:5081
+#: src/addressbook.c:5080
 msgid "LDAP Query"
 msgstr "LDAP Fråga"
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:985 src/importldif.c:541
+#: 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 "Adressbok"
 
@@ -859,53 +1105,53 @@ msgstr "adress tilllagd av Claws Mail"
 msgid "Addresses collected successfully."
 msgstr "Lyckades samla in adresser."
 
-#: src/addrgather.c:360
+#: src/addrgather.c:358
 msgid "Current folder:"
 msgstr "Nuvarande mapp:"
 
-#: src/addrgather.c:371
+#: src/addrgather.c:367
 msgid "Address book name:"
 msgstr "Adressboknamn :"
 
-#: src/addrgather.c:398
+#: src/addrgather.c:395
 msgid "Address book folder size:"
 msgstr "Adressbok mappstorlek:"
 
-#: src/addrgather.c:402 src/addrgather.c:411
+#: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "Maximalt antal poster per mapp i den nyss skapade adressboken"
 
-#: src/addrgather.c:415
+#: src/addrgather.c:412
 msgid "Process these mail header fields"
 msgstr "Bearbeta dessa brevhuvudfält"
 
-#: src/addrgather.c:434
+#: src/addrgather.c:432
 msgid "Include subfolders"
 msgstr "Inkludera undermappar"
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
+#: src/addrgather.c:490 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr "Brevhuvudsnamn"
 
-#: src/addrgather.c:498
+#: src/addrgather.c:496
 msgid "Address Count"
 msgstr "Adressantal"
 
-#: src/addrgather.c:586
+#: src/addrgather.c:584
 msgid "Header Fields"
 msgstr "Brevhuvudsfält"
 
-#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
-#: src/importldif.c:982
+#: src/addrgather.c:585 src/exphtmldlg.c:640 src/expldifdlg.c:705
+#: src/importldif.c:967
 msgid "Finish"
 msgstr "Avsluta"
 
-#: src/addrgather.c:645
+#: src/addrgather.c:643
 msgid "Collect email addresses from selected messages"
 msgstr "Samla in e-postadresser från valda meddelanden"
 
-#: src/addrgather.c:649
+#: src/addrgather.c:647
 msgid "Collect email addresses from folder"
 msgstr "Samla in e-postadresser från mapp"
 
@@ -933,39 +1179,39 @@ msgstr "Adress(er) uppdaterade"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Uppdatering misslyckades. Ändringar inte skrivna till Katalogen."
 
-#: src/alertpanel.c:144 src/compose.c:9810
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Meddelande"
 
-#: src/alertpanel.c:157 src/compose.c:5871 src/compose.c:6416
-#: src/compose.c:12273 src/file_checker.c:84 src/file_checker.c:108
-#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5091
+#: 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
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5808 src/inc.c:726
-#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Fel"
 
-#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:204 src/gtk/progressdialog.c:92
 msgid "_View log"
 msgstr "_Visa logg"
 
-#: src/alertpanel.c:346
+#: src/alertpanel.c:372
 msgid "Show this message next time"
 msgstr "Visa detta meddelande nästa gång"
 
-#: src/browseldap.c:223
+#: src/browseldap.c:221
 msgid "Browse Directory Entry"
 msgstr "Bläddra katalogpost"
 
-#: src/browseldap.c:243
+#: src/browseldap.c:240
 msgid "Server Name:"
 msgstr "Servernamn :"
 
-#: src/browseldap.c:253
+#: src/browseldap.c:251
 msgid "Distinguished Name (dn):"
 msgstr "Distinguished Name (dn) :"
 
@@ -1006,14 +1252,14 @@ msgid "a notifier"
 msgstr "en notifierare"
 
 #: src/common/plugin.c:77
-msgid "an utility"
+msgid "a utility"
 msgstr "ett verktyg"
 
 #: src/common/plugin.c:78
 msgid "things"
 msgstr "saker"
 
-#: src/common/plugin.c:335
+#: src/common/plugin.c:336
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
@@ -1021,25 +1267,25 @@ msgstr ""
 "Denna insticksmodul tillhandahåller %s (%s), som redan tillhandahålls av "
 "insticksmodulen %s."
 
-#: src/common/plugin.c:438
+#: src/common/plugin.c:439
 msgid "Plugin already loaded"
 msgstr "Insticksmodulen är redan laddad"
 
-#: src/common/plugin.c:449
+#: src/common/plugin.c:450
 msgid "Failed to allocate memory for Plugin"
 msgstr "Kunde inte allokera minne till insticksmodul"
 
-#: src/common/plugin.c:483
+#: src/common/plugin.c:484
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 "Denna modul är inte licensierad under en licens som är kompatibel med GPL v3 "
 "eller senare."
 
-#: src/common/plugin.c:492
+#: src/common/plugin.c:493
 msgid "This module is for Claws Mail GTK1."
 msgstr "Denna modul är för Claws-Mail GTK1."
 
-#: src/common/plugin.c:770
+#: src/common/plugin.c:774
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
@@ -1048,7 +1294,7 @@ msgstr ""
 "Din version av Claws Mail är nyare än den version som insticksmodulen '%s' "
 "byggdes med."
 
-#: src/common/plugin.c:773
+#: src/common/plugin.c:777
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
@@ -1056,154 +1302,154 @@ msgstr ""
 "Din version av Claws Mail är nyare än den version som insticksmodulen "
 "byggdes med."
 
-#: src/common/plugin.c:782
+#: src/common/plugin.c:786
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "Din version av Claws Mail är för gammal för '%s' insticksmodulen."
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:788
 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:1238
-msgid "SSL/TLS handshake failed\n"
-msgstr "SSL/TLS-handskakning misslyckades\n"
+#: src/common/session.c:201 src/imap.c:1261
+msgid "TLS handshake failed\n"
+msgstr "TLS-handskakning misslyckades\n"
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "Ingen SMTP AUTH-metod tillgänglig\n"
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Vald SMTP AUTH-metod ej tillgänglig\n"
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "felaktigt SMTP-svar\n"
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "fel uppstod I SMTP session\n"
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "fel uppstod vid autentisering\n"
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:633
 #, c-format
 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:617 src/pop.c:900
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "kunde inte starta STARTTLS-session\n"
 
-#: src/common/socket.c:571
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Tidsgränsen för socket I/O överskreds.\n"
 
-#: src/common/socket.c:600
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Anslutningen överskred tidsgränsen.\n"
 
-#: src/common/socket.c:740
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: Anslutning misslyckades. (%s).\n"
 
-#: src/common/socket.c:980
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: okänd värd.\n"
 
-#: src/common/socket.c:1072
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: värdsökning misslyckades (%s). \n"
 
-#: src/common/socket.c:1385
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "skriv på fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:338
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "Kunde inte ta status på P12-certifikatfilen (%s)\n"
 
-#: src/common/ssl_certificate.c:346
+#: src/common/ssl_certificate.c:342
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "Kunde inte läsa P12-certifikatfilen (%s)\n"
 
-#: src/common/ssl_certificate.c:355
+#: src/common/ssl_certificate.c:351
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "Kan inte importera P12-certifikatfil (%s)\n"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:636
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: src/common/ssl_certificate.c:645
+#: src/common/ssl_certificate.c:641
 msgid "Uncheckable"
 msgstr "Okontrollerbar"
 
-#: src/common/ssl_certificate.c:649
+#: src/common/ssl_certificate.c:645
 msgid "Self-signed certificate"
 msgstr "Självsignerat certifikat"
 
-#: src/common/ssl_certificate.c:652
+#: src/common/ssl_certificate.c:648
 msgid "Revoked certificate"
 msgstr "Upphävt certifikat"
 
-#: src/common/ssl_certificate.c:654
+#: src/common/ssl_certificate.c:650
 msgid "No certificate issuer found"
 msgstr "Ingen certifikatsutgivare funnen"
 
-#: src/common/ssl_certificate.c:656
+#: src/common/ssl_certificate.c:652
 msgid "Certificate issuer is not a CA"
 msgstr "Certifikatsutgivare är inte en CA"
 
-#: src/common/ssl_certificate.c:881
+#: src/common/ssl_certificate.c:877
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "Kunde inte öppna certifikatfil %s: %s\n"
 
-#: src/common/ssl_certificate.c:885
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "Certifikatfil %s saknas (%s)\n"
 
-#: src/common/ssl_certificate.c:904
+#: src/common/ssl_certificate.c:900
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "Kunde inte öppna nyckel-filen %s (%s)\n"
 
-#: src/common/ssl_certificate.c:908
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "Nyckelfil %s saknas (%s)\n"
 
-#: src/common/ssl_certificate.c:1056
+#: src/common/ssl_certificate.c:1052
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "Kunde inte läsa P12-certifikatfil %s\n"
 
-#: src/common/ssl_certificate.c:1059
+#: src/common/ssl_certificate.c:1055
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "Kunde inte öppna certifikatfil %s (%s)\n"
 
-#: src/common/ssl_certificate.c:1063
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12 Certifikatfil %s saknas (%s)\n"
 
-#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
-#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
-#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
-#: src/gtk/sslcertwindow.c:136
+#: src/common/ssl_certificate.c:1084 src/gtk/sslcertwindow.c:85
+#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
+#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
+#: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr "<inte i certifikat>"
 
@@ -1211,237 +1457,237 @@ msgstr "<inte i certifikat>"
 msgid "(Subject cleared by RegExp)"
 msgstr "(Ämne tömt av RegExp)"
 
-#: src/common/utils.c:200
+#: src/common/utils.c:184
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:201
+#: src/common/utils.c:185
 #, c-format
-msgid "%d.%02dKB"
-msgstr "%d,%02dKB"
+msgid "%d.%02dKiB"
+msgstr "%d,%02dKiB"
 
-#: src/common/utils.c:202
+#: src/common/utils.c:186
 #, c-format
-msgid "%d.%02dMB"
-msgstr "%d,%02dMB"
+msgid "%d.%02dMiB"
+msgstr "%d,%02dMiB"
 
-#: src/common/utils.c:203
+#: src/common/utils.c:187
 #, c-format
-msgid "%.2fGB"
-msgstr "%.2fGB"
+msgid "%.2fGiB"
+msgstr "%.2fGiB"
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "söndag"
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "måndag"
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "torsdag"
 
-#: src/common/utils.c:4056
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "fredag"
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4124
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "lördag"
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "januari"
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "februari"
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "mars"
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "april"
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "juni"
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "juli"
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "augusti"
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "september"
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "oktober"
 
-#: src/common/utils.c:4069
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "november"
 
-#: src/common/utils.c:4070
+#: src/common/utils.c:4137
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "december"
 
-#: src/common/utils.c:4072
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "sön"
 
-#: src/common/utils.c:4073
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "mån"
 
-#: src/common/utils.c:4074
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "tis"
 
-#: src/common/utils.c:4075
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "ons"
 
-#: src/common/utils.c:4076
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "tor"
 
-#: src/common/utils.c:4077
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "fre"
 
-#: src/common/utils.c:4078
+#: src/common/utils.c:4145
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "lör"
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "jan"
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "feb"
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "mar"
 
-#: src/common/utils.c:4083
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "apr"
 
-#: src/common/utils.c:4084
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "maj"
 
-#: src/common/utils.c:4085
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "jun"
 
-#: src/common/utils.c:4086
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "jul"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "aug"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "sep"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "okt"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "nov"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4158
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "dec"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "FM"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "EM"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "fm"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4172
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "em"
 
-#: src/compose.c:195
+#: src/compose.c:200
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1453,372 +1699,371 @@ msgstr ""
 "\n"
 "Signering och kryptering har inaktiverats för detta meddelande."
 
-#: src/compose.c:603
+#: src/compose.c:604
 msgid "_Add..."
 msgstr "_Lägg till..."
 
-#: src/compose.c:604 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:323
+#: 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/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
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:255
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: src/compose.c:616
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr "_Stavning"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: src/compose.c:622
+#: src/compose.c:623
 msgid "S_end"
 msgstr "Skicka"
 
-#: src/compose.c:623
+#: src/compose.c:624
 msgid "Send _later"
 msgstr "Skicka senare"
 
-#: src/compose.c:626
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr "_Bifoga fil"
 
-#: src/compose.c:627
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr "_Infoga fil"
 
-#: src/compose.c:628
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr "Infoga si_gnatur"
 
-#: src/compose.c:629
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr "E_rsätt signatur"
 
-#: src/compose.c:633
+#: src/compose.c:634
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Ångra"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Gö_r om"
 
-#: src/compose.c:642 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: src/compose.c:646
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr "Klistra in _special"
 
-#: src/compose.c:647
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr "Som _citat"
 
-#: src/compose.c:648
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr "_Radbruten"
 
-#: src/compose.c:649
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr "Ej radbr_uten"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Markera _alla"
 
-#: src/compose.c:653
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr "Avancerat"
 
-#: src/compose.c:654
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr "Flytta ett tecken bakåt"
 
-#: src/compose.c:655
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr "Flytta ett tecken framåt"
 
-#: src/compose.c:656
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr "Flytta ett ord bakåt"
 
-#: src/compose.c:657
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr "Flytta ett ord framåt"
 
-#: src/compose.c:658
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr "Flytta till början av rad"
 
-#: src/compose.c:659
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr "Flytta till slutet på rad"
 
-#: src/compose.c:660
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr "Flytta till föregående rad"
 
-#: src/compose.c:661
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr "Flytta till nästa rad"
 
-#: src/compose.c:662
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr "Ta bort ett tecken bakåt"
 
-#: src/compose.c:663
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr "Ta bort ett tecken framåt"
 
-#: src/compose.c:664
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr "Ta bort ett ord bakåt"
 
-#: src/compose.c:665
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr "Ta bort ett ord framåt"
 
-#: src/compose.c:666
+#: src/compose.c:667
 msgid "Delete line"
 msgstr "Ta bort rad"
 
-#: src/compose.c:667
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr "Ta bort till slutet av raden"
 
-#: src/compose.c:670 src/messageview.c:231
-#: src/plugins/managesieve/sieve_editor.c:102
-msgid "_Find"
-msgstr "_Sök"
-
-#: src/compose.c:673
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "Radbryt _stycke"
 
-#: src/compose.c:674
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr "Radbryt alla _långa rader"
 
-#: src/compose.c:676
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr "Redigera med e_xtern redigerare"
 
-#: src/compose.c:679
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr "_Kontrollera alla eller kontrollera markering"
 
-#: src/compose.c:680
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr "_Markera alla felstavade ord"
 
-#: src/compose.c:681
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr "Kontrollera felstavade ord _bakåt"
 
-#: src/compose.c:682
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr "_Hoppa till nästa felstavade ord"
 
-#: src/compose.c:689
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr "_Svarsläge"
 
-#: src/compose.c:691
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr "Sekretess_system"
 
-#: src/compose.c:695
+#: src/compose.c:696
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Teckenkodning"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/compose.c:703 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabiska"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/compose.c:707 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japansk (EUC-JP)"
 
-#: src/compose.c:708 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreanska"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adressbok"
 
-#: src/compose.c:715
+#: src/compose.c:716
 msgid "_Template"
 msgstr "_Mall"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Aktiviteter"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_Om"
 
-#: src/compose.c:726
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr "Automatiskt radbrytning"
 
-#: src/compose.c:727
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr "Automatiskt _indrag"
 
-#: src/compose.c:728
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr "Signera"
 
-#: src/compose.c:729
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr "Kryptera"
 
-#: src/compose.c:730
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr "Begär läskvitto"
 
-#: src/compose.c:731
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr "Ta b_ort referenser"
 
-#: src/compose.c:732
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr "Visa linjal"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
-#: src/summaryview.c:433
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/summaryview.c:429
 msgid "_All"
 msgstr "_Alla"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
-#: src/summaryview.c:434
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/summaryview.c:430
 msgid "_Sender"
 msgstr "Av_sändare"
 
-#: src/compose.c:740
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr "_Sändlista"
 
-#: src/compose.c:745
+#: src/compose.c:746
 msgid "_Highest"
 msgstr "_Högsta"
 
-#: src/compose.c:746
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr "Hö_g"
 
-#: src/compose.c:748
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr "L_åg"
 
-#: src/compose.c:749
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr "_Lägsta"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automatiskt"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitars ASCII (US-ASC_II)"
 
-#: src/compose.c:756 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:760 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:763 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:768 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1040
 msgid "New message From format error."
 msgstr "Nytt meddelande Från-formatfel."
 
-#: src/compose.c:1148
+#: src/compose.c:1133
 msgid "New message subject format error."
 msgstr "Nytt meddelande ärende-formatfel."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1165 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:1449
+#: src/compose.c:1434
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "Kan inte svara. Ursprungsmeddelandet finns troligen inte."
 
-#: src/compose.c:1634 src/quote_fmt.c:580
+#: src/compose.c:1619 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:1683 src/quote_fmt.c:583
+#: src/compose.c:1668 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:1824 src/compose.c:2025 src/quote_fmt.c:600
+#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1826,56 +2071,56 @@ msgstr ""
 "\"Från\"-fältet av \"Vidarebefordra\"-mallen innehåller en ogiltig email-"
 "adress."
 
-#: src/compose.c:1885 src/quote_fmt.c:603
+#: src/compose.c:1870 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:2068
+#: src/compose.c:2053
 msgid "Fw: multiple emails"
 msgstr "Vb: många meddelande"
 
-#: src/compose.c:2577
+#: src/compose.c:2575
 #, 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:2648 src/gtk/headers.h:14
+#: src/compose.c:2646 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2649 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2652 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Svara till:"
 
-#: src/compose.c:2657 src/compose.c:5026 src/compose.c:5028
+#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2658 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Uppföljning Till:"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2661 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "Svar-På:"
 
-#: src/compose.c:2667 src/compose.c:5023 src/compose.c:5031
-#: src/gtk/headers.h:13 src/summary_search.c:422
+#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "Till:"
 
-#: src/compose.c:2857
+#: src/compose.c:2861
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 "Kunde inte bifoga en fil (omvandling av teckenuppsättning misslyckades)."
 
-#: src/compose.c:2863
+#: src/compose.c:2867
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1890,16 +2135,16 @@ msgstr[1] ""
 "Följande filer har bifogats: \n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3147
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Citattecknen\" av mallen är ogiltiga."
 
-#: src/compose.c:3672
+#: src/compose.c:3680
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kunde inte ta storleken på filen '%s'."
 
-#: src/compose.c:3690
+#: src/compose.c:3698
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1907,57 +2152,57 @@ msgid ""
 msgstr ""
 "Du är på väg att infoga en fil på %s i meddelandetexten. Vill du fortsätta?"
 
-#: src/compose.c:3693
+#: src/compose.c:3701
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: src/compose.c:3819
+#: src/compose.c:3827
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:3820
+#: src/compose.c:3828
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: src/compose.c:3821
+#: src/compose.c:3829
 msgid "_Attach anyway"
 msgstr "Bifog_a ändå"
 
-#: src/compose.c:3830
+#: src/compose.c:3838
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan inte läsa %s."
 
-#: src/compose.c:3857
+#: src/compose.c:3865
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[inget ämne] - Skriv meddelande%s"
 
-#: src/compose.c:4879 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Skriv meddelande"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4919 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1965,59 +2210,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:5123 src/compose.c:5160
+#: src/compose.c:5136 src/compose.c:5173
 #, 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:5125 src/compose.c:5162 src/compose.c:5200 src/compose.c:5243
-#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:5127 src/compose.c:5164 src/compose.c:5201 src/compose.c:5244
-#: src/compose.c:5809 src/folderview.c:2546 src/messageview.c:859
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
+#: 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/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "_Skicka"
 
-#: src/compose.c:5181
+#: src/compose.c:5194
 msgid "Recipient is not specified."
 msgstr "Mottagare har inte specificerats."
 
-#: src/compose.c:5196
+#: src/compose.c:5209
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Ämnesraden är tom. %s"
 
-#: src/compose.c:5197 src/compose.c:5240
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5210 src/compose.c:5253
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Skicka ändå?"
 
-#: src/compose.c:5198 src/compose.c:5241
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5211 src/compose.c:5254
+#: 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:5200 src/compose.c:5243 src/toolbar.c:520
+#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5214 src/compose.c:5257
 msgid "_Queue"
 msgstr "_Kö"
 
-#: src/compose.c:5239
+#: src/compose.c:5252
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Skickar till %d mottagare. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5281
 msgid "Could not queue message."
 msgstr "Kunde inte köa meddelandet."
 
-#: src/compose.c:5271
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2028,7 +2276,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5288
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2039,7 +2287,7 @@ msgstr ""
 "\n"
 "Signeringsfel: %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5293
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2050,7 +2298,7 @@ msgstr ""
 "\n"
 "Kryptering misslyckades: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2060,7 +2308,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenuppsättning."
 
-#: src/compose.c:5289
+#: src/compose.c:5302
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2070,7 +2318,7 @@ msgstr ""
 "\n"
 "Kunde inte få tag i mottagarens krypteringsnyckel."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5365 src/compose.c:5425
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2078,7 +2326,7 @@ 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:5408
+#: src/compose.c:5421
 #, c-format
 msgid ""
 "%s\n"
@@ -2087,7 +2335,7 @@ msgstr ""
 "%s\n"
 "Använd \"Sänd köade meddelande\" från huvudfönstret för att försöka igen."
 
-#: src/compose.c:5805
+#: src/compose.c:5818
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2098,7 +2346,7 @@ msgstr ""
 "till den specificerade %s kodningen.\n"
 "Skicka som det %s?"
 
-#: src/compose.c:5867
+#: src/compose.c:5876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2111,98 +2359,100 @@ msgstr ""
 "\n"
 "Skicka ändå?"
 
-#: src/compose.c:6102
+#: src/compose.c:6115
 msgid "Encryption warning"
 msgstr "Varning om kryptering"
 
-#: src/compose.c:6103
+#: src/compose.c:6116
 msgid "C_ontinue"
 msgstr "F_ortsätt"
 
-#: src/compose.c:6152
+#: src/compose.c:6165
 msgid "No account for sending mails available!"
 msgstr "Det finns inget konto för att skicka e-post tillgängligt!"
 
-#: src/compose.c:6161
+#: src/compose.c:6174
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Valt konto är inte NNTP: Omöjligt att skicka."
 
-#: src/compose.c:6415
+#: src/compose.c:6428
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bilagan %s existerar inte längre. Ignorera?"
 
-#: src/compose.c:6417 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Avbryt sändning"
 
-#: src/compose.c:6417
+#: src/compose.c:6431
 msgid "Ignore attachment"
 msgstr "Ignorera bilaga"
 
-#: src/compose.c:6473
+#: src/compose.c:6487
 #, c-format
 msgid "Original %s part"
 msgstr "Ursprunglig %s del"
 
-#: src/compose.c:7073
+#: src/compose.c:7094
 msgid "Add to address _book"
 msgstr "Lägg till i adress_boken"
 
-#: src/compose.c:7240
+#: src/compose.c:7249
 msgid "Delete entry contents"
 msgstr "Ta bort innehållet i inmatningsfältet"
 
-#: src/compose.c:7244 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7253 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:7476
+#: src/compose.c:7488
 msgid "Mime type"
 msgstr "Mime typ"
 
-#: src/compose.c:7482 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:633
-#: src/prefs_summary_column.c:84 src/summaryview.c:472
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:7544
+#: src/compose.c:7556
 msgid "Save Message to "
 msgstr "Spara meddelande i "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
-#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
-#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
+#: src/compose.c:7589 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/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
-#: src/plugins/bsfilter/bsfilter_gtk.c:181
+#: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: src/compose.c:7591
+#: src/compose.c:7605
 msgid "Select folder to save message to"
 msgstr "Välj mapp att spara meddelande till"
 
-#: src/compose.c:8048
+#: src/compose.c:8059
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: src/compose.c:8053
+#: src/compose.c:8064
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: src/compose.c:8067
+#: src/compose.c:8078
 msgid "Othe_rs"
 msgstr "Öv_rigt"
 
-#: src/compose.c:8082
+#: src/compose.c:8093
 msgid "S_ubject:"
 msgstr "Ämne:"
 
-#: src/compose.c:8306
+#: src/compose.c:8317
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2211,19 +2461,19 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8468
 msgid "_From:"
 msgstr "_Från:"
 
-#: src/compose.c:8470
+#: src/compose.c:8476
 msgid "Account to use for this email"
 msgstr "Konto att använda för denna e-post"
 
-#: src/compose.c:8472
+#: src/compose.c:8478
 msgid "Sender address to be used"
 msgstr "Avsändaradress att användas"
 
-#: src/compose.c:8654
+#: src/compose.c:8660
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2232,75 +2482,116 @@ msgstr ""
 "Sekretesssystemet '%s' kan inte laddas. Du kommer inte att kunna signera "
 "eller kryptera detta meddelande."
 
-#: src/compose.c:8765 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
 msgstr "Ingen"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8872 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:8963
+#: src/compose.c:8969
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Mall '%s' formatfel."
 
-#: src/compose.c:9387
+#: src/compose.c:9394
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ."
 
-#: src/compose.c:9402
+#: src/compose.c:9409
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:9476
+#: src/compose.c:9480
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9494
+#: src/compose.c:9498
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: src/compose.c:9527
+#: src/compose.c:9531
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:9547
+#: src/compose.c:9551
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:9548
+#: src/compose.c:9552
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:9807
+#: src/compose.c:9648
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Kunde inte skriva till filen:\n"
+"%s"
+
+#: src/compose.c:9677
+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
+#, c-format
+msgid ""
+"Could not spawn the following external editor command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Kunde inte skapa följande kommando för externa redigeraren:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9754
+#, c-format
+msgid "External editor stopped with an error: %s"
+msgstr "Extern redigerare stoppade med ett fel: %s"
+
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr "processid: %"
+
+#: src/compose.c:9830
+#, c-format
+msgid "process id: %d"
+msgstr "processid: %d"
+
+#: src/compose.c:9835
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"%s"
 msgstr ""
 "Den externa redigeraren arbetar fortfarande.\n"
 "Framtvinga avslutning av processen?\n"
-"processgrupps-id: %d"
+"%s"
 
-#: src/compose.c:10280 src/messageview.c:1088
+#: src/compose.c:10245 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:10473
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:10477
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast"
 
-#: src/compose.c:10478
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2308,24 +2599,24 @@ msgstr ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: src/compose.c:10480
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: src/compose.c:10480
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "_Överge e-post"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:10697
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte läsas."
 
-#: src/compose.c:10699
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2334,50 +2625,59 @@ msgstr ""
 "Filen '%s' innehåller ogiltiga tecken\n"
 "för den aktuella teckenkodningen, inmatning kan bli fel."
 
-#: src/compose.c:10778
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "Överge meddelande"
 
-#: src/compose.c:10779
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Detta meddelande har ändrats. Vill du överge det?"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Överge"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: src/compose.c:10784
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Detta meddelande har ändrats. Vill du spara de senaste ändringarna?"
 
-#: src/compose.c:10785
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: src/compose.c:10856
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Vill du använda mallen '%s' ?"
 
-#: src/compose.c:10858
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
-#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1018
+#: src/compose.c:10834 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:11746
+#: 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
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2392,20 +2692,20 @@ msgstr[1] ""
 "Vill du infoga innehållet i de %d filerna i meddelandetexten, eller bifoga "
 "det till meddelandet?"
 
-#: src/compose.c:11752
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga?"
 
-#: src/compose.c:11753
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:11971
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel på rad %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2419,11 +2719,11 @@ msgstr ""
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "Claws-Mail process (%ld) tog emot signalen %ld"
 
-#: src/crash.c:186
+#: src/crash.c:189
 msgid "Claws Mail has crashed"
 msgstr "Claws-Mail har krashat"
 
-#: src/crash.c:203
+#: src/crash.c:206
 #, c-format
 msgid ""
 "%s.\n"
@@ -2432,23 +2732,24 @@ msgstr ""
 "%s.\n"
 "Var snäll och rapportera en bugg och inkludera informationen nedan."
 
-#: src/crash.c:208
+#: src/crash.c:211
 msgid "Debug log"
 msgstr "Debug-logg"
 
-#: src/crash.c:252 src/toolbar.c:539
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
+#: src/uri_opener.c:226
 msgid "Close"
 msgstr "Stäng"
 
-#: src/crash.c:257
+#: src/crash.c:260
 msgid "Save..."
 msgstr "Spara..."
 
-#: src/crash.c:262
+#: src/crash.c:265
 msgid "Create bug report"
 msgstr "Skapa bugrapport"
 
-#: src/crash.c:312
+#: src/crash.c:315
 msgid "Save crash information"
 msgstr "Spara krash-information"
 
@@ -2512,11 +2813,11 @@ msgstr "Redigera persondetaljer"
 msgid "An Email address must be supplied."
 msgstr "En e-postadress måste anges."
 
-#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:204
 msgid "A Name and Value must be supplied."
 msgstr "Ett Namn och ett Värde måste anges."
 
-#: src/editaddress.c:820 src/prefs_folder_item.c:1784
+#: src/editaddress.c:820 src/prefs_folder_item.c:1827
 msgid "Discard"
 msgstr "_Överge"
 
@@ -2524,15 +2825,15 @@ msgstr "_Överge"
 msgid "Apply"
 msgstr "Applicera"
 
-#: src/editaddress.c:851 src/editaddress.c:901
+#: src/editaddress.c:851 src/editaddress.c:902
 msgid "Edit Person Data"
 msgstr "Redigera persondata"
 
-#: src/editaddress.c:930
+#: src/editaddress.c:931
 msgid "Choose a picture"
 msgstr "Välj en bild"
 
-#: src/editaddress.c:949
+#: src/editaddress.c:950
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2541,32 +2842,32 @@ msgstr ""
 "Misslyckades att importera bild: \n"
 "%s"
 
-#: src/editaddress.c:991
+#: src/editaddress.c:992
 msgid "_Set picture"
 msgstr "Ange bild"
 
-#: src/editaddress.c:992
+#: src/editaddress.c:993
 msgid "_Unset picture"
 msgstr "Ta bort bild"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr "Foto"
 
-#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
-#: src/exporthtml.c:762 src/ldif.c:747
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:508
+#: src/exporthtml.c:758 src/ldif.c:751
 msgid "Display Name"
 msgstr "Namn att visa"
 
-#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:759
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:755
 msgid "First Name"
 msgstr "Förnamn"
 
-#: src/editaddress.c:1115 src/editaddress.c:1117
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr "Smeknamn"
 
@@ -2574,25 +2875,25 @@ msgstr "Smeknamn"
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
-#: src/editaddress_other_attributes_ldap.c:376
-#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
+#: src/editaddress.c:1483 src/editaddress.c:1510 src/editaddress.c:1529
+#: src/editaddress_other_attributes_ldap.c:374
+#: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:217
 msgid "Value"
 msgstr "Värde"
 
-#: src/editaddress.c:1594
+#: src/editaddress.c:1597
 msgid "_User Data"
 msgstr "_Användardata"
 
-#: src/editaddress.c:1595
+#: src/editaddress.c:1598
 msgid "_Email Addresses"
 msgstr "E-postadresser"
 
-#: src/editaddress.c:1598 src/editaddress.c:1601
+#: src/editaddress.c:1601 src/editaddress.c:1604
 msgid "O_ther Attributes"
 msgstr "A_ndra attribut"
 
-#: src/editaddress.c:1769
+#: src/editaddress.c:1772
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2601,95 +2902,90 @@ msgstr ""
 "Misslyckades spara bild: \n"
 "%s"
 
-#: src/editbook.c:109
+#: src/editbook.c:108
 msgid "File appears to be OK."
 msgstr "Fil verkar vara OK."
 
-#: src/editbook.c:112
+#: src/editbook.c:111
 msgid "File does not appear to be a valid address book format."
 msgstr "Filen verkar inte vara i ett giltigt adressboksformat."
 
-#: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
+#: src/editbook.c:114 src/editjpilot.c:190 src/editvcard.c:97
 msgid "Could not read file."
 msgstr "Kunde inte läsa fil."
 
-#: src/editbook.c:149 src/editbook.c:263
+#: src/editbook.c:147 src/editbook.c:258
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
+#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
 msgstr " Undersök fil "
 
-#: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2158
-#: src/wizard.c:1198 src/wizard.c:1618
+#: 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
 msgid "File"
 msgstr "Fil"
 
-#: src/editbook.c:282
+#: src/editbook.c:277
 msgid "Add New Addressbook"
 msgstr "Lägg till ny adressbok"
 
-#: src/editgroup.c:101
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Ett gruppnamn måste anges."
 
-#: src/editgroup.c:296
-msgid "Edit Group Data"
+#: src/editgroup.c:292
+msgid "Edit group data"
 msgstr "Redigera gruppdata"
 
-#: src/editgroup.c:326 src/exporthtml.c:598
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: src/editgroup.c:345
-msgid "Addresses in Group"
-msgstr "Adresser i Grupp"
-
-#: src/editgroup.c:379
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Tillgängliga adresser"
 
-#: src/editgroup.c:453
-msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr "Flytta e-postadresser till eller från grupp med pilknapparna"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Adresser i Grupp"
 
-#: src/editgroup.c:501
-msgid "Edit Group Details"
-msgstr "Redigera Gruppdetaljer"
+#: src/editgroup.c:494
+msgid "Edit group details"
+msgstr "Redigera gruppdetaljer"
 
-#: src/editgroup.c:504
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "Lägg till ny grupp"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Redigera mapp"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
-#: src/editgroup.c:556 src/foldersel.c:573 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: 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
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:557 src/foldersel.c:574 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
-#: src/editjpilot.c:188
+#: src/editjpilot.c:187
 msgid "File does not appear to be JPilot format."
 msgstr "Filen verkar inte vara i JPilot-format."
 
-#: src/editjpilot.c:200
+#: src/editjpilot.c:199
 msgid "Select JPilot File"
 msgstr "Välj JPilotfil"
 
-#: src/editjpilot.c:236 src/editjpilot.c:365
+#: src/editjpilot.c:235 src/editjpilot.c:364
 msgid "Edit JPilot Entry"
 msgstr "Redigera JPilotfält"
 
@@ -2697,38 +2993,38 @@ msgstr "Redigera JPilotfält"
 msgid "Additional e-Mail address item(s)"
 msgstr "Ytterligare e-postadressobjekt"
 
-#: src/editjpilot.c:372
+#: src/editjpilot.c:371
 msgid "Add New JPilot Entry"
 msgstr "Lägg till nytt JPilotfält"
 
-#: src/editldap_basedn.c:153
+#: src/editldap_basedn.c:152
 msgid "Edit LDAP - Select Search Base"
 msgstr "Redigera LDAP - Välj sökbas"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
-#: src/prefs_proxy.c:98
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Värdnamn"
 
-#: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
-#: src/prefs_proxy.c:105 src/ssl_manager.c:117
+#: src/editldap_basedn.c:180 src/editldap.c:456
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap_basedn.c:193 src/editldap.c:502
+#: src/editldap_basedn.c:189 src/editldap.c:497
 msgid "Search Base"
 msgstr "Sök i databas"
 
-#: src/editldap_basedn.c:221
+#: src/editldap_basedn.c:219
 msgid "Available Search Base(s)"
 msgstr "Tillgänglig(a) sökbas(er)"
 
-#: src/editldap_basedn.c:327
+#: src/editldap_basedn.c:325
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Kunde inte läsa sökbas(er) från server, vänligen ställ in manuellt"
 
-#: src/editldap_basedn.c:331 src/editldap.c:281
+#: src/editldap_basedn.c:329 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "Kan inte ansluta till server"
 
@@ -2748,15 +3044,15 @@ msgstr "Minst ett attribut måste anges för LDAP sökning."
 msgid "Connected successfully to server"
 msgstr "Anslöt framgångsrikt till server"
 
-#: src/editldap.c:335 src/editldap.c:991
+#: src/editldap.c:335 src/editldap.c:974
 msgid "Edit LDAP Server"
 msgstr "Redigera LDAP-server"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "Ett namn som du vill ge servern."
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2768,15 +3064,15 @@ msgstr ""
 "adress. Du kan ange \"localhost\" om LDAP-servern kör på samma dator som "
 "Claws-Mail."
 
-#: src/editldap.c:469
+#: src/editldap.c:467
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#: src/editldap.c:468 src/prefs_account.c:4227
+msgid "TLS"
+msgstr "TLS"
 
-#: src/editldap.c:474
+#: src/editldap.c:472
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2788,29 +3084,29 @@ msgstr ""
 "misslyckas, kontrollera att konfigurationen i ldap.conf är korrekt (fälten "
 "TLS_CACERTDIR and TLS_REQCERT)."
 
-#: src/editldap.c:479
+#: src/editldap.c:477
 msgid ""
-"Enable secure connection to the LDAP server via SSL/TLS. If connection "
-"fails, be sure to check the correct configuration in ldap.conf "
-"(TLS_CACERTDIR and TLS_REQCERT fields)."
+"Enable secure connection to the LDAP server via TLS. If connection fails, be "
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."
 msgstr ""
-"Aktivera säker uppkoppling till LDAP-servern med SSL/TLS. Om uppkopplingen "
+"Aktivera säker uppkoppling till LDAP-servern med TLS. Om uppkopplingen "
 "misslyckas, kontrollera att konfigurationen i ldap.conf är korrekt (fälten "
-"TLS_CACERTDIR and TLS_REQCERT)."
+"TLS_CACERTDIR och TLS_REQCERT)."
 
-#: src/editldap.c:491
+#: src/editldap.c:487
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "Portnumret som servern lyssnar på. Port 389 är standard."
 
-#: src/editldap.c:494
+#: src/editldap.c:490
 msgid " Check Server "
 msgstr " Kontrollera server "
 
-#: src/editldap.c:498
+#: src/editldap.c:494
 msgid "Press this button to test the connection to the server."
 msgstr "Tryck på denna knappen för att testa anslutningen till servern."
 
-#: src/editldap.c:511
+#: src/editldap.c:507
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2824,18 +3120,18 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:518
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr ""
 "Tryck på denna knappen för att slå upp tillgängliga kataloger på servern."
 
-#: src/editldap.c:578
+#: src/editldap.c:572
 msgid "Search Attributes"
 msgstr "Sökattribut"
 
-#: src/editldap.c:587
+#: src/editldap.c:582
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
@@ -2843,11 +3139,11 @@ msgstr ""
 "En lista över LDAP attributnamn som kommer att användas vid sökning efter "
 "namn eller adress."
 
-#: src/editldap.c:590
+#: src/editldap.c:585
 msgid " Defaults "
 msgstr " Standardvärden "
 
-#: src/editldap.c:594
+#: src/editldap.c:589
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
@@ -2855,11 +3151,11 @@ msgstr ""
 "Detta återställer alla attributnamn till standardvärden som bör hitta flest "
 "namn och adresser under en namn eller adress sökning."
 
-#: src/editldap.c:600
+#: src/editldap.c:594
 msgid "Max Query Age (secs)"
 msgstr "Maxålder på fråga (sekunder)"
 
-#: src/editldap.c:614
+#: src/editldap.c:607
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2883,21 +3179,21 @@ msgstr ""
 "för servrar med långa svarstider, till kostnaden av större minnesåtgång för "
 "att cacha resultaten."
 
-#: src/editldap.c:631
+#: src/editldap.c:623
 msgid "Include server in dynamic search"
 msgstr "Inkludera servern i dynamisk sökning"
 
-#: src/editldap.c:636
+#: src/editldap.c:627
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr "Inkludera denna server vid dynamisk sökning vid adress ifyllning."
 
-#: src/editldap.c:642
+#: src/editldap.c:632
 msgid "Match names 'containing' search term"
 msgstr "Matcha namn 'innehållande' sökterm"
 
-#: src/editldap.c:647
+#: 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\" "
@@ -2912,11 +3208,11 @@ msgstr ""
 "\"begins-with\" (börjar med) för alla sökningar mot andra adressgränssnitt "
 "av prestandaskäl."
 
-#: src/editldap.c:710
+#: src/editldap.c:697
 msgid "Bind DN"
 msgstr "Bind-DN"
 
-#: src/editldap.c:719
+#: src/editldap.c:707
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2927,101 +3223,114 @@ msgstr ""
 "oftast bara för skyddade servrar. Detta namn är oftast formaterat som: "
 "\"cn=användare,dc=claws-mail,dc=org\". Det lämnas oftast tomt vid en sökning."
 
-#: src/editldap.c:726
+#: src/editldap.c:713
 msgid "Bind Password"
 msgstr "Bindlösenord"
 
-#: src/editldap.c:736
+#: src/editldap.c:724
 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:739 src/prefs_account.c:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
-#: src/prefs_proxy.c:146
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Visa lösenord"
 
-#: src/editldap.c:748
+#: src/editldap.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
 msgid "Timeout (secs)"
 msgstr "Väntetid (sek.)"
 
-#: src/editldap.c:761
+#: src/editldap.c:746
 msgid "The timeout period in seconds."
 msgstr "Tidsgräns i sekunder."
 
-#: src/editldap.c:765
+#: src/editldap.c:749
 msgid "Maximum Entries"
 msgstr "Max antal poster"
 
-#: src/editldap.c:778
+#: src/editldap.c:761
 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:793 src/prefs_account.c:3722
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:778 src/gtk/quicksearch.c:878
 msgid "Extended"
 msgstr "Utökat"
 
-#: src/editldap.c:996
+#: src/editldap.c:979
 msgid "Add New LDAP Server"
 msgstr "Lägg till ny LDAP-server"
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1403
-#: src/prefs_summaries.c:640
+#: src/edittags.c:135
+msgctxt "Window title"
+msgid "Tags configuration"
+msgstr "Etikettkonfiguration"
+
+#: src/edittags.c:140
+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
 msgid "Tag"
 msgstr "Etikett"
 
-#: src/edittags.c:221
+#: src/edittags.c:232
 msgid "Delete tag"
 msgstr "Ta bort etikett"
 
-#: src/edittags.c:222
+#: src/edittags.c:233
 msgid "Do you really want to delete this tag?"
 msgstr "Vill du verkligen ta bort denna etikett?"
 
-#: src/edittags.c:257
+#: src/edittags.c:268
 msgid "Delete all tags"
 msgstr "Ta bort alla etiketter"
 
-#: src/edittags.c:258
+#: src/edittags.c:269
 msgid "Do you really want to delete all tags?"
 msgstr "Vill du verkligen ta bort alla etiketter?"
 
-#: src/edittags.c:430
+#: src/edittags.c:441
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
-"Du matade in ett reserverat taggnamn, vänligen välj ett annat istället."
-
-#: src/edittags.c:472
-msgid "Tag is not set."
-msgstr "Ingen etikett är angiven."
+"Du matade in ett reserverat etikettnamn, vänligen välj ett annat istället."
 
-#: src/edittags.c:550
-msgctxt "Dialog title"
-msgid "Apply tags"
-msgstr "Lägg till etiketter"
-
-#: src/edittags.c:567
+#: src/edittags.c:572
 msgid "New tag:"
 msgstr "Ny etikett:"
 
-#: src/edittags.c:600
-msgid "Please select tags to apply/remove. Changes are immediate."
-msgstr "Välj etiketter att lägga till/ta bort. Ändringar görs direkt."
+#: src/edittags.c:584
+msgid "Add the new tag"
+msgstr "Lägg till den nya etiketten"
+
+#: src/edittags.c:589
+msgid "Delete the selected tag"
+msgstr "Ta bort vald etikett"
+
+#: src/edittags.c:608
+msgid ""
+"Choose the tag(s) for the message(s).\n"
+"Changes are immediately applied."
+msgstr ""
+"Väl etikett(er) för meddelande(n).\n"
+"Ändringar tillämpas omedelbart."
 
-#: src/editvcard.c:95
+#: src/editvcard.c:94
 msgid "File does not appear to be vCard format."
 msgstr "Filen verkar inte vara i giltigt vCard-format."
 
-#: src/editvcard.c:107
+#: src/editvcard.c:106
 msgid "Select vCard File"
 msgstr "Välj vCard-fil"
 
-#: src/editvcard.c:152 src/editvcard.c:257
+#: src/editvcard.c:150 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr "Ändra vCard post"
 
@@ -3033,11 +3342,11 @@ msgstr "Lägg til nytt vCard post"
 msgid "Impossible to set the client certificate.\n"
 msgstr "Omöjligt att sätta klientcertifikatet.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "kunde inte hämta xover-räckvidd\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "kunde inte hämta xhdr-räckvidd\n"
 
@@ -3066,7 +3375,7 @@ msgstr ""
 msgid "Create directory"
 msgstr "Skapa mapp"
 
-#: src/exphtmldlg.c:189
+#: src/exphtmldlg.c:190
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -3075,15 +3384,15 @@ msgstr ""
 "Kan inte skapa destinationsmapp för HTML-fil:\n"
 "%s"
 
-#: src/exphtmldlg.c:191 src/expldifdlg.c:201
+#: src/exphtmldlg.c:192 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "Kunde inte skapa mapp"
 
-#: src/exphtmldlg.c:233
+#: src/exphtmldlg.c:235
 msgid "Error creating HTML file"
 msgstr "Fel vid skapande av HTML-fil"
 
-#: src/exphtmldlg.c:319
+#: src/exphtmldlg.c:324
 msgid "Select HTML output file"
 msgstr "Välj HTML målfil"
 
@@ -3091,95 +3400,105 @@ msgstr "Välj HTML målfil"
 msgid "HTML Output File"
 msgstr "HTML målFil"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
-#: src/importldif.c:568
+#: src/exphtmldlg.c:392 src/expldifdlg.c:406 src/export.c:167 src/import.c:166
+#: src/importldif.c:567
 msgid "B_rowse"
 msgstr "B_läddra"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
 msgid "Stylesheet"
 msgstr "Stilmall"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
-#: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: 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
 msgid "None"
 msgstr "Ingen"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
-#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
-#: src/prefs_other.c:129 src/prefs_other.c:417
+#: src/exphtmldlg.c:449 src/prefs_folder_item.c:532
+#: src/prefs_folder_item.c:1240 src/prefs_folder_item.c:1271
+#: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr "Standard"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
+#: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Fullst. namn"
 
-#: src/exphtmldlg.c:456
+#: src/exphtmldlg.c:451
 msgid "Custom"
 msgstr "Egna brevhuvuden"
 
-#: src/exphtmldlg.c:457
+#: src/exphtmldlg.c:452
 msgid "Custom-2"
 msgstr "Anpassad-2"
 
-#: src/exphtmldlg.c:458
+#: src/exphtmldlg.c:453
 msgid "Custom-3"
 msgstr "Anpassad-3"
 
-#: src/exphtmldlg.c:459
+#: src/exphtmldlg.c:454
 msgid "Custom-4"
 msgstr "Anpassad-4"
 
-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:459
 msgid "Full Name Format"
 msgstr "Fullständigt namn"
 
-#: src/exphtmldlg.c:474
+#: src/exphtmldlg.c:466
 msgid "First Name, Last Name"
 msgstr "Förnamn, Efternamn"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:467
 msgid "Last Name, First Name"
 msgstr "Efternamn, Förnamn"
 
-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:472
 msgid "Color Banding"
 msgstr "Färgdekoration"
 
-#: src/exphtmldlg.c:488
+#: src/exphtmldlg.c:476
 msgid "Format Email Links"
 msgstr "Formatera e-postlänkar"
 
-#: src/exphtmldlg.c:494
+#: src/exphtmldlg.c:480
 msgid "Format User Attributes"
 msgstr "Användarattribut"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
+#: src/exphtmldlg.c:522 src/expldifdlg.c:595 src/importldif.c:839
 msgid "Address Book:"
 msgstr "Adressbok :"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
+#: src/exphtmldlg.c:531 src/expldifdlg.c:604 src/importldif.c:848
 msgid "File Name:"
 msgstr "Filnamn  :"
 
-#: src/exphtmldlg.c:559
+#: src/exphtmldlg.c:540
 msgid "Open with Web Browser"
 msgstr "Öppna med Webbläsare"
 
-#: src/exphtmldlg.c:591
+#: src/exphtmldlg.c:572
 msgid "Export Address Book to HTML File"
 msgstr "Exportera adressbok till HTML-fil"
 
-#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
+#: 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
+msgid "_Previous"
+msgstr "Föregående"
+
+#: src/exphtmldlg.c:607 src/expldifdlg.c:672 src/importldif.c:924
+#: src/message_search.c:233 src/summary_search.c:490 src/wizard.c:1831
+msgid "_Next"
+msgstr "_Nästa"
+
+#: src/exphtmldlg.c:638 src/expldifdlg.c:703 src/importldif.c:965
 msgid "File Info"
 msgstr "Filinformation"
 
-#: src/exphtmldlg.c:658
+#: src/exphtmldlg.c:639
 msgid "Format"
 msgstr "Format"
 
@@ -3229,15 +3548,15 @@ msgstr ""
 msgid "Error creating LDIF file"
 msgstr "Fel vid skapandet av LDIF-fil"
 
-#: src/expldifdlg.c:336
+#: src/expldifdlg.c:338
 msgid "Select LDIF output file"
 msgstr "Välj LDIF målfil"
 
-#: src/expldifdlg.c:400
+#: src/expldifdlg.c:397
 msgid "LDIF Output File"
 msgstr "LDIF målfil"
 
-#: src/expldifdlg.c:431
+#: src/expldifdlg.c:427
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3247,7 +3566,7 @@ msgstr ""
 "liknande:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:433
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3257,7 +3576,7 @@ msgstr ""
 "liknande:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:443
+#: src/expldifdlg.c:439
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3267,11 +3586,11 @@ msgstr ""
 "som är formaterat liknande:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:489
+#: src/expldifdlg.c:483
 msgid "Suffix"
 msgstr "Suffix"
 
-#: src/expldifdlg.c:499
+#: src/expldifdlg.c:493
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3285,15 +3604,15 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/expldifdlg.c:507
+#: src/expldifdlg.c:500
 msgid "Relative DN"
 msgstr "Relative DN"
 
-#: src/expldifdlg.c:515
+#: src/expldifdlg.c:507
 msgid "Unique ID"
 msgstr "Unikt ID"
 
-#: src/expldifdlg.c:523
+#: src/expldifdlg.c:514
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3307,11 +3626,11 @@ msgstr ""
 "Distinguished Name\" (eller RDN) för att skapa DN. Välj något av de "
 "tillgängliga RDN-alternativen som kommer att användas för att skapa DN."
 
-#: src/expldifdlg.c:543
+#: src/expldifdlg.c:531
 msgid "Use DN attribute if present in data"
 msgstr "Använd DN attribut om det finns i data"
 
-#: src/expldifdlg.c:548
+#: src/expldifdlg.c:535
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3323,11 +3642,11 @@ msgstr ""
 "kan användas i den exporterade LDIF-filen. RDN valt ovan kommer användas om "
 "inte anändarattributet DN hittas."
 
-#: src/expldifdlg.c:558
+#: src/expldifdlg.c:544
 msgid "Exclude record if no Email Address"
 msgstr "Exkludera e-post om det inte finns någon e-postadress"
 
-#: src/expldifdlg.c:563
+#: src/expldifdlg.c:548
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
@@ -3335,90 +3654,90 @@ msgstr ""
 "En adressbok kan innehålla objekt utan e-postadresser. Bocka för här för att "
 "ignorera dessa objekt."
 
-#: src/expldifdlg.c:655
+#: src/expldifdlg.c:637
 msgid "Export Address Book to LDIF File"
 msgstr "Exportera adressbok till LDIF-fil"
 
-#: src/expldifdlg.c:722
+#: src/expldifdlg.c:704
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "Exportera till mbox-fil"
 
-#: src/export.c:132
+#: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
 msgstr "Välj mappen som ska exportera och specificera mbox-fil."
 
-#: src/export.c:143
+#: src/export.c:142
 msgid "Source folder:"
 msgstr "Ursprungsmapp:"
 
-#: src/export.c:149 src/import.c:143
+#: src/export.c:146 src/import.c:142
 msgid "Mbox file:"
 msgstr "Mbox-fil:"
 
-#: src/export.c:205
+#: src/export.c:198
 msgid "Target mbox filename can't be left empty."
 msgstr "Mål mbox-filnamn kan inte vara tomt."
 
-#: src/export.c:210
+#: src/export.c:203
 msgid "Source folder can't be left empty."
 msgstr "Ursprungsmapp kan inte vara tom."
 
-#: src/export.c:223
+#: src/export.c:216
 msgid "Couldn't find the source folder."
 msgstr "Kunde inte hitta ursprungsmapp."
 
-#: src/export.c:247
+#: src/export.c:240
 msgid "Select exporting file"
 msgstr "Välj exportfil"
 
-#: src/export.c:270
+#: src/export.c:263
 msgid "Select folder to export"
 msgstr "Välj mapp för export"
 
-#: src/exporthtml.c:768
+#: src/exporthtml.c:764
 msgid "Full Name"
 msgstr "Fullst. namn"
 
-#: src/exporthtml.c:772 src/importldif.c:981
+#: src/exporthtml.c:768 src/importldif.c:966
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "Användarattribut"
 
-#: src/exporthtml.c:975
+#: src/exporthtml.c:971
 msgid "Claws Mail Address Book"
 msgstr "Claws-Mail adressbok"
 
-#: src/exporthtml.c:1070 src/exportldif.c:607
+#: src/exporthtml.c:1066 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "Namnet finns redan men det är inte en mapp."
 
-#: src/exporthtml.c:1073 src/exportldif.c:610
+#: src/exporthtml.c:1069 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "Inga rättigheter att skapa mapp."
 
-#: src/exporthtml.c:1076 src/exportldif.c:613
+#: src/exporthtml.c:1072 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "Namnet är för långt."
 
-#: src/exporthtml.c:1079 src/exportldif.c:616
+#: src/exporthtml.c:1075 src/exportldif.c:616
 msgid "Not specified."
 msgstr "Ej specificerad."
 
-#: src/file_checker.c:82
+#: src/file_checker.c:81
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "Filen %s saknas! Vill använda säkerhetskopian från %s?"
 
-#: src/file_checker.c:91 src/file_checker.c:115
+#: src/file_checker.c:90 src/file_checker.c:114
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "Kunde inte kopiera %s till %s"
 
-#: src/file_checker.c:106
+#: src/file_checker.c:105
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3426,11 +3745,19 @@ msgid ""
 msgstr ""
 "Filen %s är tom eller Felaktig! Vill du använda säkerhetskopian från %s?"
 
-#: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr "regeln är inte konto-baserad\n"
 
-#: src/filtering.c:607
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"regeln är konto-baserad, och matchar kontot som för närvarande används för "
+"att ta emot meddelanden\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3439,13 +3766,13 @@ msgstr ""
 "regel är kontobaserad [id=%d, namn='%s'], matchar konto som för närvarande "
 "används för att ta emot meddelanden\n"
 
-#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
-#: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
-#: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "ICKE_EXISTERANDE"
 
-#: src/filtering.c:617
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
@@ -3453,7 +3780,7 @@ msgstr ""
 "regeln är konto-baserad, men matchar inte kontot som för närvarande används "
 "för att ta emot meddelanden\n"
 
-#: src/filtering.c:624
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
@@ -3462,113 +3789,125 @@ msgstr ""
 "regel är kontobaserad [id=%d, namn='%s'], matchar inte kontot som för "
 "närvarande används för att ta emot meddelanden [id=%d, namn='%s']\n"
 
-#: src/filtering.c:643
+#: src/filtering.c:658
+msgid ""
+"rule is not account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"regeln är inte kontobaserad, men alla regler appliceras på "
+"användarförfrågningar hursomhelst\n"
+
+#: src/filtering.c:665
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"regeln är inte kontobaserad, alla regler appliceras på användarförfrågningar "
+"regeln är kontobaserad, men alla regler appliceras på användarförfrågningar "
 "hursomhelst\n"
 
-#: src/filtering.c:649
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
 "regel är kontobaserad [id=%d, namn='%s'], men alla regler appliceras enligt "
-"användarens önskemål\n"
+"användarens önskemål ändå\n"
 
-#: src/filtering.c:667
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "regel är kontobaserad, hoppar över enligt användarens önskemål\n"
+
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 "regel är kontobaserad [id=%d, namn='%s'], hoppar över enligt användarens "
 "önskemål\n"
 
-#: src/filtering.c:672
-msgid "rule is account-based, skipped on user request\n"
-msgstr "regel är kontobaserad, hoppar över enligt användarens önskemål\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "regel är kontobaserad, och matchar aktuellt konto\n"
 
-#: src/filtering.c:694
+#: src/filtering.c:736
 #, 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'], 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 aktuellt konto [id=%d, "
+"namn='%s']\n"
 
-#: src/filtering.c:700
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr "regel är kontobaserad, och matcher inte aktuellt konto\n"
 
-#: src/filtering.c:712
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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'], 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:752
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "tillämpar åtgärd [ %s ]\n"
 
-#: src/filtering.c:757
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "åtgärden kunde inte tillämpas\n"
 
-#: src/filtering.c:759
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "ingen fortsatt behandling efter handling [ %s ]\n"
 
-#: src/filtering.c:809
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "behandlingsregel '%s' [ %s ]\n"
 
-#: src/filtering.c:813
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "behandlar regel <ej namngiven> [ %s ]\n"
 
-#: src/filtering.c:831
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "inaktiverade regel '%s' [ %s ]\n"
 
-#: src/filtering.c:835
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "inaktiverade regel <ej namngiven> [ %s ]\n"
 
-#: src/filtering.c:873
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "obestämd"
 
-#: src/filtering.c:877
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "införlivande"
 
-#: src/filtering.c:881
+#: src/filtering.c:935
 msgid "manually"
 msgstr "manuellt"
 
-#: src/filtering.c:885
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "mappbehandling"
 
-#: src/filtering.c:889
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "förbehandling"
 
-#: src/filtering.c:893
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "efterbehandling"
 
-#: src/filtering.c:908
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3585,11 +3924,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:917
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3598,285 +3937,285 @@ msgstr ""
 "filtrerar meddelande (%s%s%s)\n"
 "%smeddelandefil: %s\n"
 
-#: src/folder.c:1595 src/prefs_folder_item.c:319
+#: src/folder.c:1596 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "Inkorgen"
 
-#: src/folder.c:1599
+#: src/folder.c:1600
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:322
+#: 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 "Kö"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:323
+#: src/folder.c:1608 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:321
+#: src/folder.c:1612 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/folder.c:2042
+#: src/folder.c:2043
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Behandlar (%s)...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3295
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "Kopierar %s till %s...\n"
 
-#: src/folder.c:3289
+#: src/folder.c:3295
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Flyttar meddelande %s till %s...\n"
 
-#: src/folder.c:3599
+#: src/folder.c:3613
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Uppdaterar cache %s...."
 
-#: src/folder.c:4461
+#: src/folder.c:4478
 msgid "Processing messages..."
 msgstr "Behandlar meddelanden..."
 
-#: src/folder.c:4596
+#: src/folder.c:4613
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "Synkroniserar %s för frånkopplad användning...\n"
 
-#: src/folder.c:4855
+#: src/folder.c:4872
 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:4859
+#: src/folder.c:4876
 msgid "A folder name can not end with a space."
 msgstr "Ett mappnamn kan inte börja eller sluta med ett mellanslag."
 
-#: src/foldersel.c:251
+#: src/foldersel.c:252
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:575 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: 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
 msgid "NewFolder"
 msgstr "Nymapp"
 
-#: src/foldersel.c:576 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
 msgstr "Ärv egenskaper och behandlingsregler från överliggande mapp"
 
-#: src/foldersel.c:586 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2068
+#: 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
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Ett mappnamn kan inte innehålla '%c'."
 
-#: src/foldersel.c:601 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
-#: src/plugins/vcalendar/vcal_folder.c:2075
+#: 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
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Mappen '%s' finns redan."
 
-#: src/foldersel.c:608 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:125
+#: 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
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kan inte skapa mappen '%s'."
 
-#: src/folderview.c:247
+#: src/folderview.c:248
 msgid "Mark all re_ad"
 msgstr "_Markera alla som lästa"
 
-#: src/folderview.c:248
+#: src/folderview.c:249
 msgid "Mark all u_nread"
 msgstr "Markera alla som olästa"
 
-#: src/folderview.c:249
+#: src/folderview.c:250
 msgid "Mark all read recursi_vely"
 msgstr "Markera alla som lästa rekursi_vt"
 
-#: src/folderview.c:250
+#: src/folderview.c:251
 msgid "Mark all unread recursi_vely"
 msgstr "Markera alla som olästa rekursi_vt"
 
-#: src/folderview.c:252
+#: src/folderview.c:253
 msgid "R_un processing rules"
 msgstr "Kör behandlingsregler"
 
-#: src/folderview.c:253 src/mainwindow.c:562
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "_Sök i mapp..."
 
-#: src/folderview.c:255
+#: src/folderview.c:256
 msgid "Process_ing..."
 msgstr "Behandla..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
 msgid "Empty _trash..."
 msgstr "T_öm papperskorg..."
 
-#: src/folderview.c:257
+#: src/folderview.c:258
 msgid "Send _queue..."
 msgstr "Skicka köade..."
 
-#: src/folderview.c:264
+#: src/folderview.c:265
 msgid "Set Displayed columns"
 msgstr "Välj visade kolumner"
 
-#: src/folderview.c:403 src/folderview.c:450
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
 msgid "New"
 msgstr "Ny(a)"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:405 src/folderview.c:452
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
-#: src/toolbar.c:512
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/toolbar.c:522
 msgid "Unread"
 msgstr "Oläst(a)"
 
-#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:406 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:453 src/summaryview.c:473
+#: src/folderview.c:454 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:783
+#: src/folderview.c:785
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:870 src/summaryview.c:4272
 msgid "Mark all as read"
 msgstr "Markera alla som lästa"
 
-#: src/folderview.c:869
+#: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
 "Vill du verkligen markera all e-post i denna mapp och dess undermappar som "
 "lästa?"
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:873 src/summaryview.c:4273
 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:874 src/summaryview.c:4334
+#: src/folderview.c:876 src/summaryview.c:4318
 msgid "Mark all as unread"
 msgstr "Markera alla som olästa"
 
-#: src/folderview.c:875
+#: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
 "Vill du verkligen markera all e-post i denna mapp och dess undermappar som "
 "olästa?"
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:879 src/summaryview.c:4319
 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:1067 src/imap.c:4675
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Avsöker mapp %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4679 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Avsöker mapp %s...."
 
-#: src/folderview.c:1101
+#: src/folderview.c:1109
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapplista"
 
-#: src/folderview.c:1102
+#: src/folderview.c:1110
 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:1112
+#: src/folderview.c:1120
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapplistan..."
 
-#: src/folderview.c:1114
+#: src/folderview.c:1122
 msgid "Scanning folder tree..."
 msgstr "Söker igenom mapplistan..."
 
-#: src/folderview.c:1205
+#: src/folderview.c:1212
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kunde inte genomsöka mapp %s\n"
 
-#: src/folderview.c:1259
+#: src/folderview.c:1266
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelande i alla mappar..."
 
-#: src/folderview.c:2233
+#: src/folderview.c:2235
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Stänger mapp %s..."
 
-#: src/folderview.c:2328
+#: src/folderview.c:2337
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öppnar mapp %s..."
 
-#: src/folderview.c:2346
+#: src/folderview.c:2355
 msgid "Folder could not be opened."
 msgstr "Mappen kunde inte öppnas."
 
-#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Töm papperskorg"
 
-#: src/folderview.c:2487
+#: src/folderview.c:2496
 msgid "Delete all messages in trash?"
 msgstr "Ta bort alla meddelande från papperskorgen?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2497
 msgid "_Empty trash"
 msgstr "_Töm papperskorg"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Varning om frånkopplat läge"
 
-#: src/folderview.c:2533 src/toolbar.c:3033
+#: src/folderview.c:2542 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "Du arbetar frånkopplad. Åsidosätta?"
 
-#: src/folderview.c:2544 src/toolbar.c:3052
+#: src/folderview.c:2553 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: src/folderview.c:2545 src/toolbar.c:3053
+#: src/folderview.c:2554 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "Skicka alla köade meddelanden?"
 
-#: src/folderview.c:2554 src/toolbar.c:3072
+#: src/folderview.c:2563 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:2557 src/main.c:2891 src/toolbar.c:3075
+#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3885,138 +4224,142 @@ msgstr ""
 "Några fel uppstod vid skickande av köade meddelanden:\n"
 "%s"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2647
 #, 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:2633
+#: src/folderview.c:2648
 #, 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:2635
+#: src/folderview.c:2650
 msgid "Copy folder"
 msgstr "Kopiera mapp"
 
-#: src/folderview.c:2635
+#: src/folderview.c:2650
 msgid "Move folder"
 msgstr "Flytta mapp"
 
-#: src/folderview.c:2646
+#: src/folderview.c:2661
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiera %s till %s..."
 
-#: src/folderview.c:2646
+#: src/folderview.c:2661
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyttar %s till %s..."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2695
 msgid "Source and destination are the same."
 msgstr "Källa och destination är de samma."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2698
 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:2684
+#: src/folderview.c:2699
 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:2687
+#: src/folderview.c:2702
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "En mapp kan inte flyttas mellan olika brevlådor."
 
-#: src/folderview.c:2690
+#: src/folderview.c:2705
 msgid "Copy failed!"
 msgstr "Kopiering misslyckades!"
 
-#: src/folderview.c:2690
+#: src/folderview.c:2705
 msgid "Move failed!"
 msgstr "Flytt misslyckades!"
 
-#: src/folderview.c:2740
+#: src/folderview.c:2755
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Behandlar konfiguration för mappen %s"
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Destinationsmappen kan bara användas till att spara undermappar."
 
-#: src/grouplistdialog.c:161
+#: src/grouplistdialog.c:158
 msgid "Newsgroup subscription"
 msgstr "Diskussionsgruppsprenumeration"
 
-#: src/grouplistdialog.c:178
+#: src/grouplistdialog.c:175
 msgid "Select newsgroups for subscription:"
 msgstr "Välj diskussionsgrupper för prenumeration:"
 
-#: src/grouplistdialog.c:184
+#: src/grouplistdialog.c:189
 msgid "Find groups:"
 msgstr "Hitta grupper:"
 
-#: src/grouplistdialog.c:192
+#: src/grouplistdialog.c:198
 msgid " Search "
 msgstr " Sök "
 
-#: src/grouplistdialog.c:204
+#: src/grouplistdialog.c:212
 msgid "Newsgroup name"
 msgstr "Namn på diskussionsgrupp"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:188
+#: src/grouplistdialog.c:213 src/prefs_send.c:188
 msgid "Messages"
 msgstr "Meddelande"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:236
+msgid "_Refresh"
+msgstr "Uppdate_ra"
+
+#: src/grouplistdialog.c:354
 msgid "moderated"
 msgstr "modererad"
 
-#: src/grouplistdialog.c:348
-msgid "readonly"
+#: src/grouplistdialog.c:356
+msgid "read-only"
 msgstr "skrivskyddad"
 
-#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: 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
 msgid "unknown"
 msgstr "okänd"
 
-#: src/grouplistdialog.c:424
+#: src/grouplistdialog.c:433
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ej hämta diskussionsgrupplista."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1848 src/summaryview.c:1683
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Färdig."
 
-#: src/grouplistdialog.c:494
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskussionsgrupper mottagna (%s lästa)"
 
-#: src/gtk/about.c:133
+#: src/gtk/about.c:134
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr "Claws Mail är en snabb och mycket anpassningsbar e-postklient."
 
-#: src/gtk/about.c:136
+#: src/gtk/about.c:137
 msgid "For further information visit the Claws Mail website:"
 msgstr "För ytterligare information se Claws Mails webbplats:"
 
-#: src/gtk/about.c:141
+#: src/gtk/about.c:142
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 "För support och diskussioner, prenumerera på Claws Mail's sändlista för "
 "användare:"
 
-#: src/gtk/about.c:147
+#: src/gtk/about.c:148
 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:"
@@ -4024,21 +4367,21 @@ 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:163 src/gtk/about.c:852
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2022\n"
 "Claws-Mail-gruppen\n"
 "och Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:169
 msgid "System Information\n"
 msgstr "Systeminformation\n"
 
-#: src/gtk/about.c:174
+#: src/gtk/about.c:175
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4047,7 +4390,7 @@ msgstr ""
 "Lokal: %s (teckenkodning: %s)\n"
 "Operativsystem: %s %s (%s)"
 
-#: src/gtk/about.c:183
+#: src/gtk/about.c:185
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4056,7 +4399,7 @@ msgstr ""
 "Lokal: %s (teckenkodning: %s)\n"
 "Operativsystem: %s"
 
-#: src/gtk/about.c:192
+#: src/gtk/about.c:195
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4065,97 +4408,100 @@ msgstr ""
 "Lokal: %s (teckenkodning: %s)\n"
 "Operativsystem: okänt"
 
-#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
+#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Claws Mail-laget"
 
-#: src/gtk/about.c:267
+#: src/gtk/about.c:273
 msgid "Previous team members"
 msgstr "Före detta lagmedlemmar"
 
-#: src/gtk/about.c:286
+#: src/gtk/about.c:292
 msgid "The translation team"
 msgstr "Översättarlaget"
 
-#: src/gtk/about.c:305
+#: src/gtk/about.c:311
 msgid "Documentation team"
 msgstr "Dokumentationslaget"
 
-#: src/gtk/about.c:323
+#: src/gtk/about.c:329
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:342
+#: src/gtk/about.c:348
 msgid "Icons"
 msgstr "Ikoner"
 
-#: src/gtk/about.c:361
+#: src/gtk/about.c:367
 msgid "Contributors"
 msgstr "Medarbetare"
 
-#: src/gtk/about.c:409
+#: src/gtk/about.c:416
 msgid "Compiled-in Features"
 msgstr "Inbyggda Funktioner"
 
-#: src/gtk/about.c:426
+#: src/gtk/about.c:433
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
-msgstr "compface|tillhandahåller stöd för X-Face-brevhuvudet\n"
+msgstr "tillhandahåller stöd för X-Face-brevhuvudet\n"
 
-#: src/gtk/about.c:436
+#: src/gtk/about.c:443
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "tillhandahåller stöd för stavningskontroll\n"
 
-#: src/gtk/about.c:446
+#: src/gtk/about.c:453
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "tillhandahåller stöd för krypterade uppkopplingar mot servrar\n"
 
-#: src/gtk/about.c:456
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr ""
-"tillhandahåller stöd för IPv6-adresser, det nya "
-"Internetadresseringsprotokollet\n"
-
-#: src/gtk/about.c:467
+#: src/gtk/about.c:463
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "tillhandahåller stöd för att konvertera mellan olika teckenkodningar\n"
 
-#: src/gtk/about.c:477
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "tillhandahåller stöd för IPv6-adresser\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "tillhandahåller stöd för PalmOS adressböcker\n"
 
-#: src/gtk/about.c:487
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "tillhandahåller stöd för adressböcker delade med LDAP\n"
 
-#: src/gtk/about.c:497
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "tillhandahåller stöd för IMAP- och NNTP-servrar\n"
 
-#: src/gtk/about.c:507
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "tillhandahåller stöd för SVG-teman\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "tillhandahåller stöd för sessionshantering\n"
 
-#: src/gtk/about.c:517
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr ""
 "tillhandahåller stöd för att upptäcka förändringar av nätverksuppkopplingen\n"
 
-#: src/gtk/about.c:527
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "tillhandahåller stöd för SVG-teman\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "lägger till stöd för OAuth2-autentisering\n"
 
-#: src/gtk/about.c:559
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4166,7 +4512,7 @@ msgstr ""
 "Software Foundation; enligt version 3, eller (efter ditt eget val) någon "
 "senare version."
 
-#: src/gtk/about.c:566
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4178,7 +4524,7 @@ msgstr ""
 "garantin av SÄLJBARHET eller ÄNDAMÅLSENLIGHET FÖR NÅGOT SÄRSKILT SYFTE. Se "
 "GNU General Public License för fler detaljer."
 
-#: src/gtk/about.c:585
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4186,149 +4532,157 @@ 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:718 src/main.c:2715
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Sessionsstatistik\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2725 src/main.c:2728
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Startat: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Inkommande trafik\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Mottagna meddelanden: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2743
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Utgående trafik\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nya/Omdirigerade meddelanden: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2750
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Besvarade meddelanden: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2754
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Vidarebefordrade meddelanden: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2758
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totalt utgående meddelanden: %d\n"
 
-#: src/gtk/about.c:793
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "Om Claws Mail"
 
-#: src/gtk/about.c:866
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Författare"
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "F_unktioner"
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Licens"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "Ve_rsionsinformation"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
 msgid "Red"
 msgstr "Röd"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
 msgid "Sky blue"
 msgstr "Himmelsblå"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
 msgid "Blue"
 msgstr "Blå"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
 msgid "Green"
 msgstr "Grön"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
 msgid "Brown"
 msgstr "Brun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
 msgid "Grey"
 msgstr "Grå"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
 msgid "Light brown"
 msgstr "Ljusbrun"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
 msgid "Dark red"
 msgstr "Mörkröd"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
 msgid "Dark pink"
 msgstr "Mörkrosa"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
 msgid "Steel blue"
 msgstr "Stålblå"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
 msgid "Gold"
 msgstr "Guld"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
 msgid "Bright green"
 msgstr "Ljusgrön"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:230
 msgid "Set mailbox order"
 msgstr "Sorteringsordning för brevlådor"
 
-#: src/gtk/foldersort.c:277
+#: src/gtk/foldersort.c:266
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 "Flytta mappar upp eller ner för att ändra sorteringsordningen i mapplistan."
 
-#: src/gtk/foldersort.c:311
+#: src/gtk/foldersort.c:300
 msgid "Mailboxes"
 msgstr "Brevlådor"
 
+#: src/gtk/foldersort.c:316
+msgid "Move the selected mailbox up"
+msgstr "Flytta upp vald postlåda"
+
+#: src/gtk/foldersort.c:322
+msgid "Move the selected mailbox down"
+msgstr "Flytta ner vald postlåda"
+
 #: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr "Ingen ordlista vald."
@@ -4347,20 +4701,20 @@ msgstr "Kunde inte initiera Enchant broker."
 msgid "Couldn't initialize %s dictionary:"
 msgstr "Kunde inte initiera %s ordlista:"
 
-#: src/gtk/gtkaspell.c:1070
+#: src/gtk/gtkaspell.c:1067
 msgid "No misspelled word found."
 msgstr "Inga felstavade ord hittades."
 
-#: src/gtk/gtkaspell.c:1451
+#: src/gtk/gtkaspell.c:1443
 msgid "Replace unknown word"
 msgstr "Ersätt okänt ord"
 
-#: src/gtk/gtkaspell.c:1467
+#: src/gtk/gtkaspell.c:1459
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Ersätt \"%s\" med: "
 
-#: src/gtk/gtkaspell.c:1510
+#: src/gtk/gtkaspell.c:1504
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4368,55 +4722,55 @@ msgstr ""
 "Att hålla ner Control-knappen samtidigt som du trycker på Enter\n"
 "kommer lära från misstag.\n"
 
-#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1801 src/gtk/gtkaspell.c:1938
 msgid "More..."
 msgstr "Mer..."
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1857
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" okänd i ordlistan '%s'"
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1872
 msgid "Accept in this session"
 msgstr "Acceptera för denna session"
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1882
 msgid "Add to personal dictionary"
 msgstr "Lägg till i egen ordlista"
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1892
 msgid "Replace with..."
 msgstr "Ersätt med..."
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1905
 #, c-format
 msgid "Check with %s"
 msgstr "Kontrollera med %s"
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1927
 msgid "(no suggestions)"
 msgstr "(inga förslag)"
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2001
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Ordlista: %s"
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2015
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Använd alternativ (%s)"
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2026
 msgid "Use both dictionaries"
 msgstr "Använd båda ordböckerna"
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2042 src/prefs_spelling.c:130
 msgid "Check while typing"
 msgstr "Kontrollera medan jag skriver"
 
-#: src/gtk/gtkaspell.c:2154
+#: src/gtk/gtkaspell.c:2124
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4425,7 +4779,7 @@ msgstr ""
 "Rättstavningsprogrammet kunde inte byta ordlista.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2210
+#: src/gtk/gtkaspell.c:2180
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4434,26 +4788,26 @@ msgstr ""
 "Rättstavningsprogrammet kunde inte byta alternativ ordlista.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1743
 msgid "Failed: no service record found."
 msgstr "Misslyckades: ingen post för tjänsten hittades."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1746
 msgid "Failed: network error."
 msgstr "Misslyckades: nätverksfel."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1749
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Misslyckades: okänt fel (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1819
 msgid "Configuring..."
 msgstr "Konfigurerar..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "Datum"
 
@@ -4461,13 +4815,14 @@ msgstr "Datum"
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
-#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: 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/summaryview.c:465
 msgid "From"
 msgstr "Från"
 
-#: src/gtk/headers.h:10 src/summary_search.c:415
+#: src/gtk/headers.h:10 src/summary_search.c:423
 msgid "From:"
 msgstr "Från:"
 
@@ -4483,14 +4838,15 @@ msgstr "Avsändare:"
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
-#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: 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/summaryview.c:466
 msgid "To"
 msgstr "Till"
 
 #: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
-#: src/prefs_matcher.c:2216 src/quote_fmt.c:58
+#: src/prefs_matcher.c:2217 src/quote_fmt.c:57
 msgid "Cc"
 msgstr "Kopia"
 
@@ -4499,7 +4855,7 @@ msgid "Bcc"
 msgstr "Blindkopia"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
-#: src/prefs_matcher.c:2218 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:60
 msgid "Message-ID"
 msgstr "Meddelande-ID"
 
@@ -4512,7 +4868,7 @@ msgid "In-Reply-To"
 msgstr "Svar-På"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
-#: src/prefs_matcher.c:2220 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2221 src/quote_fmt.c:59
 msgid "References"
 msgstr "Referenser"
 
@@ -4520,18 +4876,19 @@ msgstr "Referenser"
 msgid "References:"
 msgstr "Referenser:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
-#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: 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/summaryview.c:464
 msgid "Subject"
 msgstr "Ämne"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
-#: src/summary_search.c:429
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/summary_search.c:435
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
 msgid "Comments"
 msgstr "Kommentarer"
 
@@ -4543,7 +4900,7 @@ msgstr "Kommando:"
 msgid "Keywords"
 msgstr "Nyckelord"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:711
 msgid "Keywords:"
 msgstr "Nyckelord:"
 
@@ -4620,7 +4977,7 @@ msgid "Received:"
 msgstr "Mottaget:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
-#: src/prefs_matcher.c:2219 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr "Diskussionsgrupper"
 
@@ -4644,10 +5001,10 @@ msgstr "Seen"
 msgid "Seen:"
 msgstr "Seen:"
 
-#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:642
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
-#: src/summaryview.c:2898
+#: 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/summaryview.c:2894
 msgid "Status"
 msgstr "Status"
 
@@ -4657,11 +5014,11 @@ msgstr "Status:"
 
 #: src/gtk/headers.h:38
 msgid "Face"
-msgstr "Ansikte"
+msgstr "Face"
 
 #: src/gtk/headers.h:38
 msgid "Face:"
-msgstr "Ansikte:"
+msgstr "Face:"
 
 #: src/gtk/headers.h:39
 msgid "Disposition-Notification-To"
@@ -4691,7 +5048,7 @@ msgstr "Användarprogram:"
 msgid "Content-Type"
 msgstr "Innehållstyp"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:338
 msgid "Content-Type:"
 msgstr "Innehållstyp:"
 
@@ -4719,7 +5076,7 @@ msgstr "Företräde"
 msgid "Precedence:"
 msgstr "Företräde:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4809,11 +5166,11 @@ msgstr "X-Status:"
 
 #: src/gtk/headers.h:59
 msgid "X-Face"
-msgstr "X-Ansikte"
+msgstr "X-Face"
 
 #: src/gtk/headers.h:59
 msgid "X-Face:"
-msgstr "X-Ansikte:"
+msgstr "X-Face:"
 
 #: src/gtk/headers.h:60
 msgid "X-No-Archive"
@@ -4847,150 +5204,150 @@ msgstr "Från, Till eller Ämne"
 msgid "From, To or Subject:"
 msgstr "Från, Till eller Ämne:"
 
-#: src/gtk/icon_legend.c:67
+#: src/gtk/icon_legend.c:66
 msgid "New message"
 msgstr "Nytt meddelande"
 
-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:67
 msgid "Unread message"
 msgstr "Oläst meddelande"
 
-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:68
 msgid "Message has been replied to"
 msgstr "Meddelande som har besvarats"
 
-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:69
 msgid "Message has been forwarded"
 msgstr "Meddelande som har vidarebefordrats"
 
-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded and replied to"
 msgstr "Meddelandet har blivit vidarebefordrat och besvarat"
 
-#: src/gtk/icon_legend.c:72
+#: src/gtk/icon_legend.c:71
 msgid "Message is in an ignored thread"
 msgstr "Meddelande är i en ignorerad tråd"
 
-#: src/gtk/icon_legend.c:73
+#: src/gtk/icon_legend.c:72
 msgid "Message is in a watched thread"
 msgstr "Meddelande är i en bevakad tråd"
 
-#: src/gtk/icon_legend.c:74
+#: src/gtk/icon_legend.c:73
 msgid "Message is spam"
 msgstr "Meddelande är skräp"
 
-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:75
 msgid "Message has attachment(s)"
 msgstr "Meddelande har bilaga(or)"
 
-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:76
 msgid "Digitally signed message"
 msgstr "Digitalt signerat meddelande"
 
-#: src/gtk/icon_legend.c:78
+#: src/gtk/icon_legend.c:77
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: src/gtk/icon_legend.c:79
+#: src/gtk/icon_legend.c:78
 msgid "Message is signed and has attachment(s)"
 msgstr "Meddelande är signerat och har bilaga(-or)"
 
-#: src/gtk/icon_legend.c:80
+#: src/gtk/icon_legend.c:79
 msgid "Message is encrypted and has attachment(s)"
 msgstr "Meddelande är krypterat och har bilaga(-or)"
 
-#: src/gtk/icon_legend.c:82
+#: src/gtk/icon_legend.c:81
 msgid "Marked message"
 msgstr "Markerat meddelande"
 
-#: src/gtk/icon_legend.c:83
+#: src/gtk/icon_legend.c:82
 msgid "Message is marked for deletion"
 msgstr "Meddelande är markerat för borttagning"
 
-#: src/gtk/icon_legend.c:84
+#: src/gtk/icon_legend.c:83
 msgid "Message is marked for moving"
 msgstr "Meddelande är markerat för att flyttas"
 
-#: src/gtk/icon_legend.c:85
+#: src/gtk/icon_legend.c:84
 msgid "Message is marked for copying"
 msgstr "Meddelande är markerat för kopiering"
 
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:86
 msgid "Locked message"
 msgstr "Låst meddelande"
 
-#: src/gtk/icon_legend.c:89
+#: src/gtk/icon_legend.c:88
 msgid "Folder (normal, opened)"
 msgstr "Mapp (normal, öppnad)"
 
-#: src/gtk/icon_legend.c:90
+#: src/gtk/icon_legend.c:89
 msgid "Folder with read messages hidden"
 msgstr "Mapp med lästa meddelanden gömda"
 
-#: src/gtk/icon_legend.c:91
+#: src/gtk/icon_legend.c:90
 msgid "Folder contains marked messages"
 msgstr "Mappen innehåller markerade meddelanden"
 
-#: src/gtk/icon_legend.c:92
-msgid "IMAP folder which contains sub-folders only"
-msgstr "IMAP-folder som innehåller undermappar endast"
+#: src/gtk/icon_legend.c:91
+msgid "IMAP folder which contains subfolders only"
+msgstr "IMAP-folder som endast innehåller undermappar"
 
-#: src/gtk/icon_legend.c:93
+#: src/gtk/icon_legend.c:92
 msgid "IMAP mailbox showing only subscribed folders"
 msgstr "IMAP-brevlåda visar endast prenumererade mappar"
 
-#: src/gtk/icon_legend.c:127
+#: src/gtk/icon_legend.c:126
 msgid "Icon Legend"
 msgstr "Ikonförklaring"
 
-#: src/gtk/icon_legend.c:146
+#: src/gtk/icon_legend.c:145
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
 "Följande ikoner används för att visa vilken status meddelanden och mappar "
 "har:"
 
-#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
+#: src/gtk/inputdialog.c:227 src/gtk/inputdialog.c:249
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Skriv in lösenord för %s på %s:"
 
-#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
-#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
+#: src/gtk/inputdialog.c:230 src/gtk/inputdialog.c:233
+#: src/gtk/inputdialog.c:252 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s:"
 msgstr "Skriv in lösenord för %s:"
 
-#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:258
 msgid "Input password:"
 msgstr "Skriv in lösenord:"
 
-#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
-#: src/gtk/inputdialog.c:278
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:265
+#: src/gtk/inputdialog.c:277
 msgid "Input password"
 msgstr "Skriv in lösenord"
 
-#: src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:267
 msgid "Remember password for this session"
 msgstr "Kom ihåg lösenord för denna session"
 
-#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:406
 msgid "Remember this"
 msgstr "Kom ihåg detta"
 
-#: src/gtk/logwindow.c:450
+#: src/gtk/logwindow.c:419
 msgid "_Go to last error"
 msgstr "_Gå till sista fel"
 
-#: src/gtk/logwindow.c:457
+#: src/gtk/logwindow.c:426
 msgid "Clear _Log"
 msgstr "Töm _Logg"
 
-#: src/gtk/menu.c:139
+#: src/gtk/menu.c:138
 msgid "Warning:"
 msgstr "Varning:"
 
-#: src/gtk/menu.c:140
+#: src/gtk/menu.c:139
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -5033,282 +5390,289 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
-#: src/plugins/address_keeper/address_keeper_prefs.c:273
-#: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:229
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:775
+#: src/plugins/address_keeper/address_keeper_prefs.c:280
+#: src/plugins/archive/archiver_prefs.c:105
+#: src/plugins/attachwarner/attachwarner_prefs.c:234
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
-#: src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:137
-#: src/plugins/libravatar/libravatar_prefs.c:562
+#: 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:398
-#: src/plugins/notification/notification_prefs.c:413
-#: src/plugins/notification/notification_prefs.c:432
-#: src/plugins/notification/notification_prefs.c:450
-#: src/plugins/notification/notification_prefs.c:468
-#: src/plugins/notification/notification_prefs.c:486
-#: src/plugins/notification/notification_prefs.c:504
-#: src/plugins/notification/notification_prefs.c:522
+#: 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/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:673
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
+#: src/plugins/spamassassin/spamassassin_gtk.c:665
+#: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Load..."
 msgstr "_Ladda..."
 
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:339
 msgid "_Unload"
 msgstr "Ta bort"
 
-#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/gtk/pluginwindow.c:376
+#: src/gtk/pluginwindow.c:378
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr "För mer information om insticksmoduler se %sClaws Mails webbplats%s."
 
-#: src/gtk/pluginwindow.c:417
+#: src/gtk/pluginwindow.c:419
 msgid "Click here to load one or more plugins"
 msgstr "Klicka här för att läsa in en eller flera insticksmoduler"
 
-#: src/gtk/pluginwindow.c:420
+#: src/gtk/pluginwindow.c:422
 msgid "Unload the selected plugin"
 msgstr "Glöm vald insticksmodul"
 
-#: src/gtk/pluginwindow.c:485
+#: src/gtk/pluginwindow.c:488
 msgid "Loaded plugins"
 msgstr "Inlästa insticksmoduler"
 
-#: src/gtk/prefswindow.c:640
+#: 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
+msgid "_Apply"
+msgstr "_Applicera"
+
+#: src/gtk/prefswindow.c:647
 msgid "Page Index"
 msgstr "Sidindex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Dölj"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:3721 src/prefs_account.c:3739 src/prefs_account.c:3757
-#: src/prefs_account.c:3775 src/prefs_account.c:3793 src/prefs_account.c:3811
-#: src/prefs_account.c:3830 src/prefs_account.c:3923 src/prefs_account.c:3941
-#: src/prefs_filtering_action.c:1380 src/prefs_filtering.c:398
-#: src/prefs_filtering.c:1884
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Konto"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:407
 msgid "all messages"
 msgstr "alla meddelanden"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:408
 msgid "messages whose age is greater than # days"
 msgstr "meddelanden som är äldre än # dagar"
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:409
 msgid "messages whose age is less than # days"
 msgstr "meddelanden som är yngre än # dagar"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:410
 msgid "messages whose age is greater than # hours"
 msgstr "meddelanden som är äldre än # timmar"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:411
 msgid "messages whose age is less than # hours"
 msgstr "meddelanden som är yngre än # timmar"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:412
 msgid "messages which contain S in the message body"
 msgstr "meddelanden som innehåller S i meddelandetexten"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:413
 msgid "messages which contain S in the whole message"
 msgstr "meddelanden som innehåller S i hela meddelandet"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:414
 msgid "messages carbon-copied to S"
 msgstr "meddelanden som skickats som kopia till S"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:415
 msgid "message is either To: or Cc: to S"
 msgstr "meddelande är antingen Till: eller Kopia: till S"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:416
 msgid "deleted messages"
 msgstr "borttagna meddelanden"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:417
 msgid "messages whose date is after requested date (time is optional)"
 msgstr "meddelanden vars datum är efter efterfrågat datum (tid är valfritt)"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:419
 msgid "messages whose date is before requested date (time is optional)"
 msgstr "meddelanden vars datum är före efterfrågat datum (tid är valfritt)"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:421
 msgid "messages which contain S in the Sender field"
 msgstr "meddelanden som innehåller S i avsändaren"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:422
 msgid "true if execute \"S\" succeeds"
 msgstr "sant om \"S\" gick bra att exekvera"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:423
 msgid "messages originating from user S"
 msgstr "meddelanden med avsändaren S"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:424
 msgid "forwarded messages"
 msgstr "vidarebefordrade meddelanden"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:425
 msgid "messages which have attachments"
 msgstr "meddelanden som har bifogade filer"
 
-#: src/gtk/quicksearch.c:491
+#: 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:492
+#: src/gtk/quicksearch.c:427
 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:493
+#: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "meddelanden som innehåller S i brevhuvudet Message-ID"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:429
 msgid "messages which contain S in In-Reply-To header"
 msgstr "meddelanden som innehåller S i brevhuvudet In-Reply-To"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:430
 msgid "messages which are marked with color #"
 msgstr "meddelanden markerade med färgen #"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:431
 msgid "locked messages"
 msgstr "låsta meddelanden"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:432
 msgid "messages which are in newsgroup S"
 msgstr "meddelanden som är i diskussionsgrupp S"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:433
 msgid "new messages"
 msgstr "nya meddelanden"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:434
 msgid "old messages"
 msgstr "gamla meddelanden"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:435
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "ofullständiga meddelanden (ofullständigt nerladdade)"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:436
 msgid "messages which you have replied to"
 msgstr "meddelanden som du har besvarat"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:437
 msgid "read messages"
 msgstr "lästa meddelanden"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:438
 msgid "messages which contain S in subject"
 msgstr "meddelanden som innehåller S i ämnesraden"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:439
 msgid "messages whose score is equal to # points"
 msgstr "meddelanden vars poäng är lika med # poäng"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:440
 msgid "messages whose score is greater than # points"
 msgstr "meddelanden vars poäng är mer än # poäng"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:441
 msgid "messages whose score is lower than # points"
 msgstr "meddelanden vars poäng är mindre än # poäng"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:442
 msgid "messages whose size is equal to # bytes"
 msgstr "meddelanden vars storlek är lika med # bytes"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:443
 msgid "messages whose size is greater than # bytes"
 msgstr "meddelanden vars storlek är större än # bytes"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:444
 msgid "messages whose size is smaller than # bytes"
 msgstr "meddelanden vars storlek är mindre än # bytes"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:445
 msgid "messages which have been sent to S"
 msgstr "meddelanden som är sända till S"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:446
 msgid "messages which tags contain S"
 msgstr "meddelanden som som har etiketter som innehåller S"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:447
 msgid "messages which have tag(s)"
 msgstr "meddelanden som har etikett(er)"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:448
 msgid "marked messages"
 msgstr "markerade meddelanden"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:449
 msgid "unread messages"
 msgstr "olästa meddelanden"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:450
 msgid "messages which contain S in References header"
 msgstr "meddelanden som innehåller S i referenshuvud"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:451
 #, 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:517
+#: 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:519
+#: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "logisk OCH operator"
 
-#: src/gtk/quicksearch.c:520
+#: src/gtk/quicksearch.c:455
 msgid "logical OR operator"
 msgstr "logisk ELLER operator"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:456
 msgid "logical NOT operator"
 msgstr "logisk ICKE operator"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:457
 msgid "case sensitive search"
 msgstr "gemen-/versalkänslig sökning"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:458
 msgid "match using regular expressions instead of substring search"
 msgstr ""
 "matcha med hjälp av reguljära uttryck istället för sökning av delsträng"
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:460
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
@@ -5316,11 +5680,11 @@ msgstr ""
 "alla filtreringsuttryck tillåts, men kan inte mixas genom logiska operatorer "
 "med uttrycken ovan"
 
-#: src/gtk/quicksearch.c:535 src/summary_search.c:462
+#: src/gtk/quicksearch.c:470 src/summary_search.c:465
 msgid "Extended Search"
 msgstr "Utökad sökning"
 
-#: src/gtk/quicksearch.c:536
+#: src/gtk/quicksearch.c:471
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5330,107 +5694,114 @@ msgstr ""
 "uppfylla för att matcha och visas i meddelandelistan.\n"
 "Följande symboler kan användas:"
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:588
 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:702
+#: src/gtk/quicksearch.c:872
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Från/Till/CC/Ämne/Etiketter"
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Rekursivt"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:896
 msgid "Sticky"
 msgstr "Klibbig"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:902
 msgid "Type-ahead"
 msgstr "Sök vid inmatning"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:908
 msgid "Run on select"
 msgstr "Kör vid markering"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
+#: src/gtk/quicksearch.c:1023 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
 msgid "Clear the current search"
 msgstr "Rensa nuvarande sökning"
 
-#: src/gtk/quicksearch.c:790 src/summary_search.c:413
+#: src/gtk/quicksearch.c:945 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "Redigera sökkriterie"
 
-#: src/gtk/quicksearch.c:799
-msgid "Information about extended symbols"
-msgstr "Information om utökade symboler"
-
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
+#: src/gtk/quicksearch.c:1021 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/ssl_manager.c:216
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:954
+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
 msgid "E_dit"
 msgstr "_Redigera"
 
-#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
-#: src/prefs_filtering.c:496 src/prefs_template.c:330
-msgid "C_lear"
-msgstr "Töm"
-
-#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:304
 #, c-format
 msgid "Correct%s"
 msgstr "Korrekt%s"
 
-#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
-#: src/ssl_manager.c:301 src/ssl_manager.c:305
+#: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
+#: src/ssl_manager.c:304 src/ssl_manager.c:308
 msgid " (expired)"
 msgstr " (utgått)"
 
-#: src/gtk/sslcertwindow.c:188
+#: src/gtk/sslcertwindow.c:186
 msgid "Owner"
 msgstr "Ägare"
 
-#: src/gtk/sslcertwindow.c:189
+#: src/gtk/sslcertwindow.c:187
 msgid "Signer"
 msgstr "Signerad av"
 
-#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
+#: src/gtk/sslcertwindow.c:194 src/gtk/sslcertwindow.c:233
 msgid "Name: "
 msgstr "Namn: "
 
-#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:207 src/gtk/sslcertwindow.c:246
 msgid "Organization: "
 msgstr "Organisation: "
 
-#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
+#: src/gtk/sslcertwindow.c:220 src/gtk/sslcertwindow.c:259
 msgid "Location: "
 msgstr "Plats: "
 
-#: src/gtk/sslcertwindow.c:244
+#: src/gtk/sslcertwindow.c:272
 msgid "Fingerprint: \n"
 msgstr "Nyckelfingeravtryck: \n"
 
-#: src/gtk/sslcertwindow.c:254
+#: src/gtk/sslcertwindow.c:288
 msgid "Signature status: "
 msgstr "Signaturstatus: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expired on: "
 msgstr "Förfaller den: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expires on: "
 msgstr "Förfaller den: "
 
-#: src/gtk/sslcertwindow.c:328
+#: src/gtk/sslcertwindow.c:373
 #, c-format
-msgid "SSL/TLS certificate for %s"
-msgstr "SSL/TLS-certifikat för %s"
+msgid "TLS certificate for %s"
+msgstr "TLS-certifikat för %s"
 
-#: src/gtk/sslcertwindow.c:344
+#: src/gtk/sslcertwindow.c:389
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5441,7 +5812,7 @@ msgstr ""
 "Det kan vara en illasinnad server som du ansluter till.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:409
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5450,39 +5821,39 @@ msgstr ""
 "Certifikatet för %s är okänt.\n"
 "%sVill du acceptera det?"
 
-#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
-#: src/gtk/sslcertwindow.c:488
+#: src/gtk/sslcertwindow.c:419 src/gtk/sslcertwindow.c:469
+#: src/gtk/sslcertwindow.c:533
 msgid "Correct"
 msgstr "Korrekt"
 
-#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
-#: src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:421 src/gtk/sslcertwindow.c:471
+#: src/gtk/sslcertwindow.c:535
 #, c-format
 msgid "Signature status: %s"
 msgstr "Signatur skapad %s"
 
-#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:429 src/gtk/sslcertwindow.c:479
 msgid "_View certificate"
 msgstr "_Visa certifikat"
 
-#: src/gtk/sslcertwindow.c:390
-msgid "SSL/TLS certificate is invalid"
-msgstr "SSL/TLS-certifikat är ogiltigt"
+#: src/gtk/sslcertwindow.c:435
+msgid "TLS certificate is invalid"
+msgstr "TLS-certifikat är ogiltigt"
 
-#: src/gtk/sslcertwindow.c:392
-msgid "SSL/TLS certificate is unknown"
-msgstr "SSL/TLS-certifikat är okänt"
+#: src/gtk/sslcertwindow.c:437
+msgid "TLS certificate is unknown"
+msgstr "TLS-certifikat är okänt"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
-#: src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:552
 msgid "_Cancel connection"
 msgstr "A_vbryt anslutning"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:552
 msgid "_Accept and save"
 msgstr "_Acceptera och spara"
 
-#: src/gtk/sslcertwindow.c:413
+#: src/gtk/sslcertwindow.c:458
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5491,27 +5862,27 @@ msgstr ""
 "Certifikatet för %s är utgånget.\n"
 "%sVill du fortsätta?"
 
-#: src/gtk/sslcertwindow.c:440
-msgid "SSL/TLS certificate is invalid and expired"
-msgstr "SSL/TLS-certifikatet är ogiltigt och utgånget"
+#: src/gtk/sslcertwindow.c:485
+msgid "TLS certificate is invalid and expired"
+msgstr "TLS-certifikatet är ogiltigt och utgånget"
 
-#: src/gtk/sslcertwindow.c:442
-msgid "SSL/TLS certificate is expired"
-msgstr "SSL/TLS-certifikat är utgånget"
+#: src/gtk/sslcertwindow.c:487
+msgid "TLS certificate is expired"
+msgstr "TLS-certifikat är utgånget"
 
-#: src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:490
 msgid "_Accept"
 msgstr "_Acceptera"
 
-#: src/gtk/sslcertwindow.c:465
+#: src/gtk/sslcertwindow.c:510
 msgid "New certificate:"
 msgstr "Nytt certifikat:"
 
-#: src/gtk/sslcertwindow.c:470
+#: src/gtk/sslcertwindow.c:515
 msgid "Known certificate:"
 msgstr "Känt certifikat:"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:522
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5520,43 +5891,42 @@ msgstr ""
 "Certifikat för %s har ändrats.\n"
 "%sVill du acceptera det ändå?"
 
-#: src/gtk/sslcertwindow.c:498
+#: src/gtk/sslcertwindow.c:543
 msgid "_View certificates"
 msgstr "_Visa certifikat"
 
-#: src/gtk/sslcertwindow.c:503
-msgid "SSL/TLS certificate changed and is invalid"
-msgstr "SSL/TLS-certifikatet är förändrat och ogiltigt"
+#: src/gtk/sslcertwindow.c:548
+msgid "TLS certificate changed and is invalid"
+msgstr "TLS-certifikatet är förändrat och ogiltigt"
 
-#: src/gtk/sslcertwindow.c:505
-msgid "SSL/TLS certificate changed"
-msgstr "SSL/TLS-certifikat förändrat"
+#: src/gtk/sslcertwindow.c:550
+msgid "TLS certificate changed"
+msgstr "TLS-certifikat förändrat"
 
-#: src/headerview.c:94
+#: src/headerview.c:95
 msgid "Tags:"
 msgstr "Etiketter:"
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
+#: src/headerview.c:193 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
-#: src/summaryview.c:3517 src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3494
+#: src/summaryview.c:3512 src/summaryview.c:3551
 msgid "(No From)"
 msgstr "(Ingen avsändare)"
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
+#: src/headerview.c:208 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
-#: src/summaryview.c:3571
+#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3563
+#: src/summaryview.c:3566
 msgid "(No Subject)"
 msgstr "(Inget ämne)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:100
 msgid "Error:"
 msgstr "Fel:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
-#: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Filnamn:"
 
@@ -5564,197 +5934,197 @@ msgstr "Filnamn:"
 msgid "Filesize:"
 msgstr "Filstorlek:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:364
 msgid "Load Image"
 msgstr "Ladda bild"
 
-#: src/imap.c:582
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "IMAP-förbindelse bruten\n"
 
-#: src/imap.c:627 src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639
-#: src/imap.c:643 src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:656
-#: src/imap.c:659 src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671
-#: src/imap.c:674 src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686
-#: src/imap.c:689 src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701
-#: src/imap.c:704 src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716
-#: src/imap.c:719 src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731
-#: src/imap.c:734 src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746
-#: src/imap.c:750 src/imap.c:754
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP-fel vid %s:"
 
-#: src/imap.c:627
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "autentiserad"
 
-#: src/imap.c:630
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "icke autentiserad"
 
-#: src/imap.c:633
+#: src/imap.c:636
 msgid "bad state"
 msgstr "dåligt tillstånd"
 
-#: src/imap.c:636
+#: src/imap.c:639
 msgid "stream error"
 msgstr "strömfel"
 
-#: src/imap.c:639
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "tolkningsfel (väldigt troligt följs inte RFS från servern)"
 
-#: src/imap.c:643
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "förbindelse vägrad"
 
-#: src/imap.c:646
+#: src/imap.c:649
 msgid "memory error"
 msgstr "minnesfel"
 
-#: src/imap.c:649
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "fatalt fel"
 
-#: src/imap.c:652
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "protokollfel (mycket troligt följer inte servern RFC-standarden)"
 
-#: src/imap.c:656
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "anslutning inte accepterad"
 
-#: src/imap.c:659
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "APPEND-fel"
 
-#: src/imap.c:662
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "NOOP-fel"
 
-#: src/imap.c:665
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "LOGOUT-fel"
 
-#: src/imap.c:668
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "CAPABILITY-fel"
 
-#: src/imap.c:671
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "CHECK-fel"
 
-#: src/imap.c:674
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "CLOSE-fel"
 
-#: src/imap.c:677
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "EXPUNGE-fel"
 
-#: src/imap.c:680
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "COPY-fel"
 
-#: src/imap.c:683
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "UID-fel"
 
-#: src/imap.c:686
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "CREATE-fel"
 
-#: src/imap.c:689
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "DELETE-fel"
 
-#: src/imap.c:692
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "EXAMINE-fel"
 
-#: src/imap.c:695
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "FETCH-fel"
 
-#: src/imap.c:698
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "UID FETCH-fel"
 
-#: src/imap.c:701
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "LIST-fel"
 
-#: src/imap.c:704
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "LOGIN-fel"
 
-#: src/imap.c:707
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "LSUB-fel"
 
-#: src/imap.c:710
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "RENAME-fel"
 
-#: src/imap.c:713
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "SEARCH-fel"
 
-#: src/imap.c:716
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "UID SEARCH-fel"
 
-#: src/imap.c:719
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "SELECT-fel"
 
-#: src/imap.c:722
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "STATUS-fel"
 
-#: src/imap.c:725
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "STORE-fel"
 
-#: src/imap.c:728
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "UID STORE-fel"
 
-#: src/imap.c:731
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE-fel"
 
-#: src/imap.c:734
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE-fel"
 
-#: src/imap.c:737
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "STARTTLS-fel"
 
-#: src/imap.c:740
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "INVAL-fel"
 
-#: src/imap.c:743
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "EXTENSION-fel"
 
-#: src/imap.c:746
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "SASL-fel"
 
-#: src/imap.c:750
-msgid "SSL/TLS error"
-msgstr "SSL/TLS-fel"
+#: src/imap.c:753
+msgid "TLS error"
+msgstr "TLS-fel"
 
-#: src/imap.c:754
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Okänt fel [%d]"
 
-#: src/imap.c:960
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -5766,7 +6136,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:966
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -5778,7 +6148,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:972
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -5790,7 +6160,7 @@ 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:978
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -5802,7 +6172,7 @@ msgstr ""
 "PLAIN-inloggning fungerar endast om libetpan har kompilerats med SASL-stöd "
 "samt PLAIN SASL-insticksmodulen är installerad."
 
-#: src/imap.c:984
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -5814,153 +6184,163 @@ msgstr ""
 "LOGIN-inloggning fungerar endast om libetpan har kompilerats med SASL-stöd "
 "samt LOGIN SASL-insticksmodulen är installerad."
 
-#: src/imap.c:991
+#: src/imap.c:1008
+msgid ""
+"\n"
+"\n"
+"OAuth2 error. Check and correct your OAuth2 account preferences."
+msgstr ""
+"\n"
+"\n"
+"OAuth2-fel. Kontrollera och korrigera dina kontoinställningar för OAuth2."
+
+#: src/imap.c:1014
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s"
 
-#: src/imap.c:995
+#: src/imap.c:1018
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Anslutning till %s misslyckades: inloggning avslogs, %s\n"
 
-#: src/imap.c:1013
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/imap.c:1020 src/imap.c:1023
+#: src/imap.c:1043 src/imap.c:1046
 #, 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:1053 src/imap.c:3725 src/imap.c:4384 src/imap.c:4478
-#: src/imap.c:4656 src/imap.c:5467
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 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:1163 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: src/imap.c:1164 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
-"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
-"not available in this build of Claws Mail. \n"
+"This connection is configured to be secured using TLS, but TLS is not "
+"available in this build of Claws Mail. \n"
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
-"Den här anslutningen är konfigurerad att vara säkrad med hjälp av SSL/TLS, "
-"men SSL/TLS är inte tillgängligt i det här bygget av Claws-Mail. \n"
+"Den här anslutningen är konfigurerad att vara säkrad med hjälp av TLS, men "
+"TLS är inte tillgängligt i det här bygget av Claws-Mail. \n"
 "\n"
 "Vill du fortsätta att ansluta till den här servern? Kommunikationen kommer "
 "inte vara säker."
 
-#: src/imap.c:1170 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1193 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:1179
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "Konto '%s': Ansluter till IMAP-server: %s:%d..."
 
-#: src/imap.c:1244
+#: src/imap.c:1267
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "Kan inte ansluta till IMAP-server: %s:%d"
 
-#: src/imap.c:1247
+#: src/imap.c:1270
 #, 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:1279 src/imap.c:4146
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "Kan inte starta STARTTLS-session.\n"
 
-#: src/imap.c:1348
+#: src/imap.c:1374
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "Kunde inte logga in på IMAP4-server %s.\n"
 
-#: src/imap.c:1351
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Kunde inte logga in på IMAP-server %s."
 
-#: src/imap.c:1779
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "Lägger till meddelanden..."
 
-#: src/imap.c:1984 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "Kopierar meddelanden..."
 
-#: src/imap.c:2510
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "Sökning misslyckades på grund av serverfel."
 
-#: src/imap.c:2594
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "kan inte sätta borttaget-flaggor\n"
 
-#: src/imap.c:2601 src/imap.c:5097
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: src/imap.c:2976
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "Letar efter icke prenumererade mappar i %s..."
 
-#: src/imap.c:2979
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "Letar efter undermappar till %s...."
 
-#: src/imap.c:3267
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST mislyckades\n"
 
-#: src/imap.c:3280
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3411
+#: src/imap.c:3439
 #, 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:3524
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:3803
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST misslyckades\n"
 
-#: src/imap.c:3888
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "Flaggar meddelande..."
 
-#: src/imap.c:3991
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: src/imap.c:4143
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Servern kräver STARTTLS för att logga in.\n"
 
-#: src/imap.c:4153
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Kan inte uppdatera egenskaper.\n"
 
-#: src/imap.c:4158
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5969,20 +6349,20 @@ msgstr ""
 "Anslutning till %s misslyckades: servern kräver STARTTLS, men Claws-Mail har "
 "kompilerats utan stöd för STARTTLS.\n"
 
-#: src/imap.c:4166
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Serverinloggningar är avaktiverade.\n"
 
-#: src/imap.c:4389
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "Hämtar meddelande..."
 
-#: src/imap.c:5090
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "kan inte sätta borttaget-flaggor: %d\n"
 
-#: src/imap.c:6125
+#: src/imap.c:6153
 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"
@@ -5994,24 +6374,24 @@ msgstr ""
 "\n"
 "Du behöver troligen installera libetpan och kompilera om Claws-Mail."
 
-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
+#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:60
 msgid "Create _new folder..."
 msgstr "Skapa _ny mapp..."
 
 #: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
-#: src/plugins/mailmbox/plugin_gtk.c:60
+#: src/plugins/mailmbox/plugin_gtk.c:61
 msgid "_Rename folder..."
 msgstr "Byt n_amn på mapp..."
 
-#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
+#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "M_ove folder..."
 msgstr "_Flytta mapp..."
 
-#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
+#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:63
 msgid "Cop_y folder..."
 msgstr "_Kopiera mapp..."
 
-#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
+#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
 #: src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "_Ta bort mapp..."
@@ -6032,20 +6412,20 @@ msgstr "Pren_umerationer"
 msgid "_Subscribe..."
 msgstr "_Prenumerera..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "Säg _upp prenumeration..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
-#: src/plugins/mailmbox/plugin_gtk.c:64
+#: src/plugins/mailmbox/plugin_gtk.c:65
 msgid "_Check for new messages"
 msgstr "Leta efter _nya meddelanden"
 
-#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:65
+#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:66
 msgid "C_heck for new folders"
 msgstr "L_eta efter nya mappar"
 
-#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:66
+#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "R_ebuild folder tree"
 msgstr "Uppdat_era mapplista"
 
@@ -6063,22 +6443,22 @@ msgstr ""
 "(om du vill skapa en mapp för att spara undermappar\n"
 "endast och inga meddelanden, lägg till '/' på slutet av namnet)"
 
-#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
-#: src/plugins/vcalendar/vcal_folder.c:2060
+#: 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
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Ange nytt namn för '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
-#: src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2061
+#: 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
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
-#: src/plugins/vcalendar/vcal_folder.c:2081
+#: 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
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6086,67 +6466,68 @@ msgstr ""
 "Mappen kunde inte döpas om.\n"
 "Det nya mappnamnet är inte tillåtet."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "Välj mapp att flytta mappen '%s' till"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 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/rssyl/rssyl_cb_menu.c:153
+#: 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
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"Alla mappar och meddelande under '%s' kommer att tas bort permanent. Det går "
-"inte att ångra operationen.\n"
+"Alla mappar och meddelande under '%s' kommer att tas bort permanent.\n"
+"Det går inte att ångra operationen.\n"
 "\n"
 "Vill du verkligen ta bort?"
 
-#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:172
-#: src/plugins/vcalendar/vcal_folder.c:2014
+#: 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
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen '%s'."
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:507
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "Vill du söka efter ej prenumererade undermappar till '%s'?"
 
-#: src/imap_gtk.c:509
+#: src/imap_gtk.c:510
 msgid "Search recursively"
 msgstr "Sök rekursivt"
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:515 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
-#: src/imap_gtk.c:515
+#: src/imap_gtk.c:516
 msgid "_Search"
 msgstr "_Sök"
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Välj en undermapp till %s att prenumerera på: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:689
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: src/imap_gtk.c:538 src/imap_gtk.c:540
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr "Allihop"
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6159,49 +6540,49 @@ msgstr ""
 "Om det finns nya mappar, skapade och prenumerade från en annan klient, "
 "använd \"Leta efter nya mappar\" i brevlådans rot-mapp."
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "Vill du %s i mappen '%s' ?"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr "prenumerera"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr "säg upp prenumeration"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
-#: src/prefs_folder_item.c:1593
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1590 src/prefs_folder_item.c:1618
+#: src/prefs_folder_item.c:1646
 msgid "Apply to subfolders"
 msgstr "Använd på undermappar"
 
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: src/imap_gtk.c:574 src/news_gtk.c:252
+#: src/imap_gtk.c:576 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "S_äg upp prenumeration"
 
-#: src/import.c:113 src/import.c:209
+#: src/import.c:112 src/import.c:206
 msgid "Import mbox file"
 msgstr "Importera mbox-fil"
 
-#: src/import.c:132
+#: src/import.c:131
 msgid "Locate the mbox file and specify the destination folder."
 msgstr "Specificera mbox-filen och destinationsmappen."
 
-#: src/import.c:149
+#: src/import.c:146
 msgid "Destination folder:"
 msgstr "Destinationsmapp:"
 
-#: src/import.c:204
+#: src/import.c:201
 msgid "Source mbox filename can't be left empty."
 msgstr "Mbox-filnamn kan inte vara tomt."
 
-#: src/import.c:209
+#: src/import.c:207
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6209,19 +6590,19 @@ msgstr ""
 "Destinationsmappen är inte vald.\n"
 "Vill du importer mbox-filen i Inbox-mappen?"
 
-#: src/import.c:231
+#: src/import.c:228
 msgid "Can't find the destination folder."
 msgstr "Kan inte hitta destinationsmappen."
 
-#: src/import.c:236
+#: src/import.c:233
 msgid "Importing mbox file..."
 msgstr "Importerar mbox-fil..."
 
-#: src/import.c:258
+#: src/import.c:255
 msgid "Select importing file"
 msgstr "Välj importfil"
 
-#: src/import.c:276
+#: src/import.c:273
 msgid "Select folder to import to"
 msgstr "Välj mapp att importera till"
 
@@ -6249,7 +6630,7 @@ msgstr "Ett addressboksnamn måste anges."
 msgid "LDIF file imported successfully."
 msgstr "LDIF fil framgångsrikt importerad."
 
-#: src/importldif.c:465
+#: src/importldif.c:467
 msgid "Select LDIF File"
 msgstr "Välj LDIF fil"
 
@@ -6259,43 +6640,43 @@ msgid ""
 "file data."
 msgstr "Ange namnet på adressbokenn som kommer skapas från data i LDIF-filen."
 
-#: src/importldif.c:556
+#: src/importldif.c:555
 msgid "File Name"
 msgstr "Filnamn"
 
-#: src/importldif.c:566
+#: src/importldif.c:565
 msgid "The full file specification of the LDIF file to import."
 msgstr "Hela sökvägen till LDIF-filen att importera."
 
-#: src/importldif.c:573
+#: src/importldif.c:571
 msgid "Select the LDIF file to import."
 msgstr "Välj LDIF-fil att importera."
 
-#: src/importldif.c:705
+#: src/importldif.c:702
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:466
+#: src/importldif.c:707 src/summaryview.c:462
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:716
+#: src/importldif.c:713
 msgid "LDIF Field Name"
 msgstr "LDIF-fältnamn"
 
-#: src/importldif.c:721
+#: src/importldif.c:718
 msgid "Attribute Name"
 msgstr "Attributnamn"
 
-#: src/importldif.c:740
+#: src/importldif.c:736
 msgid "LDIF Field"
 msgstr "LDIF-fält"
 
-#: src/importldif.c:752
+#: src/importldif.c:747
 msgid "Attribute"
 msgstr "Attribut"
 
-#: src/importldif.c:764
+#: src/importldif.c:758
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6312,35 +6693,35 @@ msgstr ""
 "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:779
+#: src/importldif.c:774
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "LDIF-fältet kan döpas om till Användarattributnamn."
 
-#: src/importldif.c:784
+#: src/importldif.c:777
 msgid "Select for Import"
 msgstr "Välj för import"
 
-#: src/importldif.c:789
+#: src/importldif.c:781
 msgid "Select the LDIF field for import into the address book."
 msgstr "Välj LDIF-fält att importera till adressboken."
 
-#: src/importldif.c:791
+#: src/importldif.c:783
 msgid " Modify "
 msgstr " Ändra "
 
-#: src/importldif.c:796
+#: src/importldif.c:787
 msgid "This button will update the list above with the data supplied."
 msgstr "Den här knappen kommer uppdatera listan ovan med det angivet data."
 
-#: src/importldif.c:870
+#: src/importldif.c:857
 msgid "Records Imported:"
 msgstr "Importerade poster :"
 
-#: src/importldif.c:902
+#: src/importldif.c:889
 msgid "Import LDIF file into Address Book"
 msgstr "Importera LDIF-fil till Addressbok"
 
-#: src/importldif.c:940
+#: src/importldif.c:927
 msgid "Proceed"
 msgstr "Fortsätt"
 
@@ -6352,11 +6733,11 @@ msgstr "Fel vid import av MUTT fil."
 msgid "Select MUTT File"
 msgstr "Välj MUTT fil"
 
-#: src/importmutt.c:203
+#: src/importmutt.c:202
 msgid "Import MUTT file into Address Book"
 msgstr "Impora MUTT-fil till Adressbok"
 
-#: src/importmutt.c:289 src/importpine.c:289
+#: src/importmutt.c:290 src/importpine.c:290
 msgid "Please select a file to import."
 msgstr "Vänligen välj en fil att importera."
 
@@ -6368,148 +6749,148 @@ msgstr "Fel vid import av Pine fil."
 msgid "Select Pine File"
 msgstr "Välj Pine Fil"
 
-#: src/importpine.c:202
+#: src/importpine.c:201
 msgid "Import Pine file into Address Book"
 msgstr "Impora Pine-fil till Adressbok"
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 "Claws Mail behöver vara uppkopplad mot ett nätverk för att kunna hämta e-"
 "post."
 
-#: src/inc.c:344
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s misslyckades\n"
 
-#: src/inc.c:476
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:534
+#: src/inc.c:537
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:689
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:698
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Färdig (%d meddelande (%s) mottaget)"
 msgstr[1] "Färdig (%d meddelanden (%s) mottagna)"
 
-#: src/inc.c:704
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Klart (inga nya meddelande)"
 
-#: src/inc.c:709
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Aut. misslyckades"
 
-#: src/inc.c:719 src/prefs_matcher.c:407 src/prefs_summaries.c:645
-#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6569
+#: 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
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Time out"
 
-#: src/inc.c:815
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Färdig (%d nytt meddelande)"
 msgstr[1] "Färdig (%d nya meddelanden)"
 
-#: src/inc.c:819
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Färdigt (inga nya meddelande)"
 
-#: src/inc.c:860
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:889
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Ansluter till POP3 server: %s:%d..."
 
-#: src/inc.c:923
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Kan inte ansluta till POP3-server: %s:%d"
 
-#: src/inc.c:927
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:1009
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Tar emot meddelanden från %s (%s) ..."
 
-#: src/inc.c:1015
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot antal nya meddelanden (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot antal nya meddelanden (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot antal nya meddelanden (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot storleken på meddelanden (LIST)..."
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:1059
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Tar emot (%d meddelande (%s) mottaget)"
 msgstr[1] "Tar emot (%d meddelanden (%s) mottagna)"
 
-#: src/inc.c:1227
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Anslutning till %s:%d misslyckades."
 
-#: src/inc.c:1232
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod vid behandling av e-post."
 
-#: src/inc.c:1238
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6518,37 +6899,37 @@ msgstr ""
 "Fel uppstod vid behandling av post:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1249
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Kan inte skriva till fil."
 
-#: src/inc.c:1254
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "Socket fel."
 
-#: src/inc.c:1257
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Socket-fel på anslutning till %s:%d."
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Anslutning avslutades av motstående värddator."
 
-#: src/inc.c:1265
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Anslutning till %s:%d avslutades av motstående värddator."
 
-#: src/inc.c:1270
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1274
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6557,11 +6938,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6570,7 +6951,7 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6578,46 +6959,46 @@ msgstr ""
 "Sessionen överskred tidsgränsen. Det kan vara möjligt att återställa genom "
 "att öka tidsgränsens värde i Egenskaper/Övrigt/Blandat."
 
-#: src/inc.c:1296
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Anslutning till %s:%d överskred tidsgränsen."
 
-#: src/inc.c:1334
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Införlivande avbröts\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1766
-#: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
+#: 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
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: src/inc.c:1639
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "timme"
 msgstr[1] "timmar"
 
-#: src/inc.c:1651
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sDu arbetar frånkopplad. Åsidosätta i %d %s?"
 
-#: src/inc.c:1657
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sDu arbetar frånkopplad. Åsidosätta?"
 
-#: src/inc.c:1664
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "Endast en gång"
 
@@ -6626,8 +7007,8 @@ msgstr "Endast en gång"
 msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
 msgstr "LDAP-fel (sök): efter attribut: '%s': %d (%s)\n"
 
-#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
-#: src/ldapupdate.c:1330
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1290
+#: src/ldapupdate.c:1331
 #, c-format
 msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
 msgstr "LDAP-fel (modifiera): för DN '%s': %d (%s)\n"
@@ -6650,11 +7031,11 @@ msgstr "LDAP (sökning): framgångsrik\n"
 msgid "LDAP error (search): %d (%s)\n"
 msgstr "LDAP-fel (sökning): %d (%s)\n"
 
-#: src/ldif.c:759
+#: src/ldif.c:763
 msgid "Nick Name"
 msgstr "Smeknamn"
 
-#: src/main.c:250
+#: src/main.c:253
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6663,7 +7044,7 @@ msgstr ""
 "Filen '%s' finns redan.\n"
 "Kan inte ska skapa mapp."
 
-#: src/main.c:380
+#: src/main.c:383
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6672,7 +7053,7 @@ msgstr ""
 "Konfiguration för %s hittad.\n"
 "Vill du migrera denna konfiguration?"
 
-#: src/main.c:382
+#: src/main.c:387
 #, c-format
 msgid ""
 "\n"
@@ -6685,11 +7066,11 @@ msgstr ""
 "Dina Sylpheed-filterregler kan konverteras av ett\n"
 "skript tillgängligt på %s."
 
-#: src/main.c:394
+#: src/main.c:400
 msgid "Keep old configuration"
 msgstr "Behåll gammal konfiguration"
 
-#: src/main.c:397
+#: src/main.c:403
 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 "
@@ -6699,31 +7080,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:405
+#: src/main.c:411
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:416
+#: src/main.c:422
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopierar konfiguration...Detta kan ta en stund..."
 
-#: src/main.c:425
+#: src/main.c:431
 msgid "Migration failed!"
 msgstr "Migrationen misslyckades!"
 
-#: src/main.c:434
+#: src/main.c:440
 msgid "Migrating configuration..."
 msgstr "Migrerar konfiguration..."
 
-#: src/main.c:1146
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread stöds inte av glib.\n"
-
-#: src/main.c:1166 src/main.c:1170 src/main.c:1174
+#: src/main.c:1194 src/main.c:1198 src/main.c:1202
 msgid "(or older)"
 msgstr "(eller äldre)"
 
-#: src/main.c:1515
+#: src/main.c:1540
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6742,7 +7119,7 @@ msgstr[1] ""
 "konfiguration för mer information:\n"
 "%s"
 
-#: src/main.c:1557
+#: src/main.c:1582
 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 "
@@ -6752,7 +7129,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:1563
+#: src/main.c:1588
 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 "
@@ -6762,76 +7139,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:1804
+#: src/main.c:1828
 msgid "Missing filename\n"
 msgstr "Saknar filnamn\n"
 
-#: src/main.c:1811
+#: src/main.c:1835
 msgid "Cannot open filename for reading\n"
 msgstr "Kan inte öppna filnamn för läsning\n"
 
-#: src/main.c:1822
+#: src/main.c:1846
 msgid "Malformed header\n"
 msgstr "Felaktigt brevhuvud\n"
 
-#: src/main.c:1829
+#: src/main.c:1853
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplicerat brevhuvud 'To:'\n"
 
-#: src/main.c:1840
+#: src/main.c:1864
 msgid "Missing required 'To:' header\n"
 msgstr "Nödvändigt brevhuvud 'To:' saknas\n"
 
-#: src/main.c:1866
+#: src/main.c:1888
 #, 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:1893 src/main.c:1956
+#: src/main.c:1917 src/main.c:1980
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Saknar fil-argument för alternativet %s"
 
-#: src/main.c:1915
+#: src/main.c:1939
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "Saknar eller tomt uri-argument för alternativet %s"
 
-#: src/main.c:1918
+#: src/main.c:1942
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Saknar uri-argument för alternativet %s"
 
-#: src/main.c:1951
+#: src/main.c:1975
 #, 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:2020
+#: src/main.c:2044
 #, 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:2023
+#: src/main.c:2047
 #, 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:2026
+#: src/main.c:2050
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Saknar frågeargument för alternativet %s"
 
-#: src/main.c:2042
+#: src/main.c:2066
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [VAL]...\n"
 
-#: src/main.c:2044
+#: src/main.c:2068
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]               öppna nytt meddelandefönster"
 
-#: src/main.c:2045
+#: src/main.c:2069
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6849,13 +7226,13 @@ msgstr ""
 "krävs) tills tom rad,\n"
 "                                   sedan meddelandetexten tills filslut."
 
-#: src/main.c:2050
+#: src/main.c:2074
 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:2051
+#: src/main.c:2075
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6864,7 +7241,7 @@ msgstr ""
 "  --attach fil1 [fil2]...          öppna nytt meddelandefönster med valda "
 "filer bifogade"
 
-#: src/main.c:2054
+#: src/main.c:2078
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6873,24 +7250,24 @@ msgstr ""
 "  --insert fil1 [fil2]...          öppna nytt meddelandefönster med valda "
 "filer infogade"
 
-#: src/main.c:2057
+#: src/main.c:2081
 msgid "  --receive              receive new messages"
 msgstr "  --receive                        ta emot nya meddelanden"
 
-#: src/main.c:2058
+#: src/main.c:2082
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all                    ta emot nya meddelanden från alla konton"
 
-#: src/main.c:2059
+#: src/main.c:2083
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving               avbryt mottagande av meddelanden"
 
-#: src/main.c:2060
+#: src/main.c:2084
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending                 avbryt skickande av meddelanden"
 
-#: src/main.c:2061
+#: src/main.c:2085
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6910,29 +7287,29 @@ msgstr ""
 "                                   rekursivt: falskt om arg. börjar på 0, n, "
 "N, f eller F"
 
-#: src/main.c:2068
+#: src/main.c:2092
 msgid "  --send                 send all queued messages"
 msgstr "  --send                           skicka alla köade meddelanden"
 
-#: src/main.c:2069
+#: src/main.c:2093
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...               visa totalt antal meddelanden"
 
-#: src/main.c:2070
+#: src/main.c:2094
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [mapp]...          visa status för varje mapp"
 
-#: src/main.c:2072
+#: src/main.c:2096
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics                     visa sessionsstatistik"
 
-#: src/main.c:2073
+#: src/main.c:2097
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics               återställ sessionsstatistik"
 
-#: src/main.c:2074
+#: src/main.c:2098
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -6942,48 +7319,46 @@ msgstr ""
 "                                   mapp är ett mapp-id som 'mapp/"
 "underkatalog', en file://-uri eller en absolut sökväg"
 
-#: src/main.c:2076
+#: src/main.c:2100
 msgid "  --online               switch to online mode"
 msgstr "  --online                         byt till anslutet läge"
 
-#: src/main.c:2077
+#: src/main.c:2101
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                        byt till frånkopplat läge"
 
-#: src/main.c:2078
+#: src/main.c:2102
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q                 avsluta Claws Mail"
 
-#: src/main.c:2079
+#: src/main.c:2103
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d                       avlusningsläge"
 
-#: src/main.c:2080
+#: src/main.c:2104
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug                   växla avlusningsläge"
 
-#: src/main.c:2081
-msgid "  --help -h              display this help and exit"
-msgstr "  --help -h                        visa denna hjälp och avsluta"
+#: src/main.c:2105
+msgid "  --help -h              display this help"
+msgstr "  --help -h                        visa denna hjälp"
 
-#: src/main.c:2082
-msgid "  --version -v           output version information and exit"
-msgstr ""
-"  --version -v                     skriv ut versionsinformation och avsluta"
+#: src/main.c:2106
+msgid "  --version -v           output version information"
+msgstr "  --version -v                     skriv ut versionsinformation"
 
-#: src/main.c:2083
+#: src/main.c:2107
 msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
+"  --version-full -V      output version and built-in features information"
 msgstr ""
-"  --version-full -V                skriv ut versionsinformation och inbyggd "
-"funktionsinformation och avsluta"
+"  --version-full -V                skriv ut versionsinformation och "
+"information om inbyggda funktioner"
 
-#: src/main.c:2084
+#: src/main.c:2108
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                     skriv ut konfigurationsmapp"
 
-#: src/main.c:2085
+#: src/main.c:2109
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -6991,7 +7366,7 @@ msgstr ""
 "  --alternate-config-dir mapp\n"
 "                                   använd angiven konfigurationsmapp"
 
-#: src/main.c:2087
+#: src/main.c:2111
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -6999,869 +7374,874 @@ msgstr ""
 "  --geometry -geometry [BxH][+X+Y]\n"
 "                                   sätt geometri för huvudfönster"
 
-#: src/main.c:2104
+#: src/main.c:2128
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Saknar mappargument för alternativet %s"
 
-#: src/main.c:2112
+#: src/main.c:2136
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Saknar geometriargument för alternativet %s"
 
-#: src/main.c:2123
+#: src/main.c:2147
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Saknar mappargument för alternativet %s"
 
-#: src/main.c:2156 src/main.c:2159
+#: src/main.c:2180 src/main.c:2183
 #, c-format
 msgid "Unknown option %s"
 msgstr "Okänt alternativ [%s]"
 
-#: src/main.c:2175
+#: src/main.c:2199
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Behandlar (%s)..."
 
-#: src/main.c:2178
+#: src/main.c:2202
 msgid "top level folder"
 msgstr "toppnivåmapp"
 
-#: src/main.c:2260
+#: src/main.c:2284
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:2261
+#: src/main.c:2285
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några osända meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:3019
+#: src/main.c:3052
 msgid "NetworkManager: network is online.\n"
 msgstr "Nätverkshanteraren: nätverket är online.\n"
 
-#: src/main.c:3025
+#: src/main.c:3058
 msgid "NetworkManager: network is offline.\n"
 msgstr "Nätverkshanteraren: nätverket är frånkopplat.\n"
 
-#: src/mainwindow.c:522 src/messageview.c:211
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Arkiv"
 
-#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "_Visa"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "_Konfiguration"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Ändra sorteringsordning för brevlådor..."
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "_Importera mbox-fil..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "Exportera _valda till mbox-fil..."
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "_Töm alla papperskorgar"
 
-#: src/mainwindow.c:545 src/messageview.c:220
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Spara e-post som..."
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Spara del som..."
 
-#: src/mainwindow.c:549 src/messageview.c:222
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Sidinstä_llningar..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Markera _tråd"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Leta i aktuellt meddelande..."
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "S_nabbsök"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "Visa eller g_öm"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "Verk_tygsraden"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Välj visade _kolumner"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "I _mapplista..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "I m_eddelandelista..."
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "La_yout"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "_Sortera"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "_Attrahera efter ämne"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "E_xpandera alla trådar"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:585 src/messageview.c:234
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Gå till"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Föregående meddelande"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Nästa meddelande"
 
-#: src/mainwindow.c:589 src/messageview.c:238
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Fö_regående olästa meddelande"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "N_ästa olästa meddelanden"
 
-#: src/mainwindow.c:592 src/messageview.c:241
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Föregående n_ytt meddelande"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "N_ästa nya meddelande"
 
-#: src/mainwindow.c:595 src/messageview.c:244
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Föregående _markerade meddelande"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:598 src/messageview.c:247
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Föregående _färgade meddelande"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Nästa fär_gade meddelande"
 
-#: src/mainwindow.c:601 src/messageview.c:250
-msgid "Previous opened message"
+#: src/mainwindow.c:594
+msgid "Previously opened message"
 msgstr "Föregående öppnat meddelande"
 
-#: src/mainwindow.c:602 src/messageview.c:251
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Nästa öppnade meddelande"
 
-#: src/mainwindow.c:604 src/messageview.c:253
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Överliggande meddelande"
 
-#: src/mainwindow.c:606 src/messageview.c:255
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Nästa olästa _mapp"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "Mapp..."
 
-#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Nästa del"
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Föregående del"
 
-#: src/mainwindow.c:613 src/messageview.c:260
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Meddelanderullning"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Föregående rad"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Nästa rad"
 
-#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Föregående sida"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Nästa sida"
 
-#: src/mainwindow.c:635 src/messageview.c:282
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Avkoda"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "_Öppna i nytt fönster"
 
-#: src/mainwindow.c:643 src/messageview.c:289
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Meddel_andets källkod"
 
-#: src/mainwindow.c:645 src/messageview.c:290
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "Meddelandedel"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Visa som text"
 
-#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Öppna"
 
-#: src/mainwindow.c:649 src/messageview.c:294
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "Öppna _med..."
 
-#: src/mainwindow.c:653 src/messageview.c:297
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citat"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "_Uppdatera sammanfatting"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "Ta emot"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "Hämta från a_ktuellt konto"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "Hämta från _alla konton"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "Avbryt hämtnin_g"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "_Skicka köade meddelanden"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "Skriv e-postmeddela_nde"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "Nytt diskussionsgruppsmeddelande"
 
-#: src/mainwindow.c:672 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
+#: src/mainwindow.c:665 src/messageview.c:304
+#: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "Sva_ra"
 
-#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "Svara t_ill"
 
-#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "Sänd_lista"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "Följ upp och svara till"
 
-#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
-#: src/toolbar.c:2449
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
+#: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
-#: src/toolbar.c:2450
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
+#: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "_Vidarebefordra som bilaga"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
-#: src/toolbar.c:2451
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
+#: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "Omdiri_gera"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "Sänd_lista"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Skicka"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "_Hjälp"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "Visa arkiv"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "Kontakta ägare"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "_Flytta..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Fly_tta till papperskorg"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "Ta _bort..."
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Flytt_a tråd till papperskorg"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "Ta bort trå_d"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Avbryt ett diskussionsgruppmeddelande"
 
-#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "_Markera"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "_Avmarkera"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "Markera som _läst"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "Markera som _oläst"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Markera alla som lästa i mappen"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Markera alla som olästa i mappen"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
-#: src/toolbar.c:503
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorera tråd"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Sluta ignorera tråd"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
-#: src/toolbar.c:504
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Bevaka tråd"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Sluta bevaka tråd"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "Markera som _skräppost"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Markera som ej skräppost"
 
-#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Lås"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Lås upp"
 
-#: src/mainwindow.c:732 src/summaryview.c:441
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Färgm_arkera"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "_Etiketter"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "_Omredigera"
 
-#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "Kontrollera signatur"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Lägg till avsändaren till adressbo_ken"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "_Samla in adress(er)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Från nuvarande m_app..."
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Från markerade _meddelanden..."
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "_Filtrera alla meddelanden i mapp"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "Filtrera _markerade meddelanden"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "Kör behandlingsregler för mappen"
 
-#: src/mainwindow.c:755 src/messageview.c:320
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Skapa filter_regel"
 
-#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
+#: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automatiskt"
 
-#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
+#: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Efter _Från"
 
-#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
-#: src/messageview.c:323 src/messageview.c:329
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
+#: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Efter _Till"
 
-#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
-#: src/messageview.c:330
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
+#: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Efter _Ämne"
 
-#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
+#: src/messageview.c:333
+msgid "By S_ender"
+msgstr "Efter Avsändare"
+
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "Skapa behandlingsregel"
 
-#: src/mainwindow.c:768 src/messageview.c:333
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Lista _webbadresser..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "L_eta efter nya meddelanden i alla mappar"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "I markerad mapp"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "I alla mappar"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "Kör"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "Utplåna"
 
-#: src/mainwindow.c:785
-msgid "SSL/TLS cer_tificates"
-msgstr "SSL/TLS-certifikat"
+#: src/mainwindow.c:780
+msgid "TLS cer_tificates"
+msgstr "TLS-cer_tifikat"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Filtreringslo_gg"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Nätverks_logg"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Debug-_logg"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "Gl_öm alla sessionslösenord"
 
-#: src/mainwindow.c:796
-msgid "Forget _master passphrase"
+#: src/mainwindow.c:791
+msgid "Forget _primary passphrase"
 msgstr "Glöm huvudlösenord"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "_Ändra aktuellt konto"
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "Egen_skaper för aktuellt konto..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "Skapa _nytt konto..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "R_edigera konton..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "E_genskaper..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "Förbehandla..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "Efterbehandla..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Filtrering..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "Mallar..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Aktiviteter..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "Etiketter..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "Insticksmoduler..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ med frågor från användare"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "Ikonförk_laring"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Sätt som standardklient"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "Frånkopplat _läge"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "Men_yrad"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "_Meddelandevy"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "_Statusrad"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Kolumnrubriker"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "Tr_ådvy"
 
-#: src/mainwindow.c:837 src/prefs_summaries.c:667
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Dölj lästa trådar"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "_Dölj lästa meddelanden"
 
-#: src/mainwindow.c:839 src/prefs_summaries.c:673
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Dölj borttagna meddelanden"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
-#: src/mainwindow.c:841 src/messageview.c:345
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Visa alla brev_huvuden"
 
-#: src/mainwindow.c:842 src/messageview.c:346
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Ko_llapsa alla"
 
-#: src/mainwindow.c:843 src/messageview.c:347
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Kollapsa från nivå _2"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Kollapsa från nivå _3"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Text under ikoner"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Text bredvid ikoner"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Endast _ikoner"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Endast _text"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "_Tre kolumner"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "_Brett meddelande"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "Bred meddelandelista"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "Liten skärm"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "Efter _Nummer"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "Efter storlek"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "Efter _datum"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Efter Datum för tråd"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Efter _ämne"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "Efter färgmarkering"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Efter etikett"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "Efter _markering"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "Efter _status"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "Efter _bilaga"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Efter poäng"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Efter låst"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "S_ortera inte"
 
-#: src/mainwindow.c:884 src/prefs_summaries.c:654
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Stigande"
 
-#: src/mainwindow.c:885 src/prefs_summaries.c:655
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Fallande"
 
-#: src/mainwindow.c:927 src/messageview.c:390
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "Upptäck _automatiskt"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
-msgid "Apply tags..."
-msgstr "Lägg till etiketter..."
+#: src/mainwindow.c:1297 src/summaryview.c:6489
+msgid "Modify tags..."
+msgstr "Redigera etiketter..."
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Något/några fel inträffade. Klicka här för att se loggen."
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Du är ansluten. Klicka här för att koppla ifrån"
 
-#: src/mainwindow.c:1979
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "Du är inte ansluten. Klicka här för att ansluta"
 
-#: src/mainwindow.c:1993
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Välj konto"
 
-#: src/mainwindow.c:2020 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Nätverkslogg"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Felsökningslogg för filtrerings- och behandllingsregler"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "filtreringslogg aktiverad\n"
 
-#: src/mainwindow.c:2045 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "filtreringslogg avaktiverad\n"
 
-#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
-#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
+#: src/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:1087
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:2897 src/mainwindow.c:2902
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelande från papperskorgar?"
 
-#: src/mainwindow.c:2898
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "A_vsluta inte"
 
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:2930
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7875,18 +8255,18 @@ msgstr ""
 "Om platsen för en existerande brevlåda specificeras, kommer den\n"
 "att genomsökas automatiskt."
 
-#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Brevlådan '%s' finns redan."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:742
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7895,170 +8275,174 @@ msgstr ""
 "Skapande av brevlåda misslyckades.\n"
 "Några filer finns kanske redan, eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:3415
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Inte tillåtet att skicka"
 
-#: src/mainwindow.c:3997
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Fel vid import av mbox-fil."
 
-#: src/mainwindow.c:4006 src/mainwindow.c:4015
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Export till mbox misslyckades."
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Avsluta Claws Mail?"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4007
+msgid "_Quit"
+msgstr "Avsluta"
+
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Vill du synkronisera dina mappar nu?"
 
-#: src/mainwindow.c:4259
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Synkronisera"
 
-#: src/mainwindow.c:4737
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/mainwindow.c:4747
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Inga meddelandedubbletter funna i vald mapp.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4709
 #, 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:4757
+#: src/mainwindow.c:4713
 #, 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:4795
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Tar bort meddelandedubbletter i alla mappar..."
 
-#: src/mainwindow.c:4801
+#: src/mainwindow.c:4757
 #, 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:4806
+#: src/mainwindow.c:4762
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Inga meddelandedubbletter hittade i %d mappar.\n"
 
-#: src/mainwindow.c:4968 src/messageview.c:2634
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Välj mapp att gå till"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Behandlingsregler att applicera före mappregler"
 
-#: src/mainwindow.c:5077
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Behandlingsregler att applicera efter mappregler"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Filtreringskonfiguration"
 
-#: src/mainwindow.c:5200
+#: src/mainwindow.c:5156
 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:5259
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws-Mail har blivit registrerad som standardklient."
 
-#: src/mainwindow.c:5261
+#: src/mainwindow.c:5249
 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:5275 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Avsöker mapp %s%c%s..."
 
-#: src/mainwindow.c:5419
+#: src/mainwindow.c:5407
 #, 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:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
-#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
+#: 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
 #, c-format
 msgid "%s header"
 msgstr "%s brevhuvud"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header"
 msgstr "brevhuvud"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "header line"
 msgstr "brevhuvudsrad"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "body line"
 msgstr "meddelandetextrad"
 
-#: src/matcher.c:228
+#: src/matcher.c:227
 msgid "tag"
 msgstr "etikett"
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
-#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: 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:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 msgid "Case insensitive"
 msgstr "Gemen-/versalokänslig"
 
-#: src/matcher.c:1903
+#: src/matcher.c:1902
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "kollar om meddelande matchar [ %s ]\n"
 
-#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
+#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
 msgid "message matches\n"
 msgstr "meddelande matchar\n"
 
-#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
+#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
 msgid "message does not match\n"
 msgstr "meddelande matchar inte\n"
 
-#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
-#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
+#: 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
 msgid "(none)"
 msgstr "(ingen)"
 
-#: src/mbox.c:98
+#: src/mbox.c:94
 #, c-format
 msgid ""
 "Could not stat mbox file:\n"
@@ -8067,7 +8451,7 @@ msgstr ""
 "Kunde inte ta status på mbox-fil:\n"
 "%s\n"
 
-#: src/mbox.c:104
+#: src/mbox.c:100
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -8076,26 +8460,26 @@ msgstr ""
 "Kan inte öppna mbox-fil:\n"
 "%s\n"
 
-#: src/mbox.c:142
+#: src/mbox.c:138
 #, c-format
 msgid "Importing from mbox... (%ld MB imported)"
 msgid_plural "Importing from mbox... (%ld MB imported)"
 msgstr[0] "Importerar från mbox... (%ld MB importerad)"
 msgstr[1] "Importerar från mbox... (%ld MB importerade)"
 
-#: src/mbox.c:550
+#: src/mbox.c:547
 msgid "Overwrite mbox file"
 msgstr "Skriv mbox-fil"
 
-#: src/mbox.c:551
+#: src/mbox.c:548
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Filen finns redan. Vill du skriva över den?"
 
-#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
+#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: src/mbox.c:561
+#: src/mbox.c:558
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -8104,7 +8488,7 @@ msgstr ""
 "Kunde inte skapa mbox-fil:\n"
 "%s\n"
 
-#: src/mbox.c:565
+#: src/mbox.c:562
 msgid "Exporting to mbox..."
 msgstr "Exporterar till mbox-fil..."
 
@@ -8116,11 +8500,11 @@ msgstr "Leta i aktuellt meddelande"
 msgid "Find text:"
 msgstr "Hitta text:"
 
-#: src/message_search.c:318 src/summary_search.c:779
+#: src/message_search.c:318 src/summary_search.c:783
 msgid "Search failed"
 msgstr "Sökning misslyckades"
 
-#: src/message_search.c:319 src/summary_search.c:780
+#: src/message_search.c:319 src/summary_search.c:784
 msgid "Search string not found."
 msgstr "Söksträng ej funnen."
 
@@ -8132,23 +8516,27 @@ msgstr "Början av meddelande nådd; fortsätt från slutet?"
 msgid "End of message reached; continue from beginning?"
 msgstr "Slutet av meddelande nått; fortsätt från början?"
 
-#: src/message_search.c:334 src/summary_search.c:791
+#: src/message_search.c:334 src/summary_search.c:796
 msgid "Search finished"
 msgstr "Sökning färdig"
 
-#: src/messageview.c:300 src/textview.c:249
+#: src/messageview.c:251
+msgid "Previous opened message"
+msgstr "Föregående öppnat meddelande"
+
+#: src/messageview.c:301 src/textview.c:248
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
+#: src/messageview.c:717 src/messageview.c:1442 src/messageview.c:1593
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Meddelandevy"
 
-#: src/messageview.c:845
+#: src/messageview.c:848
 msgid "<No Return-Path found>"
 msgstr "<Igen Returväg hittad>"
 
-#: src/messageview.c:852
+#: src/messageview.c:855
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8163,34 +8551,34 @@ msgstr ""
 "Returväg: %s\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:859
+#: src/messageview.c:862
 msgid "_Don't Send"
 msgstr "_Skicka inte"
 
-#: src/messageview.c:1366
+#: src/messageview.c:1372
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Hämtar meddelande (%s)..."
 
-#: src/messageview.c:1402 src/procmime.c:957
+#: src/messageview.c:1408 src/procmime.c:1026
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunde inte dekryptera: %s"
 
-#: src/messageview.c:1483 src/messageview.c:1491
+#: src/messageview.c:1489 src/messageview.c:1497
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "Meddelandet följer inte MIME-standarden. Det kan återges fel."
 
-#: src/messageview.c:1868
+#: src/messageview.c:1881
 #, c-format
 msgid "Show all %s."
 msgstr "Visa alla %s."
 
-#: src/messageview.c:1870
+#: src/messageview.c:1883
 msgid "Only the first megabyte of text is shown."
 msgstr "Endast den första megabyten text visas."
 
-#: src/messageview.c:1901
+#: src/messageview.c:1914
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8198,19 +8586,19 @@ msgstr ""
 "Du har fått ett läskvitto för detta meddelande : det har visats för "
 "mottagaren."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1917
 msgid "You asked for a return receipt in this message."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1910
+#: src/messageview.c:1923
 msgid "This message asks for a return receipt."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1924
 msgid "Send receipt"
 msgstr "Skicka kvitto"
 
-#: src/messageview.c:1954
+#: src/messageview.c:1967
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8218,7 +8606,7 @@ msgstr ""
 "Detta meddelande har tagits emot delvis,\n"
 "och har tagits bort från servern."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1973
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8227,15 +8615,15 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s."
 
-#: src/messageview.c:1964 src/messageview.c:1986
+#: src/messageview.c:1977 src/messageview.c:1999
 msgid "Mark for download"
 msgstr "Markera för nerladdning"
 
-#: src/messageview.c:1965 src/messageview.c:1977
+#: src/messageview.c:1978 src/messageview.c:1990
 msgid "Mark for deletion"
 msgstr "Markera för borttagning"
 
-#: src/messageview.c:1970
+#: src/messageview.c:1983
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8244,12 +8632,12 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att laddas ner."
 
-#: src/messageview.c:1975 src/messageview.c:1988
-#: src/prefs_filtering_action.c:176 src/toolbar.c:506
+#: src/messageview.c:1988 src/messageview.c:2001
+#: src/prefs_filtering_action.c:174 src/toolbar.c:516
 msgid "Unmark"
 msgstr "Avmarkera"
 
-#: src/messageview.c:1981
+#: src/messageview.c:1994
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8258,7 +8646,7 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att tas bort."
 
-#: src/messageview.c:2058
+#: src/messageview.c:2071
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8272,20 +8660,15 @@ msgstr ""
 "officiellt adresserat till dig.\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:2066 src/messageview.c:2074
+#: src/messageview.c:2079 src/messageview.c:2086
 msgid "Return Receipt Notification"
 msgstr "Återsänd läskvittounderrättelse"
 
-#: src/messageview.c:2068 src/messageview.c:2079
-#: src/plugins/rssyl/rssyl_feed_props.c:496
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2080 src/messageview.c:2091
 msgid "_Send Notification"
 msgstr "_Skicka Underrättelse"
 
-#: src/messageview.c:2075
+#: src/messageview.c:2087
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8297,11 +8680,11 @@ msgstr ""
 "Vänligen välj vilket av kontona som du vill använda för att skicka "
 "läskvittot:"
 
-#: src/messageview.c:2171 src/messageview.c:2190
+#: src/messageview.c:2183 src/messageview.c:2202
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan inte skriva ut: meddelandet innehåller ingen text."
 
-#: src/messageview.c:2944
+#: src/messageview.c:2958
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8309,7 +8692,7 @@ msgstr ""
 "\n"
 "  Det finns inga meddelanden i denna mapp"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2966
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8317,7 +8700,7 @@ msgstr ""
 "\n"
 "  Meddelandet har blivit borttaget"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8325,8 +8708,8 @@ msgstr ""
 "\n"
 "  Meddelandet har flyttats till papperskorgen eller till en annan mapp"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "Ett fel uppstod vid inlärning.\n"
 
@@ -8334,15 +8717,15 @@ msgstr "Ett fel uppstod vid inlärning.\n"
 msgid "Moving messages..."
 msgstr "Flyttar meddelanden..."
 
-#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:836
 msgid "Deleting messages..."
 msgstr "Tar bort meddelanden..."
 
-#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
+#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:68
 msgid "Remove _mailbox..."
 msgstr "Ta bort brev_låda..."
 
-#: src/mh_gtk.c:222
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8353,7 +8736,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:373 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8362,11 +8745,11 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan '%s'?\n"
 "(Meddelanden kommer INTE att tas bort från disken)"
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr "/Ta bort brevlåda"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "Öppna"
 
@@ -8374,7 +8757,7 @@ msgstr "Öppna"
 msgid "Open _with..."
 msgstr "Öppna _med..."
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:172
+#: src/mimeview.c:225 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "Kopiera"
 
@@ -8398,32 +8781,32 @@ msgstr "_Spara alla..."
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
-#: src/mimeview.c:1068
+#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
+#: src/mimeview.c:1072
 msgid "View full information"
 msgstr "Visa fullständig information"
 
-#: src/mimeview.c:1074
+#: src/mimeview.c:1079
 msgid "Check again"
 msgstr "Kontrollera igen"
 
-#: src/mimeview.c:1086
+#: src/mimeview.c:1092
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klicka på ikonen för att markera den."
 
-#: src/mimeview.c:1088
+#: src/mimeview.c:1094
 #, 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:1098
+#: src/mimeview.c:1101
 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:1100
+#: src/mimeview.c:1103
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8431,87 +8814,99 @@ 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:1345
+#: src/mimeview.c:1110
+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
+#, 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
 msgid "Checking signature..."
 msgstr "Kontrollerar signatur..."
 
-#: src/mimeview.c:1386
+#: src/mimeview.c:1286
 msgid "Go back to email"
 msgstr "Gå tillbaka till e-post"
 
-#: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
-#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Kan inte spara del av flerdelsmeddelande: %s"
 
-#: src/mimeview.c:1894
+#: src/mimeview.c:1815
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Skriv över befintlig fil '%s'?"
 
-#: src/mimeview.c:1918
+#: src/mimeview.c:1840
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"An error has occurred while saving message part %d. Do you want to cancel "
+"saving or ignore error and continue?"
 msgstr ""
 "Ett fel har uppstått under sparande av meddelandedel #%d. Vill du avbryta "
-"operationen, eller hoppa över felet och fortsätta?"
+"sparande, eller ignorera fel och fortsätta?"
 
-#: src/mimeview.c:1921
-msgid "Error saving all message parts"
-msgstr "Fel vid sparande av alla meddelandedelar"
+#: src/mimeview.c:1843
+msgid "Error saving message part"
+msgstr "Fel vid sparande av meddelandedel"
 
-#: src/mimeview.c:1922
-msgid "Skip"
-msgstr "Hoppa över"
+#: src/mimeview.c:1844
+msgid "Ignore"
+msgstr "Ignorera"
 
-#: src/mimeview.c:1922
-msgid "Skip all"
-msgstr "Hoppa över alla"
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "Ignorera alla"
 
-#: src/mimeview.c:1932
+#: src/mimeview.c:1856
 #, 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:1940
+#: src/mimeview.c:1868
 #, 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:1945
+#: src/mimeview.c:1873
 #, 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:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Välj destinationsmapp"
 
-#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' är inte en mapp."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
+#: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Spara som"
 
-#: src/mimeview.c:2232 src/mimeview.c:2239
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Öppna med"
 
-#: src/mimeview.c:2233 src/mimeview.c:2240
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8520,7 +8915,7 @@ msgstr ""
 "Skriv in kommandoraden för att öppna filen:\n"
 "('%s' kommer att ersättas med filnamnet)"
 
-#: src/mimeview.c:2335
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8531,11 +8926,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Kör icke betrodd binär?"
 
-#: src/mimeview.c:2344
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8547,22 +8942,22 @@ msgstr ""
 "\n"
 "Vill du köra denna fil?"
 
-#: src/mimeview.c:2348
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "Kör binär"
 
-#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2652 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2788
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Storlek:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -8612,34 +9007,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr "kunde inte välja grupp: %s\n"
 
-#: src/news.c:1067 src/news.c:1253
+#: src/news.c:1068 src/news.c:1254
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "kunde inte ställa in grupp: %s\n"
 
-#: src/news.c:1076
+#: src/news.c:1077
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt artikelomfång: %d - %d\n"
 
-#: src/news.c:1154 src/news.c:1181 src/news.c:1208
+#: src/news.c:1155 src/news.c:1182 src/news.c:1209
 msgid "couldn't get xhdr\n"
 msgstr "kunde inte hämta xhdr\n"
 
-#: src/news.c:1246
+#: src/news.c:1247
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "hämtar xover %d - %d i %s...\n"
 
-#: src/news.c:1261
+#: src/news.c:1262
 msgid "couldn't get xover\n"
 msgstr "kunde inte hämta xover\n"
 
-#: src/news.c:1278
+#: src/news.c:1279
 msgid "invalid xover line\n"
 msgstr "felaktig xover-rad\n"
 
-#: src/news.c:1480
+#: src/news.c:1481
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8669,55 +9064,134 @@ msgstr "Verkligen avsluta prenumeration på diskussionsgrupp '%s'?"
 msgid "Unsubscribe newsgroup"
 msgstr "Avsluta prenumeration på diskussionsgrupp"
 
-#: src/news_gtk.c:291
+#: src/news_gtk.c:294
 msgid "Rename newsgroup folder"
 msgstr "Byt namn på diskussionsgrupps-mapp"
 
+#: src/oauth2.c:241
+msgid "OAuth2 missing authorization code\n"
+msgstr "OAuth2 saknar behörighetskod\n"
+
+#: src/oauth2.c:247 src/oauth2.c:388
+msgid "OAuth2 connection error\n"
+msgstr "OAuth2-anslutningsfel\n"
+
+#: src/oauth2.c:257 src/oauth2.c:397
+msgid "OAuth2 TLS connection error\n"
+msgstr "OAuth2 TLS-anslutningsfel\n"
+
+#: src/oauth2.c:336 src/oauth2.c:470
+msgid "OAuth2 access token obtained\n"
+msgstr "OAuth2 åtkomstpolett mottagen\n"
+
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
+msgid "OAuth2 access token not obtained\n"
+msgstr "OAuth2 åtkomstpolett icke mottagen\n"
+
+#: src/oauth2.c:345
+msgid "OAuth2 refresh token obtained\n"
+msgstr "OAuth2 uppdateringspolett mottagen\n"
+
+#: src/oauth2.c:347
+msgid "OAuth2 refresh token not obtained\n"
+msgstr "OAuth2 uppdateringspolett inte mottagen\n"
+
+#: src/oauth2.c:479
+msgid "OAuth2 replacement refresh token provided\n"
+msgstr "OAuth2 ersättningsuppdateringspolett tillhandahålls\n"
+
+#: src/oauth2.c:481
+msgid "OAuth2 replacement refresh token not provided\n"
+msgstr "OAuth2 ersättningsuppdateringspolett tillhandahålls inte\n"
+
+#: src/oauth2.c:512
+msgid "OAuth2 socket write error\n"
+msgstr "OAuth2 socket-skrivfel\n"
+
+#: src/oauth2.c:534
+msgid "OAuth2 socket timeout error\n"
+msgstr "OAuth2 socket timeout-fel\n"
+
+#: src/oauth2.c:628
+msgid "OAuth2 access token still fresh\n"
+msgstr "OAuth2 åtkomstpolett fortfarande färsk\n"
+
+#: src/oauth2.c:635
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr "OAuth2 mottar åtkomstpolett med hjälp av uppdateringspolett\n"
+
+#: src/oauth2.c:639
+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
+msgid "OAuth2 access and refresh token updated\n"
+msgstr "OAuth2 åtkomst- och uppdateringspolett uppdaterade\n"
+
+#: src/oauth2.c:688
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr "OAuth2 original: %s\n"
+
+#: src/oauth2.c:689
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr "Oauth2 kodad: %s\n"
+
+#: src/oauth2.c:690
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+"OAuth2 avkodad: %s\n"
+"\n"
+
 #: src/password.c:128 src/password.c:129
-msgid "Input master passphrase"
+msgid "Input primary passphrase"
 msgstr "Mata in huvudlösenord"
 
 #: src/password.c:141
-msgid "Incorrect master passphrase."
+msgid "Incorrect primary passphrase."
 msgstr "Felaktigt huvudlösenord."
 
-#: src/password_gtk.c:67
+#: src/password_gtk.c:66
 msgid "New passphrases do not match, try again."
 msgstr "Nya lösenordsfraser är inte lika, försök igen."
 
-#: src/password_gtk.c:80
-msgid "Incorrect old master passphrase entered, try again."
+#: src/password_gtk.c:79
+msgid "Incorrect old primary passphrase entered, try again."
 msgstr "Felaktigt gammalt huvudlösenord inmatat, försök igen."
 
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
-msgstr "Ändrar huvudlösenord"
+#: src/password_gtk.c:143
+msgid "Changing primary passphrase"
+msgstr "Ändrar primärt lösenord"
 
-#: src/password_gtk.c:165
+#: src/password_gtk.c:164
 msgid ""
-"If a master passphrase is currently active, it\n"
+"If a primary passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
 "Om ett huvudlösenord är aktivt för närvarande, behöver\n"
 "det matas in nu."
 
-#: src/password_gtk.c:175
+#: src/password_gtk.c:174
 msgid "Old passphrase:"
 msgstr "Gammalt lösenord:"
 
-#: src/password_gtk.c:191
+#: src/password_gtk.c:188
 msgid "New passphrase:"
 msgstr "Nytt lösenord:"
 
-#: src/password_gtk.c:202
+#: src/password_gtk.c:199
 msgid "Confirm passphrase:"
 msgstr "Bekräfta lösenord:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:53
+#: src/plugins/acpi_notifier/acpi_notifier.c:54
 msgid "Acpi Notifier"
 msgstr "ACPI Meddelande"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:70
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8725,7 +9199,7 @@ msgstr ""
 "Säkerställ att kernel-modulen 'acerhk' är laddad.\n"
 "Du kan hämta den på http://www.cakey.de/acerhk/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8733,19 +9207,19 @@ msgstr ""
 "Säkerställ att kernel-modulen 'acer_acpi' är laddad.\n"
 "Du kan hämta den på http://code.google.com/p/aceracpi/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "Säkerställ att kernel-modulen 'asus_laptop' är laddad."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "Kontrollera att kärnmodulen 'asus_acpi' är laddad."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "Kontrollera att kärnmodulen 'ibm_acpi' är laddad."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:77
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8753,78 +9227,79 @@ msgstr ""
 "Kontrollera att du har apanelc installerat.\n"
 "Du kan hämta det på http://apanel.sourceforge.net/"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:209
-#: src/plugins/acpi_notifier/acpi_notifier.c:215
-#: src/plugins/acpi_notifier/acpi_notifier.c:427
+#: 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 "Kontrollfil finns inte."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:299
 msgid " : no new or unread mail"
 msgstr " : ingen ny eller oläst post"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:300
 msgid " : unread mail"
 msgstr " : oläst post"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:301
 msgid " : new mail"
 msgstr " : ny post"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:311
-#: src/plugins/acpi_notifier/acpi_notifier.c:317
-#: src/plugins/acpi_notifier/acpi_notifier.c:323
+#: src/plugins/acpi_notifier/acpi_notifier.c:303
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
 msgid "off"
 msgstr "av"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:313
-#: src/plugins/acpi_notifier/acpi_notifier.c:319
-#: src/plugins/acpi_notifier/acpi_notifier.c:325
+#: 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 "blinkar"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-#: src/plugins/acpi_notifier/acpi_notifier.c:327
+#: 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 "på"
 
+#: src/plugins/acpi_notifier/acpi_notifier.c:340
 #: src/plugins/acpi_notifier/acpi_notifier.c:349
-#: src/plugins/acpi_notifier/acpi_notifier.c:358
-#: src/plugins/acpi_notifier/acpi_notifier.c:373
+#: src/plugins/acpi_notifier/acpi_notifier.c:364
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:388
+#: src/plugins/acpi_notifier/acpi_notifier.c:379
 msgid "ACPI type: "
 msgstr "ACPI typ: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:397
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI file: "
 msgstr "ACPI fil: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:408
+#: src/plugins/acpi_notifier/acpi_notifier.c:399
 msgid "values - On: "
 msgstr "värde - På: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:413
+#: src/plugins/acpi_notifier/acpi_notifier.c:404
 msgid " - Off: "
 msgstr " - Av: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:435
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
 msgid "Blink when user interaction is required"
 msgstr "Blinka när användarinteraktion krävs"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:869
+#: src/plugins/acpi_notifier/acpi_notifier.c:852
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Denna insticksmodul hanterar olika ACPI post LEDs."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:890
+#: src/plugins/acpi_notifier/acpi_notifier.c:873
 msgid "Laptop LED"
 msgstr "Laptop LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
 #: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/keyword_warner/keyword_warner.c:230
 msgid "Failed to register check before send hook"
 msgstr ""
 "Misslyckades att registrera kopplingspunkt för registerkontroll innan sänd"
@@ -8835,49 +9310,49 @@ msgstr "Behåller alla mottagaradresser i en mapp i adressboken."
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:274
+#: src/plugins/address_keeper/address_keeper_prefs.c:281
 msgid "Address Keeper"
 msgstr "Adress Keeper"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:108
+#: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Address book location"
 msgstr "Plats för Adressboken"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:113
+#: src/plugins/address_keeper/address_keeper_prefs.c:116
 msgid "Keep to folder"
 msgstr "Behåll till mapp"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:124
 msgid "Address book path where addresses are kept"
 msgstr "Sökväg till adressboken där adresser behålls"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:123
+#: src/plugins/address_keeper/address_keeper_prefs.c:126
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
-#: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:466
-#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
-#: src/prefs_matcher.c:690
+#: src/plugins/bsfilter/bsfilter_gtk.c:200
+#: src/plugins/spamassassin/spamassassin_gtk.c:458
+#: src/prefs_filtering_action.c:548 src/prefs_filtering_action.c:555
+#: src/prefs_matcher.c:688
 msgid "Select..."
 msgstr "Välj ..."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:139
+#: src/plugins/address_keeper/address_keeper_prefs.c:142
 msgid "Fields to keep addresses from"
 msgstr "Fält att behålla adresser från"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:147
-#: src/plugins/address_keeper/address_keeper_prefs.c:161
-#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#: src/plugins/address_keeper/address_keeper_prefs.c:150
+#: src/plugins/address_keeper/address_keeper_prefs.c:164
+#: src/plugins/address_keeper/address_keeper_prefs.c:178
 #, c-format
 msgctxt "address keeper: %s stands for a header name"
 msgid "Keep addresses which appear in '%s' headers"
 msgstr "Behåll adresser som finns i '%s'-brevhuvuden"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:185
+#: src/plugins/address_keeper/address_keeper_prefs.c:188
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr "Exkludera adresser som matchar följande reguljära uttryck (en per rad)"
 
-#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:106
 msgid "Mail Archiver"
 msgstr "E-postarkiverare"
 
@@ -9084,17 +9559,17 @@ msgstr "Komprimeringsnivå"
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
-#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
+#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:534
+#: src/prefs_folder_item.c:1242 src/prefs_folder_item.c:1273
 msgid "Yes"
 msgstr "Ja"
 
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
-#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
-#: src/prefs_summaries.c:409
+#: 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
 msgid "No"
 msgstr "Inga"
 
@@ -9111,7 +9586,7 @@ msgid "Delete selected files"
 msgstr "Ta bort valda filer"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1330
+#: src/plugins/archive/archiver_gtk.c:1327
 msgid "Select mails before"
 msgstr "Välj e-post före"
 
@@ -9119,105 +9594,105 @@ msgstr "Välj e-post före"
 msgid "Select folder to archive"
 msgstr "Välj mapp att arkivera"
 
-#: src/plugins/archive/archiver_gtk.c:942
+#: src/plugins/archive/archiver_gtk.c:941
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 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:990
+#: src/plugins/archive/archiver_gtk.c:987
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld av %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:1040
 msgid "Create Archive"
 msgstr "Skapa Arkiv"
 
-#: src/plugins/archive/archiver_gtk.c:1058
+#: src/plugins/archive/archiver_gtk.c:1055
 msgid "Enter Archiver arguments"
 msgstr "Mata in Arkiverarens användarargument"
 
-#: src/plugins/archive/archiver_gtk.c:1072
+#: src/plugins/archive/archiver_gtk.c:1069
 msgid "Folder to archive"
 msgstr "Mapp att arkivera"
 
-#: src/plugins/archive/archiver_gtk.c:1079
+#: src/plugins/archive/archiver_gtk.c:1076
 msgid "Folder which is the root of the archive"
 msgstr "Mapp som är rooten på arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1081
 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:1090
+#: src/plugins/archive/archiver_gtk.c:1087
 msgid "Name for archive"
 msgstr "Namn på arkiv"
 
-#: src/plugins/archive/archiver_gtk.c:1096
+#: src/plugins/archive/archiver_gtk.c:1093
 msgid "Archive location and name"
 msgstr "Plats och namn för arkivet"
 
-#: src/plugins/archive/archiver_gtk.c:1098
-#: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:494
+#: src/plugins/archive/archiver_gtk.c:1095
+#: 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:1101
+#: src/plugins/archive/archiver_gtk.c:1098
 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:1103
+#: src/plugins/archive/archiver_gtk.c:1100
 msgid "Choose compression"
 msgstr "Välj kompression"
 
-#: src/plugins/archive/archiver_gtk.c:1115
-#: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1127
-#: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1140
-#: src/plugins/archive/archiver_gtk.c:1148
-#: src/plugins/archive/archiver_gtk.c:1156
-#: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1168
-#: src/plugins/archive/archiver_gtk.c:1176
-#: src/plugins/archive/archiver_gtk.c:1183
+#: 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
 #, 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:1232
+#: src/plugins/archive/archiver_gtk.c:1229
 msgid "Choose format"
 msgstr "Välj format"
 
-#: src/plugins/archive/archiver_gtk.c:1244
-#: src/plugins/archive/archiver_gtk.c:1250
-#: src/plugins/archive/archiver_gtk.c:1256
-#: src/plugins/archive/archiver_gtk.c:1262
+#: 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
 #, 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:1282
+#: src/plugins/archive/archiver_gtk.c:1279
 msgid "Miscellaneous options"
 msgstr "Blandade inställningar"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1288
 msgid "_Recursive"
 msgstr "_Rekursivt"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1292
 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:1297
+#: src/plugins/archive/archiver_gtk.c:1294
 msgid "_MD5sum"
 msgstr "_MD5sum"
 
-#: src/plugins/archive/archiver_gtk.c:1301
+#: src/plugins/archive/archiver_gtk.c:1298
 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"
@@ -9228,12 +9703,12 @@ 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:1305
+#: src/plugins/archive/archiver_gtk.c:1302
 msgid "R_ename"
 msgstr "Byt n_amn"
 
-#: src/plugins/archive/archiver_gtk.c:1309
-#: src/plugins/archive/archiver_prefs.c:427
+#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
@@ -9244,7 +9719,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:1317
+#: src/plugins/archive/archiver_gtk.c:1314
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9252,11 +9727,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:1321
+#: src/plugins/archive/archiver_gtk.c:1318
 msgid "Selection options"
 msgstr "Markeringsalternativ"
 
-#: src/plugins/archive/archiver_gtk.c:1337
+#: src/plugins/archive/archiver_gtk.c:1334
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9264,59 +9739,59 @@ msgstr ""
 "Välj e-post för ett specifikt datum\n"
 "Datumet måste vara giltigt ISO-8601 [ÅÅÅÅ-MM-DD]"
 
-#: src/plugins/archive/archiver_prefs.c:217
+#: src/plugins/archive/archiver_prefs.c:216
 msgid "Default save folder"
 msgstr "Standard sparningsmapp"
 
-#: src/plugins/archive/archiver_prefs.c:229
+#: src/plugins/archive/archiver_prefs.c:228
 msgid "Click this button to select the default location for saving archives"
 msgstr "Klicka på denna knapp för att välja standardplats för att spara arkiv"
 
-#: src/plugins/archive/archiver_prefs.c:238
+#: src/plugins/archive/archiver_prefs.c:237
 msgid "Default compression"
 msgstr "Standardkompression"
 
-#: src/plugins/archive/archiver_prefs.c:249
-#: src/plugins/archive/archiver_prefs.c:255
-#: src/plugins/archive/archiver_prefs.c:261
-#: src/plugins/archive/archiver_prefs.c:268
-#: src/plugins/archive/archiver_prefs.c:274
-#: src/plugins/archive/archiver_prefs.c:282
-#: src/plugins/archive/archiver_prefs.c:290
-#: src/plugins/archive/archiver_prefs.c:296
-#: src/plugins/archive/archiver_prefs.c:302
-#: src/plugins/archive/archiver_prefs.c:310
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:248
+#: src/plugins/archive/archiver_prefs.c:254
+#: src/plugins/archive/archiver_prefs.c:260
+#: src/plugins/archive/archiver_prefs.c:267
+#: src/plugins/archive/archiver_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:281
+#: src/plugins/archive/archiver_prefs.c:289
+#: src/plugins/archive/archiver_prefs.c:295
+#: src/plugins/archive/archiver_prefs.c:301
+#: src/plugins/archive/archiver_prefs.c:309
+#: src/plugins/archive/archiver_prefs.c:316
 #, c-format
 msgid "Choose this option to use %s compression by default"
 msgstr "Välj detta alternativ för att använda %s-komprimering som standard"
 
-#: src/plugins/archive/archiver_prefs.c:363
+#: src/plugins/archive/archiver_prefs.c:362
 msgid "Default format"
 msgstr "Standardformat"
 
-#: src/plugins/archive/archiver_prefs.c:374
-#: src/plugins/archive/archiver_prefs.c:380
-#: src/plugins/archive/archiver_prefs.c:386
-#: src/plugins/archive/archiver_prefs.c:392
+#: src/plugins/archive/archiver_prefs.c:373
+#: src/plugins/archive/archiver_prefs.c:379
+#: src/plugins/archive/archiver_prefs.c:385
+#: src/plugins/archive/archiver_prefs.c:391
 #, c-format
 msgid "Choose this option to use the %s as format by default"
 msgstr "Välj detta alternativ för att använda %s som standardformat"
 
-#: src/plugins/archive/archiver_prefs.c:409
+#: src/plugins/archive/archiver_prefs.c:408
 msgid "Default miscellaneous options"
 msgstr "Diverse standardinställningar"
 
-#: src/plugins/archive/archiver_prefs.c:418
+#: src/plugins/archive/archiver_prefs.c:417
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr ""
 "Välj detta alternativ för att inkludera undermappar i arkivet som standard"
 
-#: src/plugins/archive/archiver_prefs.c:419
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "MD5sum"
 msgstr "MD5sum"
 
-#: src/plugins/archive/archiver_prefs.c:421
+#: src/plugins/archive/archiver_prefs.c:420
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9327,26 +9802,29 @@ msgstr ""
 "arkivet som standard.\n"
 "Observera att detta dramatiskt ökar tiden det tar att skapa arkivet"
 
-#: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:771
+#: src/plugins/archive/archiver_prefs.c:424
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/plugins/archive/archiver_prefs.c:433
+#: src/plugins/archive/archiver_prefs.c:432
 msgid "Choose this option to delete mails after archiving"
 msgstr "Välj detta alternativ för att ta bort mail efter arkivering"
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "Filnamn"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Ta bort bilagor"
 
 #: src/plugins/att_remover/att_remover.c:363
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:643
-#: src/prefs_summary_column.c:79 src/summaryview.c:2882
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "Bilaga"
 
@@ -9406,7 +9884,7 @@ msgstr ""
 msgid "Attachment handling"
 msgstr "Bilagehantering"
 
-#: src/plugins/attachwarner/attachwarner.c:210
+#: src/plugins/attachwarner/attachwarner.c:211
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9419,14 +9897,14 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/attachwarner/attachwarner.c:217
 msgid "Attachment warning"
 msgstr "Bilagevarning"
 
-#: src/plugins/attachwarner/attachwarner.c:245
 #: src/plugins/attachwarner/attachwarner.c:282
 #: src/plugins/attachwarner/attachwarner.c:334
-msgid "Attach warner"
+#: src/plugins/attachwarner/attachwarner_prefs.c:235
+msgid "AttachWarner"
 msgstr "Bilagevarnare"
 
 #: src/plugins/attachwarner/attachwarner.c:292
@@ -9442,22 +9920,28 @@ msgid "attach"
 msgstr "bifoga"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-msgid "One of the following regular expressions is matched (one per line)"
-msgstr "Ett av följande reguljära uttryck matchar (en per rad)"
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:83
+msgid ""
+"Warn when one of the following regular expressions is matched (one per line)"
+msgstr "Varna när ett av följande reguljära uttryck matchar (ett per rad)"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:87
+#: src/plugins/attachwarner/attachwarner_prefs.c:88
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:88
 msgid "Expressions are case sensitive"
 msgstr "Uttryck är skiftlägeskänsliga"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:93
+#: src/plugins/attachwarner/attachwarner_prefs.c:95
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:95
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr "Skiftlägeskänslig vid matching av reguljära uttryck i listan"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:115
+#: src/plugins/attachwarner/attachwarner_prefs.c:117
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:117
 msgid "Lines starting with quotation marks"
 msgstr "Rader som börjar med citattecken"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:122
+#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:125
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
@@ -9467,22 +9951,26 @@ msgstr ""
 "att citattecken som är gjorda för hand inte kan skiljas från citat som har "
 "genererats genom att svara."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/attachwarner/attachwarner_prefs.c:130
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:130
 msgid "Forwarded or redirected messages"
 msgstr "Vidarebefordrade eller omdirigerade meddelanden"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:132
+#: src/plugins/attachwarner/attachwarner_prefs.c:138
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 "Kontrollera inte efter saknade bilagor vid vidarebefordran och "
 "omdirigeringar av meddelanden"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:141
+#: src/prefs_msg_colors.c:305
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:142
+#: src/plugins/attachwarner/attachwarner_prefs.c:148
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:148
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9490,49 +9978,42 @@ msgstr ""
 "Exkludera rader från den första signatur-separatorn och framåt vid kontroll "
 "av dom reguljära uttrycken ovan"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:148
-msgid "Warn when"
-msgstr "Varna när"
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:152
-msgid "Excluding"
-msgstr "Exkluderande"
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
-msgid "Attach Warner"
-msgstr "Bilagevarnare"
+#: src/plugins/attachwarner/attachwarner_prefs.c:157
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:157
+msgid "Exclude"
+msgstr "Exkludera"
 
-#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter.c:80
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter.c:106
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 #: src/plugins/bogofilter/bogofilter_gtk.c:331
 #: src/plugins/bogofilter/bogofilter_gtk.c:408
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/bsfilter/bsfilter.c:104 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_gtk.c:462
-#: src/plugins/spamassassin/spamassassin_gtk.c:511
-#: src/plugins/spamassassin/spamassassin_gtk.c:638 src/prefs_matcher.c:686
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
-#: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
+#: src/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
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1658 src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1673 src/prefs_matcher.c:1675 src/prefs_matcher.c:2586
 #: src/prefs_matcher.c:2590
 msgid "Any"
 msgstr "Någon"
 
-#: src/plugins/bogofilter/bogofilter.c:457
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: hämtar meddelandetext..."
 
-#: src/plugins/bogofilter/bogofilter.c:470
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: filtrerar meddelanden..."
 
-#: src/plugins/bogofilter/bogofilter.c:586
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9544,7 +10025,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:593
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9558,7 +10039,7 @@ 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:486
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "Inlärning misslyckades; `%s` avslutade med status %d."
@@ -9604,39 +10085,39 @@ msgstr ""
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:643
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
+#: src/plugins/spamassassin/spamassassin.c:647
 msgid "Spam detection"
 msgstr "Skräppost"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:644
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:648
 msgid "Spam learning"
 msgstr "Skräppostinlärning"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
-#: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:419
+#: src/plugins/bsfilter/bsfilter_gtk.c:142
+#: src/plugins/spamassassin/spamassassin_gtk.c:411
 msgid "Process messages on receiving"
 msgstr "Behandla meddelanden vid mottagning"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
-#: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/plugins/bsfilter/bsfilter_gtk.c:150
+#: src/plugins/spamassassin/spamassassin_gtk.c:369
 msgid "Maximum size"
 msgstr "Maximal storlek"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
-#: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:386
+#: src/plugins/bsfilter/bsfilter_gtk.c:159
+#: src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Messages larger than this will not be checked"
 msgstr "Meddelanden större än så här kommer inte kontrolleras"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
-#: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1616
-msgid "KB"
-msgstr "KB"
+#: src/plugins/bsfilter/bsfilter_gtk.c:162
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+msgid "KiB"
+msgstr "KiB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
@@ -9651,15 +10132,15 @@ msgid "Only mark as spam"
 msgstr "Markera endast som skräp"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
-#: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:435
+#: src/plugins/bsfilter/bsfilter_gtk.c:178
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr "Mapp för att spara skräppost. Lämna tom för att använda papperskorgen."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
-#: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/bsfilter/bsfilter_gtk.c:184
+#: src/plugins/spamassassin/spamassassin_gtk.c:433
 msgid "Click this button to select a folder for storing spam"
 msgstr "Klicka på denna knapp för att välja mapp för att spara skräppost"
 
@@ -9688,14 +10169,14 @@ msgid "Only done for messages in MH folders"
 msgstr "Görs bara för meddelanden i MH-mappar"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:456
+#: src/plugins/bsfilter/bsfilter_gtk.c:190
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Whitelist senders found in address book/folder"
 msgstr "Vitlista avsändare från adressbok/-mapp"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
-#: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:460
+#: src/plugins/bsfilter/bsfilter_gtk.c:194
+#: src/plugins/spamassassin/spamassassin_gtk.c:452
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9704,13 +10185,13 @@ msgstr ""
 "mappen även om de anses vara skräppost"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:470
+#: src/plugins/bsfilter/bsfilter_gtk.c:204
+#: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr "Klicka på denna knapp för att välja bok eller mapp i adressboken"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
-#: src/plugins/bsfilter/bsfilter_gtk.c:207
+#: src/plugins/bsfilter/bsfilter_gtk.c:206
 msgid "Learn whitelisted emails as ham"
 msgstr "Lär in vitlistad e-post som icke-skräp"
 
@@ -9731,24 +10212,24 @@ msgid "Path to bogofilter executable"
 msgstr "Sökväg till bogofilters exekverbara fil"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
-#: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:448
+#: src/plugins/bsfilter/bsfilter_gtk.c:231
+#: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid "Mark spam as read"
 msgstr "Markera skräppost som lästa"
 
-#: src/plugins/bsfilter/bsfilter.c:82 src/plugins/bsfilter/bsfilter_gtk.c:401
+#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:273
+#: src/plugins/bsfilter/bsfilter.c:271
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: hämtar meddelandetext..."
 
-#: src/plugins/bsfilter/bsfilter.c:282
+#: src/plugins/bsfilter/bsfilter.c:280
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: filtrerar meddelande..."
 
-#: src/plugins/bsfilter/bsfilter.c:367
+#: src/plugins/bsfilter/bsfilter.c:365
 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"
@@ -9760,7 +10241,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:374
+#: src/plugins/bsfilter/bsfilter.c:372
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
@@ -9769,11 +10250,11 @@ msgstr ""
 "Insticksmodulen Bsfilter kunde inte filtrera ett meddelande. Kommandot `%s` "
 "kunde inte köra."
 
-#: src/plugins/bsfilter/bsfilter.c:475
+#: src/plugins/bsfilter/bsfilter.c:474
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: lär från meddelande..."
 
-#: src/plugins/bsfilter/bsfilter.c:616
+#: src/plugins/bsfilter/bsfilter.c:615
 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 "
@@ -9801,12 +10282,12 @@ msgstr ""
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:427
+#: src/plugins/bsfilter/bsfilter_gtk.c:170
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Save spam in"
 msgstr "Spara skräppost i"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:209
+#: src/plugins/bsfilter/bsfilter_gtk.c:208
 msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
@@ -9814,11 +10295,11 @@ msgstr ""
 "Om Bsfilter trodde ett meddelande var skräp eller osäker, men den blev "
 "vitlistad, lär in som icke-skräp."
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:218
+#: src/plugins/bsfilter/bsfilter_gtk.c:217
 msgid "Bsfilter call"
 msgstr "Bsfilteranrop"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:226
+#: src/plugins/bsfilter/bsfilter_gtk.c:225
 msgid "Path to bsfilter executable"
 msgstr "Sökväg till bsfilters exekverbara fil"
 
@@ -9847,12 +10328,12 @@ msgstr ""
 "Clamd svarar inte på ping.\n"
 "Kör clamd?"
 
-#: src/plugins/clamd/clamav_plugin.c:119
+#: src/plugins/clamd/clamav_plugin.c:120
 #, c-format
 msgid "Detected %s virus."
 msgstr "Detekterade %s-virus."
 
-#: src/plugins/clamd/clamav_plugin.c:135
+#: src/plugins/clamd/clamav_plugin.c:137
 #, c-format
 msgid ""
 "Scanning error:\n"
@@ -9861,20 +10342,20 @@ msgstr ""
 "Avsökningsfel:\n"
 " %s"
 
-#: src/plugins/clamd/clamav_plugin.c:146
+#: src/plugins/clamd/clamav_plugin.c:148
 #, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr "Fil: %s. Storlek (%d) större än begränsningen (%d)\n"
 
-#: src/plugins/clamd/clamav_plugin.c:174
+#: src/plugins/clamd/clamav_plugin.c:177
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: scannar meddelande..."
 
-#: src/plugins/clamd/clamav_plugin.c:280
+#: src/plugins/clamd/clamav_plugin.c:283
 msgid "Failed to register mail filtering hook"
 msgstr "Misslyckades att registrera kopplingspunkt för e-postfiltrering"
 
-#: src/plugins/clamd/clamav_plugin.c:298
+#: src/plugins/clamd/clamav_plugin.c:301
 msgid ""
 "Init\n"
 "No socket information.\n"
@@ -9884,7 +10365,7 @@ msgstr ""
 "Ingen socket-information.\n"
 "Antivirus avaktiverat."
 
-#: src/plugins/clamd/clamav_plugin.c:302
+#: src/plugins/clamd/clamav_plugin.c:305
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
@@ -9894,7 +10375,7 @@ msgstr ""
 "Clamd svarar inte på ping.\n"
 "Kör clamd?"
 
-#: src/plugins/clamd/clamav_plugin.c:333
+#: src/plugins/clamd/clamav_plugin.c:336
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -9935,7 +10416,7 @@ msgstr ""
 "Inställningar kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/Clam "
 "Antivirus"
 
-#: src/plugins/clamd/clamav_plugin.c:372
+#: src/plugins/clamd/clamav_plugin.c:375
 msgid "Virus detection"
 msgstr "Virusdetektion"
 
@@ -10011,6 +10492,10 @@ msgstr "Klicka på denna knapp för att välja full sökväg till clamd.conf"
 msgid "Check permission for folders and adjust if necessary"
 msgstr "Kontrollera behörigheterna för mappar och modifiera om nödvändigt"
 
+#: src/plugins/clamd/clamav_plugin_gtk.c:348
+msgid "Find and _Replace"
+msgstr "Sök och E_rsätt"
+
 #: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr ""
@@ -10048,7 +10533,7 @@ msgstr ""
 "Clamd svarar inte på ping.\n"
 "Är clamd igång?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:122
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -10057,7 +10542,7 @@ msgstr ""
 "%s: Kunde inte öppna\n"
 "clamd kommer att stängas av"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:217
+#: src/plugins/clamd/libclamd/clamd-plugin.c:210
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -10066,44 +10551,44 @@ msgstr ""
 "%s: Kunde inte hitta efterfrågad information\n"
 "clamd kommer att avaktiveras"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:251
+#: src/plugins/clamd/libclamd/clamd-plugin.c:244
 msgid "Could not create socket"
 msgstr "Kunde inte skapa socket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:442
+#: src/plugins/clamd/libclamd/clamd-plugin.c:435
 msgid ": File does not exist"
 msgstr ": Filen finns inte"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
+#: src/plugins/clamd/libclamd/clamd-plugin.c:448
 msgid ": Unable to open"
 msgstr ": Kunde inte öppna"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
-#: src/plugins/clamd/libclamd/clamd-plugin.c:479
-#: src/plugins/clamd/libclamd/clamd-plugin.c:493
+#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:472
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 msgid "Socket write error"
 msgstr "Socket-skrivfel"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:486
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: Fel vid läsning"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:500
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket read error"
 msgstr "Socket-läsfel"
 
-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
+#: src/plugins/demo/demo.c:33 src/plugins/demo/demo.c:102
 msgid "Demo"
 msgstr "Demo"
 
-#: src/plugins/demo/demo.c:52
+#: src/plugins/demo/demo.c:54
 msgid "Failed to register log text hook"
 msgstr "Misslyckades registrera kopplingspunkt för loggtext"
 
-#: src/plugins/demo/demo.c:76
+#: src/plugins/demo/demo.c:78
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It "
+"This plugin is only a demo of how to write plugins for Claws Mail. It "
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
@@ -10154,8 +10639,8 @@ msgstr "Öppna i Visare (fjärrinnehåll är aktiverat)"
 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:3924
-#: src/prefs_proxy.c:241
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
+#: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -10187,118 +10672,115 @@ msgstr ""
 "javaappletar kan fortfarande vara aktiverat för innehåll som är\n"
 "bifogat i e-brevet."
 
-#: src/plugins/fancy/fancy_prefs.c:245
-#: src/plugins/litehtml_viewer/lh_prefs.c:121
+#: src/plugins/fancy/fancy_prefs.c:246
+#: 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:277
+#: src/plugins/fancy/fancy_prefs.c:278
 msgid "When clicking on a link, by default"
 msgstr "Vid klickning av länkar, som standard"
 
-#: src/plugins/fancy/fancy_prefs.c:285
+#: src/plugins/fancy/fancy_prefs.c:286
 msgid "Open in External Browser"
 msgstr "Öppna med Extern Webbläsare"
 
-#: src/plugins/fancy/fancy_prefs.c:299
+#: src/plugins/fancy/fancy_prefs.c:300
 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:309
-#: src/plugins/notification/notification_prefs.c:1346
+#: 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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
-#: src/prefs_customheader.c:236
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Bläddra"
 
-#: src/plugins/fancy/fancy_prefs.c:351
+#: src/plugins/fancy/fancy_prefs.c:352
 msgid "Select stylesheet"
 msgstr "Välj stilmall"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "Laddning av fjärrinnehåll är avaktiverat."
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Ladda bilder"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Tillåt externt innehåll"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Aktivera Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Aktivera Insticksmoduler"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Aktivera Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Öppna länkar med extern browser"
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Ett fel uppstod: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:853
 #, 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:744
-msgid "Search the Web"
-msgstr "Sök webben"
-
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Öppna i visare"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Öppna i browser"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Öppna Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Kopiera Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Ladda ner Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Spara Bild Som"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Kopiera Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Importera flöde"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-Visare"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10311,17 +10793,22 @@ msgstr ""
 "automatiskt. Inställningar kan hittas i /Konfiguration/Egenskaper/"
 "Insticksmoduler/Fancy"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:160
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:193
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
+#. TRANSLATORS: Possible error message during plugin load
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:166
 msgid "Failed to register mail receive hook"
 msgstr "Kunde inte registrera kopplingspunkt för mottagning av post"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
+#. TRANSLATORS: Description seen in plugins dialog.
+#. * Translation of "Plugins" part of preferences path should to be
+#. * the same as translation of "Plugins" string in Claws Mail message
+#. * catalog.
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:202
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -10335,10 +10822,12 @@ msgstr ""
 "\n"
 "Alternativ kan hittas i /Konfiguration/Egenskaper/Insticksmoduler/FetchInfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
+#. TRANSLATORS: Description of functionality added by this plugin
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:229
 msgid "Mail marking"
 msgstr "E-postmarkering"
 
+#. TRANSLATORS: Heading of a preferences section determining which headers to add
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:92
 msgid "Add fetchinfo headers"
 msgstr "Lägg till brevhuvuden för fetchinfo"
@@ -10347,10 +10836,7 @@ msgstr "Lägg till brevhuvuden för fetchinfo"
 msgid "Headers to be added"
 msgstr "Huvuden som skall läggas till"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
-msgid "UIDL"
-msgstr "UIDL"
-
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
@@ -10358,6 +10844,7 @@ msgstr ""
 "Lägger till X-FETCH-UIDL-huvudet med meddelandets unika ID-identifierare "
 "(POP3)"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
 msgstr "Kontonamn"
@@ -10366,6 +10853,7 @@ msgstr "Kontonamn"
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
 msgstr "Lägger till X-FETCH-ACCOUNT-huvudet med kontonamnet"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
 msgstr "Mottagarserver"
@@ -10374,6 +10862,7 @@ msgstr "Mottagarserver"
 msgid "Adds the X-FETCH-SERVER header with the receive server"
 msgstr "Lägger till X-FETCH-SERVER-huvudet med mottagandeserver"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
 msgstr "AnvändarID"
@@ -10382,6 +10871,7 @@ msgstr "AnvändarID"
 msgid "Adds the X-FETCH-USERID header with the user ID"
 msgstr "Lägger till X-FETCH-USERID-huvudet med användarID"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
 msgstr "Mottagningstid"
@@ -10432,13 +10922,13 @@ msgstr "Steg 2:"
 msgid "Enter code:"
 msgstr "Mata in kod:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:329
+#: 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:345
+#: src/plugins/gdata/cm_gdata_contacts.c:347
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10446,49 +10936,49 @@ 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:347
+#: 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:357
+#: 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:378
+#: 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:415
+#: 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:422
+#: 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:447
+#: 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:454
+#: 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:474
+#: 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:481
+#: 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:488
+#: src/plugins/gdata/cm_gdata_contacts.c:490
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
@@ -10496,7 +10986,7 @@ msgstr ""
 "GData-insticksmodul: Ingen auktoriseringskod mottagen, "
 "auktoriseringsförfrågan avvisad\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:494
+#: src/plugins/gdata/cm_gdata_contacts.c:496
 msgid ""
 "GData plugin: Interactive authorization still running, no additional session "
 "started\n"
@@ -10504,16 +10994,16 @@ msgstr ""
 "GData-insticksmodul: Interaktiv auktorisering kör fortfarande, ingen "
 "ytterligare session startad\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:511
+#: 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:535
+#: 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:595
+#: src/plugins/gdata/cm_gdata_contacts.c:597
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
@@ -10521,29 +11011,29 @@ msgstr ""
 "Insticksmodulen GData: Förfluten tid sedan senaste uppdatering: %d minuter, "
 "uppdaterar nu\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:603
+#: 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:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1921
+#: 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:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
+#: 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:95
+#: src/plugins/gdata/cm_gdata_prefs.c:99
 msgid "Polling interval (seconds):"
 msgstr "Avsökningsintervall (sekunder):"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:106
 msgid "Maximum number of results:"
 msgstr "Maximalt antal resultat:"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:138 src/plugins/gdata/gdata_plugin.c:102
+#: 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"
@@ -10581,10 +11071,47 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData-integrering"
 
+#: 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"
+"\n"
+"%s"
+msgstr ""
+"Ett nyckelord nämns i e-posten du skickar. På rad %d nämns nyckelordet, som "
+"börjar med texten: %s\n"
+"\n"
+"%s"
+
+#: src/plugins/keyword_warner/keyword_warner.c:195
+msgid "Keyword warning"
+msgstr "Nyckelordsvarning"
+
+#: src/plugins/keyword_warner/keyword_warner.c:260
+#: src/plugins/keyword_warner/keyword_warner.c:313
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:235
+msgid "Keyword Warner"
+msgstr "Nyckelordsvarnare"
+
+#: src/plugins/keyword_warner/keyword_warner.c:270
+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 ""
+"Visar en varning vid sändning eller köande av ett meddelande och en referens "
+"till ett eller fler nyckelord hittas i meddelandetexten."
+
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:138
+msgid "Don't check for keywords when forwarding or redirecting messages"
+msgstr ""
+"Kontrollera inte efter nyckelord vid vidarebefordran och omdirigeringar av "
+"meddelanden"
+
 #: src/plugins/libravatar/libravatar.c:334
 #: src/plugins/libravatar/libravatar.c:399
 #: src/plugins/libravatar/libravatar.c:459
-#: src/plugins/libravatar/libravatar_prefs.c:563
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr "Libravatar"
 
@@ -10712,8 +11239,8 @@ msgid "Cache refresh interval"
 msgstr "Interval för Cacheuppdatering"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1595
-#: src/prefs_account.c:1752 src/prefs_matcher.c:340 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "timmar"
 
@@ -10767,7 +11294,7 @@ msgstr "Ett genererat fullkroppsmonster"
 
 #: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
-msgstr "Ett genererat nästan unikt ansikte"
+msgstr "Ett genererat nästan unikt face"
 
 #: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
@@ -10794,11 +11321,11 @@ msgstr ""
 "tillgänglig. Lämna en tom URL för att använda libravatars orangefärgade "
 "standardikon."
 
-#: src/plugins/libravatar/libravatar_prefs.c:397
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr "Tillåt omdirigeringar till _andra sajter"
 
-#: src/plugins/libravatar/libravatar_prefs.c:398
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
@@ -10806,23 +11333,23 @@ msgstr ""
 "Följ omdirigeringssvar mottagna från libravatarservern till andra "
 "avatartjänster som gravatar.com"
 
-#: src/plugins/libravatar/libravatar_prefs.c:407
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr "Aktiv_era federerade servrar"
 
-#: src/plugins/libravatar/libravatar_prefs.c:408
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr "Försök att få avatar från avsändarens libravatarserver på deras domän"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr "Efterfrågad tidsgräns"
 
-#: src/plugins/libravatar/libravatar_prefs.c:425
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr "sekund(er)"
 
-#: src/plugins/libravatar/libravatar_prefs.c:426
+#: src/plugins/libravatar/libravatar_prefs.c:427
 msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
@@ -10830,15 +11357,15 @@ msgstr ""
 "Sätt till 0 för använda global socket I/O timeout. Maximalt värde måste även "
 "vara lägre än globala socket I/O timeouten."
 
-#: src/plugins/libravatar/libravatar_prefs.c:472
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr "Ikoncache"
 
-#: src/plugins/libravatar/libravatar_prefs.c:476
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr "Standardläge för saknad ikon"
 
-#: src/plugins/libravatar/libravatar_prefs.c:480
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr "Nätverk"
 
@@ -10853,19 +11380,19 @@ msgstr ""
 "efterfrågas\n"
 "från nätverket."
 
-#: src/plugins/litehtml_viewer/lh_prefs.c:133
+#: src/plugins/litehtml_viewer/lh_prefs.c:134
 msgid "Size of image cache in megabytes"
 msgstr "Storlek på bildcache i megabyte"
 
-#: src/plugins/litehtml_viewer/lh_prefs.c:148
+#: src/plugins/litehtml_viewer/lh_prefs.c:150
 msgid "Default font"
 msgstr "Standardtypsnitt"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Open Link"
 msgstr "Öppna Länk"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+#: src/plugins/litehtml_viewer/lh_widget.cpp:99
 msgid "Copy Link Location"
 msgstr "Kopiera Länkplats"
 
@@ -10881,19 +11408,19 @@ msgstr ""
 "Insticksmodul för visning av HTML-epost, som använder sig av biblioteket "
 "litehtml (http://www.litehtml.com/)"
 
-#: src/plugins/mailmbox/plugin.c:58
+#: src/plugins/mailmbox/plugin.c:57
 msgid "mailmbox folder"
 msgstr "mailmbox-mapp"
 
-#: src/plugins/mailmbox/plugin.c:63
+#: src/plugins/mailmbox/plugin.c:62
 msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr "Det här är en insticksmodul som hanterar brevlådor i formatet mbox."
 
-#: src/plugins/mailmbox/plugin.c:84
+#: src/plugins/mailmbox/plugin.c:83
 msgid "MBOX"
 msgstr "MBOX"
 
-#: src/plugins/mailmbox/plugin_gtk.c:190
+#: src/plugins/mailmbox/plugin_gtk.c:191
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -10903,79 +11430,70 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att genomsökas automatiskt."
 
-#: src/plugins/mailmbox/plugin_gtk.c:330
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be deleted.\n"
-"Do you really want to delete?"
-msgstr ""
-"Alla mappar och meddelanden under '%s' kommer att tas bort.\n"
-"Vill du verkligen fortsätta?"
-
-#: src/plugins/managesieve/managesieve.c:436
+#: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Ingen Sieve-autentiseringsmetod tillgänglig\n"
 
-#: src/plugins/managesieve/managesieve.c:440
+#: src/plugins/managesieve/managesieve.c:442
 msgid "Selected Sieve auth method not available\n"
 msgstr "Vald Sieve-autentiseringsmetod finns inte tillgänglig\n"
 
-#: src/plugins/managesieve/managesieve.c:673
+#: src/plugins/managesieve/managesieve.c:675
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: src/plugins/managesieve/managesieve.c:677
+#: src/plugins/managesieve/managesieve.c:679
 #, c-format
 msgid "Disconnected: %s"
 msgstr "Frånkopplad: %s"
 
-#: src/plugins/managesieve/managesieve.c:726
-#: src/plugins/managesieve/managesieve.c:871
+#: src/plugins/managesieve/managesieve.c:728
+#: src/plugins/managesieve/managesieve.c:873
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "ohanterat meddelande i Sieve-session: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:733
+#: src/plugins/managesieve/managesieve.c:735
 msgid "STARTTLS failed"
 msgstr "STARTTLS misslyckades"
 
-#: src/plugins/managesieve/managesieve.c:798
-#: src/plugins/managesieve/managesieve.c:814
-#: src/plugins/managesieve/managesieve.c:841
-#: src/plugins/managesieve/managesieve.c:923
-#: src/plugins/managesieve/managesieve.c:941
+#: src/plugins/managesieve/managesieve.c:800
+#: src/plugins/managesieve/managesieve.c:816
+#: src/plugins/managesieve/managesieve.c:843
+#: src/plugins/managesieve/managesieve.c:925
+#: src/plugins/managesieve/managesieve.c:943
 msgid "error occurred on SIEVE session\n"
 msgstr "fel uppstod I Sieve-sessionen\n"
 
-#: src/plugins/managesieve/managesieve.c:867
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "fel uppstod i Sieve-sessionen. data: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:876
+#: src/plugins/managesieve/managesieve.c:878
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "ohanterat meddelande i Sieve-session: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1153
+#: src/plugins/managesieve/managesieve.c:1160
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: försöker autentisera igen\n"
 
-#: src/plugins/managesieve/managesieve.c:1155
+#: src/plugins/managesieve/managesieve.c:1162
 msgid "Auth method not available"
 msgstr "Autentiseringsmetoden inte tillgänglig"
 
-#: src/plugins/managesieve/managesieve.c:1172
+#: src/plugins/managesieve/managesieve.c:1179
 #, c-format
 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:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
 msgid "_Filter"
 msgstr "_Filter"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "Chec_k Syntax"
 msgstr "_Kontrollera Syntax"
 
@@ -10984,7 +11502,7 @@ msgid "Re_vert"
 msgstr "Ångra"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_editor.c:725
 #: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "Kunde inte hämta innehållet i skriptet"
@@ -11005,29 +11523,29 @@ msgstr "Detta skript har ändrats. Ångra de icke sparade förändringarna?"
 msgid "_Revert"
 msgstr "Ångra"
 
-#: src/plugins/managesieve/sieve_editor.c:353
+#: src/plugins/managesieve/sieve_editor.c:354
 msgid "Script saved successfully."
 msgstr "Skript sparades framgångsrikt."
 
-#: src/plugins/managesieve/sieve_editor.c:370
+#: src/plugins/managesieve/sieve_editor.c:371
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: src/plugins/managesieve/sieve_editor.c:399
+#: src/plugins/managesieve/sieve_editor.c:400
 msgid "Checking syntax..."
 msgstr "Kontrollerar syntax..."
 
-#: src/plugins/managesieve/sieve_editor.c:433
+#: src/plugins/managesieve/sieve_editor.c:434
 msgid "This script has been modified. Save the latest changes?"
 msgstr "Detta skript har ändrats. Vill du spara de senaste ändringarna?"
 
-#: src/plugins/managesieve/sieve_editor.c:695
+#: src/plugins/managesieve/sieve_editor.c:696
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - Sieve Filter%s"
 
-#: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1315
+#: src/plugins/managesieve/sieve_editor.c:745
+#: src/plugins/pdf_viewer/poppler_viewer.c:1331
 msgid "Loading..."
 msgstr "Laddar..."
 
@@ -11077,20 +11595,24 @@ msgstr "Ansluter..."
 msgid "Manage Sieve Filters"
 msgstr "Hantera Sieve-filter"
 
-#: src/plugins/managesieve/sieve_manager.c:806
+#: src/plugins/managesieve/sieve_manager.c:772
+msgid "_Rename"
+msgstr "Byt _namn"
+
+#: src/plugins/managesieve/sieve_manager.c:807
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "För att använda Sieve, aktivera det i kontoinställningarna."
 
-#: src/plugins/managesieve/sieve_plugin.c:36
-#: src/plugins/managesieve/sieve_plugin.c:154
+#: src/plugins/managesieve/sieve_plugin.c:38
+#: src/plugins/managesieve/sieve_plugin.c:156
 msgid "ManageSieve"
 msgstr "ManageSieve"
 
-#: src/plugins/managesieve/sieve_plugin.c:46
+#: src/plugins/managesieve/sieve_plugin.c:48
 msgid "Manage Sieve Filters..."
 msgstr "Hantera Sievefilter..."
 
-#: src/plugins/managesieve/sieve_plugin.c:114
+#: src/plugins/managesieve/sieve_plugin.c:116
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr "Hantera sievefilter på en server som använder protokollet ManageSieve."
 
@@ -11098,7 +11620,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:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Serverinformation"
 
@@ -11136,7 +11658,7 @@ msgid "Require STARTTLS"
 msgstr "Kräv STARTTLS"
 
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr "Ingen autentisering"
 
@@ -11149,30 +11671,29 @@ msgid "Specify authentication"
 msgstr "Specificera autentisering"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
-#: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
-#: src/prefs_account.c:1967
+#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 msgid "User ID"
 msgstr "Användar-ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:383
-#: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
-#: src/prefs_account.c:1990 src/prefs_account.c:2718 src/prefs_account.c:2746
-#: src/prefs_account.c:2943 src/prefs_proxy.c:134 src/wizard.c:1216
-#: src/wizard.c:1636
+#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: 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
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1678
-#: src/prefs_account.c:1939
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1688
-#: src/prefs_account.c:1948 src/prefs_send.c:265 src/prefs_send.c:336
-#: src/prefs_themes.c:1114
+#: 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
 msgid "Automatic"
 msgstr "Automatiskt"
 
@@ -11222,7 +11743,7 @@ msgstr ""
 msgid "Log file"
 msgstr "Loggfil"
 
-#: src/plugins/notification/notification_banner.c:357
+#: src/plugins/notification/notification_banner.c:360
 msgid "Folder:"
 msgstr "Mapp:"
 
@@ -11230,7 +11751,7 @@ msgstr "Mapp:"
 msgid "Select folder(s)"
 msgstr "Välj mapp(ar)"
 
-#: src/plugins/notification/notification_foldercheck.c:583
+#: src/plugins/notification/notification_foldercheck.c:581
 msgid "select recursively"
 msgstr "välj rekursivt"
 
@@ -11239,71 +11760,67 @@ msgid "No new messages"
 msgstr "Inga nya meddelanden"
 
 #: src/plugins/notification/notification_plugin.c:220
-#: src/plugins/notification/notification_plugin.c:424
-#: src/plugins/notification/notification_prefs.c:399
-#: src/plugins/notification/notification_prefs.c:414
-#: src/plugins/notification/notification_prefs.c:433
-#: src/plugins/notification/notification_prefs.c:451
-#: src/plugins/notification/notification_prefs.c:469
-#: src/plugins/notification/notification_prefs.c:487
-#: src/plugins/notification/notification_prefs.c:505
-#: src/plugins/notification/notification_prefs.c:523
+#: 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
 msgid "Notification"
 msgstr "Notification"
 
-#: src/plugins/notification/notification_plugin.c:225
-msgid "The Notification plugin needs threading support."
-msgstr "Insticksmodulen Notifiering kräver stöd för trådar."
-
-#: src/plugins/notification/notification_plugin.c:232
+#: src/plugins/notification/notification_plugin.c:226
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för mapp-postuppdatering i "
 "insticksmodulen Notification"
 
-#: src/plugins/notification/notification_plugin.c:240
+#: src/plugins/notification/notification_plugin.c:234
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för mappuppdatering i insticksmodulen "
 "Notification"
 
-#: src/plugins/notification/notification_plugin.c:250
+#: src/plugins/notification/notification_plugin.c:244
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för msginfo i insticksmodulen "
 "Notification"
 
-#: src/plugins/notification/notification_plugin.c:260
+#: src/plugins/notification/notification_plugin.c:254
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för offline switch i insticksmodulen "
 "Notification"
 
-#: src/plugins/notification/notification_plugin.c:271
+#: src/plugins/notification/notification_plugin.c:265
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 "Misslyckades att registrera stäng-kopplingspunkt för huvudfönstret i "
 "insticksmodulen Notification"
 
-#: src/plugins/notification/notification_plugin.c:284
+#: src/plugins/notification/notification_plugin.c:278
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för ikonifiera i insticksmodulen "
 "Notification"
 
-#: src/plugins/notification/notification_plugin.c:297
+#: src/plugins/notification/notification_plugin.c:291
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för förändrad kontolista i "
 "insticksmodulen Notification"
 
-#: src/plugins/notification/notification_plugin.c:310
+#: src/plugins/notification/notification_plugin.c:304
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för temaförändring i "
 "Notifieringsinsticksmodulen"
 
-#: src/plugins/notification/notification_plugin.c:429
+#: src/plugins/notification/notification_plugin.c:423
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11319,7 +11836,7 @@ msgstr ""
 "\n"
 "Feedback till <berndth at gmx.de> välkomnas."
 
-#: src/plugins/notification/notification_plugin.c:454
+#: src/plugins/notification/notification_plugin.c:448
 msgid "Various tools"
 msgstr "Blandade verktyg"
 
@@ -11340,7 +11857,7 @@ msgid "New Calendar message"
 msgstr "Nytt Kalendermeddelande"
 
 #: src/plugins/notification/notification_popup.c:337
-#: src/plugins/notification/notification_trayicon.c:907
+#: src/plugins/notification/notification_trayicon.c:906
 msgid "A new calendar message arrived"
 msgstr "Ett nytt kalendermeddelande ankom"
 
@@ -11349,7 +11866,7 @@ msgid "New RSS feed article"
 msgstr "Ny artikel i RSS-flöde"
 
 #: src/plugins/notification/notification_popup.c:341
-#: src/plugins/notification/notification_trayicon.c:910
+#: src/plugins/notification/notification_trayicon.c:909
 msgid "A new article in a RSS feed arrived"
 msgstr "En ny artikel i ett RSS-flöde kom"
 
@@ -11362,7 +11879,7 @@ msgid "Unknown message type arrived"
 msgstr "Okänd meddelandetyp anlände"
 
 #: src/plugins/notification/notification_popup.c:378
-#: src/plugins/notification/notification_trayicon.c:679
+#: src/plugins/notification/notification_trayicon.c:678
 msgid "Present main window"
 msgstr "Visa huvudfönster"
 
@@ -11387,7 +11904,7 @@ msgid "Calendar message"
 msgstr "Kalendermeddelande"
 
 #: src/plugins/notification/notification_popup.c:501
-#: src/plugins/notification/notification_trayicon.c:944
+#: src/plugins/notification/notification_trayicon.c:943
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11412,243 +11929,243 @@ msgid_plural "%d new messages"
 msgstr[0] "%d nytt meddelande"
 msgstr[1] "%d nya meddelanden"
 
-#: src/plugins/notification/notification_prefs.c:415
+#: src/plugins/notification/notification_prefs.c:419
 msgid "Hotkeys"
 msgstr "Snabbtangenter"
 
-#: src/plugins/notification/notification_prefs.c:434
+#: src/plugins/notification/notification_prefs.c:438
 msgid "Banner"
 msgstr "Banderoll"
 
-#: src/plugins/notification/notification_prefs.c:452
+#: src/plugins/notification/notification_prefs.c:456
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/plugins/notification/notification_prefs.c:474 src/prefs_actions.c:264
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Kommando"
 
-#: src/plugins/notification/notification_prefs.c:488
+#: src/plugins/notification/notification_prefs.c:492
 msgid "LCD"
 msgstr "LCD"
 
-#: src/plugins/notification/notification_prefs.c:506
+#: src/plugins/notification/notification_prefs.c:510
 msgid "SysTrayicon"
 msgstr "Notifieringsyteikon"
 
-#: src/plugins/notification/notification_prefs.c:524
+#: src/plugins/notification/notification_prefs.c:528
 msgid "Indicator"
 msgstr "Indikator"
 
-#: src/plugins/notification/notification_prefs.c:607
+#: src/plugins/notification/notification_prefs.c:611
 msgid "Include folder types"
 msgstr "Inkludera mapptyper"
 
-#: src/plugins/notification/notification_prefs.c:616
+#: src/plugins/notification/notification_prefs.c:620
 msgid "Mail folders"
 msgstr "Brevmappar"
 
-#: src/plugins/notification/notification_prefs.c:624
+#: src/plugins/notification/notification_prefs.c:628
 msgid "News folders"
 msgstr "Nyhetsmappar"
 
-#: src/plugins/notification/notification_prefs.c:632
+#: src/plugins/notification/notification_prefs.c:636
 msgid "RSSyl folders"
 msgstr "RSSyl-mappar"
 
-#: src/plugins/notification/notification_prefs.c:640
+#: src/plugins/notification/notification_prefs.c:644
 msgid "vCalendar folders"
 msgstr "vCalendarmappar"
 
-#: src/plugins/notification/notification_prefs.c:648
+#: src/plugins/notification/notification_prefs.c:652
 msgid "These settings override folder-specific selections."
 msgstr "Dessa inställningar åsidosätter mappspecifika val."
 
-#: src/plugins/notification/notification_prefs.c:659
+#: src/plugins/notification/notification_prefs.c:663
 msgid "Global notification settings"
 msgstr "Inställningar för globala notifikationer"
 
-#: src/plugins/notification/notification_prefs.c:668
+#: src/plugins/notification/notification_prefs.c:672
 msgid "Set window manager urgency hint when new messages exist"
 msgstr "Sätt brådskande-hint i fönsterhanteraren när nya meddelanden finns"
 
-#: src/plugins/notification/notification_prefs.c:677
+#: src/plugins/notification/notification_prefs.c:681
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr "Sätt brådskande-hint i fönsterhanteraren när olästa meddelanden finns"
 
-#: src/plugins/notification/notification_prefs.c:687
+#: src/plugins/notification/notification_prefs.c:691
 msgid "Use sound theme"
 msgstr "Använd ljudtema"
 
-#: src/plugins/notification/notification_prefs.c:761
+#: src/plugins/notification/notification_prefs.c:763
 msgid "Show banner"
 msgstr "Visa banderoll"
 
-#: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/plugins/notification/notification_prefs.c:768
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
+#: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
+#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
 msgid "Always"
 msgstr "Alltid"
 
-#: src/plugins/notification/notification_prefs.c:770
+#: src/plugins/notification/notification_prefs.c:772
 msgid "Only when not empty"
 msgstr "Endast när inte tom"
 
-#: src/plugins/notification/notification_prefs.c:789
+#: src/plugins/notification/notification_prefs.c:791
 msgid "Banner speed"
 msgstr "Banderollhastighet"
 
-#: src/plugins/notification/notification_prefs.c:826
+#: src/plugins/notification/notification_prefs.c:828
 msgid "Maximum number of messages"
 msgstr "Maximalt antal meddelanden"
 
-#: src/plugins/notification/notification_prefs.c:832
+#: src/plugins/notification/notification_prefs.c:834
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "Begränsa antalet visade meddelanden, använd 0 för obegränsat"
 
-#: src/plugins/notification/notification_prefs.c:841
+#: src/plugins/notification/notification_prefs.c:843
 msgid "Banner width"
 msgstr "Banderollbredd"
 
-#: src/plugins/notification/notification_prefs.c:847
+#: src/plugins/notification/notification_prefs.c:849
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "Begränsa storleken på banderollen, använd 0 för skärmbredd"
 
-#: src/plugins/notification/notification_prefs.c:849
+#: src/plugins/notification/notification_prefs.c:851
 msgid "pixel(s)"
 msgstr "punkt(er)"
 
-#: src/plugins/notification/notification_prefs.c:858
+#: src/plugins/notification/notification_prefs.c:860
 msgid "Include unread mails in banner"
 msgstr "Inkludera olästa brev i banderoll"
 
-#: src/plugins/notification/notification_prefs.c:866
+#: src/plugins/notification/notification_prefs.c:868
 msgid "Make banner sticky"
 msgstr "Gör banderollen klibbig"
 
-#: src/plugins/notification/notification_prefs.c:876
-#: src/plugins/notification/notification_prefs.c:1081
-#: src/plugins/notification/notification_prefs.c:1376
-#: src/plugins/notification/notification_prefs.c:1611
+#: 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
 msgid "Only include selected folders"
 msgstr "Inkludera endast valda mappar"
 
-#: src/plugins/notification/notification_prefs.c:885
-#: src/plugins/notification/notification_prefs.c:1090
-#: src/plugins/notification/notification_prefs.c:1385
-#: src/plugins/notification/notification_prefs.c:1620
+#: 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
 msgid "Select folders..."
 msgstr "Välj mappar..."
 
-#: src/plugins/notification/notification_prefs.c:897
+#: src/plugins/notification/notification_prefs.c:899
 msgid "Banner colors"
 msgstr "Banderollfärger"
 
-#: src/plugins/notification/notification_prefs.c:901
-#: src/plugins/notification/notification_prefs.c:1122
+#: src/plugins/notification/notification_prefs.c:903
+#: src/plugins/notification/notification_prefs.c:1114
 msgid "Use custom colors"
 msgstr "Använd anpassade färger"
 
-#: src/plugins/notification/notification_prefs.c:916
-#: src/plugins/notification/notification_prefs.c:1135
+#: src/plugins/notification/notification_prefs.c:918
+#: src/plugins/notification/notification_prefs.c:1128
 msgid "Foreground"
 msgstr "Förgrund"
 
 #: src/plugins/notification/notification_prefs.c:922
-#: src/plugins/notification/notification_prefs.c:1141
+#: src/plugins/notification/notification_prefs.c:1134
 msgid "Foreground color"
 msgstr "Förgrundsfärg"
 
 #: src/plugins/notification/notification_prefs.c:927
-#: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
-#: src/prefs_msg_colors.c:286
+#: src/plugins/notification/notification_prefs.c:1140
+#: src/prefs_msg_colors.c:251 src/prefs_msg_colors.c:265
+#: src/prefs_msg_colors.c:279
 msgid "Background"
 msgstr "Bakgrund"
 
-#: src/plugins/notification/notification_prefs.c:933
-#: src/plugins/notification/notification_prefs.c:1152
+#: src/plugins/notification/notification_prefs.c:931
+#: src/plugins/notification/notification_prefs.c:1146
 msgid "Background color"
 msgstr "Bakgrundsfärg"
 
-#: src/plugins/notification/notification_prefs.c:1045
-#: src/plugins/notification/notification_prefs.c:1646
+#: src/plugins/notification/notification_prefs.c:1037
+#: src/plugins/notification/notification_prefs.c:1634
 msgid "Enable popup"
 msgstr "Aktivera popup"
 
-#: src/plugins/notification/notification_prefs.c:1062
-#: src/plugins/notification/notification_prefs.c:1664
+#: src/plugins/notification/notification_prefs.c:1054
+#: src/plugins/notification/notification_prefs.c:1652
 msgid "Popup timeout"
 msgstr "Tidsgräns för popup"
 
-#: src/plugins/notification/notification_prefs.c:1101
+#: src/plugins/notification/notification_prefs.c:1093
 msgid "Make popup sticky"
 msgstr "Gör popup klibbig"
 
-#: src/plugins/notification/notification_prefs.c:1111
+#: src/plugins/notification/notification_prefs.c:1103
 msgid "Set popup window width and position"
 msgstr "Sätt storlek och position för popup-fönster"
 
-#: src/plugins/notification/notification_prefs.c:1116
+#: src/plugins/notification/notification_prefs.c:1108
 msgid "(the window manager is free to ignore this)"
 msgstr "(fönsterhanteraren kan ignorera detta)"
 
-#: src/plugins/notification/notification_prefs.c:1164
-#: src/plugins/notification/notification_prefs.c:1676
+#: src/plugins/notification/notification_prefs.c:1158
+#: src/plugins/notification/notification_prefs.c:1664
 msgid "Display folder name"
 msgstr "Visa mappnamn"
 
-#: src/plugins/notification/notification_prefs.c:1229
+#: src/plugins/notification/notification_prefs.c:1217
 msgid "Sample popup window"
 msgstr "Exempel på Popupfönster"
 
-#: src/plugins/notification/notification_prefs.c:1235
+#: src/plugins/notification/notification_prefs.c:1223
 msgid "Done"
 msgstr "Färdig"
 
-#: src/plugins/notification/notification_prefs.c:1293
+#: src/plugins/notification/notification_prefs.c:1281
 msgid "Select command"
 msgstr "Välj kommando"
 
-#: src/plugins/notification/notification_prefs.c:1322
+#: src/plugins/notification/notification_prefs.c:1310
 msgid "Enable command"
 msgstr "Aktivera kommando"
 
-#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1327 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "Kommando att köra"
 
-#: src/plugins/notification/notification_prefs.c:1357
+#: src/plugins/notification/notification_prefs.c:1345
 msgid "Block command after execution for"
 msgstr "Blockera kommando efter exekvering i"
 
-#: src/plugins/notification/notification_prefs.c:1464
+#: src/plugins/notification/notification_prefs.c:1452
 msgid "Enable LCD"
 msgstr "Aktivera LCD"
 
-#: src/plugins/notification/notification_prefs.c:1483
+#: src/plugins/notification/notification_prefs.c:1471
 msgid "Hostname:Port of LCDd server"
 msgstr "Värdnamn:Port för LCD-server"
 
-#: src/plugins/notification/notification_prefs.c:1568
+#: src/plugins/notification/notification_prefs.c:1556
 msgid "Enable Trayicon"
 msgstr "Aktivera Notifieringsyteikon"
 
-#: src/plugins/notification/notification_prefs.c:1584
+#: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
 msgstr "Göm vid uppstart"
 
-#: src/plugins/notification/notification_prefs.c:1592
+#: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
 msgstr "Stäng till notifieringsytan"
 
-#: src/plugins/notification/notification_prefs.c:1600
+#: src/plugins/notification/notification_prefs.c:1588
 msgid "Hide when iconified"
 msgstr "Dölj när ikonifierad"
 
@@ -11658,36 +12175,36 @@ msgstr "Dölj när ikonifierad"
 #. 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:1637
+#: src/plugins/notification/notification_prefs.c:1625
 msgid "Passive toaster popup"
 msgstr "Passiv Popup"
 
-#: src/plugins/notification/notification_prefs.c:1801
+#: src/plugins/notification/notification_prefs.c:1789
 msgid "Add to Indicator Applet"
 msgstr "Lägg till i Indikatorappleten"
 
-#: src/plugins/notification/notification_prefs.c:1815
+#: src/plugins/notification/notification_prefs.c:1803
 msgid "Hide mainwindow when minimized"
 msgstr "Göm huvudfönstret när minimerad"
 
-#: src/plugins/notification/notification_prefs.c:1868
+#: src/plugins/notification/notification_prefs.c:1856
 msgid "Enable global hotkeys"
 msgstr "Aktivera globala snabbtangenter"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1870
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "Exempel på snabbtangenter är <b>%s</b> och <b>%s</b>"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<alt>N"
 msgstr "<alt>N"
 
-#: src/plugins/notification/notification_prefs.c:1893
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "Toggle minimize"
 msgstr "Växla minimera"
 
@@ -11728,169 +12245,169 @@ msgstr "Visa notifieringar med Notifieringsyteikonen"
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nya %d, Olästa: %d, Totalt: %d"
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:856
 msgid "New mail message"
 msgstr "Nytt e-postmeddelande"
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:858
 msgid "New news post"
 msgstr "Ny nyhetspost"
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:860
 msgid "New calendar message"
 msgstr "Nytt kalendermeddelande"
 
-#: src/plugins/notification/notification_trayicon.c:863
+#: src/plugins/notification/notification_trayicon.c:862
 msgid "New article in RSS feed"
 msgstr "Ny artikel i RSS-flöde"
 
-#: src/plugins/notification/notification_trayicon.c:866
+#: src/plugins/notification/notification_trayicon.c:865
 msgid "New messages arrived"
 msgstr "Nya meddelanden har ankommit"
 
-#: src/plugins/notification/notification_trayicon.c:922
+#: src/plugins/notification/notification_trayicon.c:921
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] "%d nytt e-postmeddelande anlände"
 msgstr[1] "%d nya e-postmeddelanden anlände"
 
-#: src/plugins/notification/notification_trayicon.c:933
+#: src/plugins/notification/notification_trayicon.c:932
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] "%d nytt nyhetsmeddelande anlände"
 msgstr[1] "%d nya nyhetsmeddelanden anlände"
 
-#: src/plugins/notification/notification_trayicon.c:955
+#: src/plugins/notification/notification_trayicon.c:954
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d ny artikel i RSS-flödet anlände"
 msgstr[1] "%d nya artiklar i RSS-flödet anlände"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:710
 msgid "Author:"
 msgstr "Författare:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:708
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Creator:"
 msgstr "Skapare:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:713
 msgid "Producer:"
 msgstr "Producent:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:712
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Created:"
 msgstr "Skapad:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:720
 msgid "Modified:"
 msgstr "Ändrad:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:723
 msgid "Format:"
 msgstr "Format:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
-#: src/plugins/pdf_viewer/poppler_viewer.c:724
+#: src/plugins/pdf_viewer/poppler_viewer.c:725
+#: src/plugins/pdf_viewer/poppler_viewer.c:728
 msgid "Optimized:"
 msgstr "Optimerad:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1233
 msgid "PDF properties"
 msgstr "PDF-egenskaper"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 msgid "Enter password"
 msgstr "Ange lösenord"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1367
+#: src/plugins/pdf_viewer/poppler_viewer.c:1383
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "Detta dokument är låst och kräver ett lösenord innan det kan öppnas."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1398
 #, c-format
 msgid "%s Document"
 msgstr "%s Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 #, c-format
 msgid "of %d"
 msgstr "av %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1404
+#: src/plugins/pdf_viewer/poppler_viewer.c:1420
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Rendering av PDF misslyckas av okänd anledning."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1776
-#: src/plugins/pdf_viewer/poppler_viewer.c:1993
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Dokumentindex"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "Första sidan"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Sista sidan"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Zooma ut"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Passa Sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Passa Sidbredd"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Rotera Vänster"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Rotera Höger"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Skriv Ut Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Dokumentinfo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Sidnummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Anpassad zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2108
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11903,13 +12420,13 @@ msgstr ""
 "\n"
 "All feedback är välkommen: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2114
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
-#: src/plugins/pdf_viewer/poppler_viewer.c:2142
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "PDF-visare"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2118
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11925,7 +12442,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/perl/perl_gtk.c:50
+#: src/plugins/perl/perl_gtk.c:48
 msgid "Edit perl filter rules (ext)..."
 msgstr "Redigera perl-filterregler (ext)..."
 
@@ -11939,43 +12456,50 @@ msgstr ""
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
 msgstr "[inget användarid.]"
 
+#: src/plugins/pgpcore/passphrase.c:260
+msgid "Passphrases did not match.\n"
+msgstr "Lösenordsfraserna är inte lika.\n"
+
 #: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr "Ange lösenfrasen för den nya nyckeln:"
 
-#: src/plugins/pgpcore/passphrase.c:264
-msgid "Passphrases did not match.\n"
-msgstr "Lösenordsfraserna är inte lika.\n"
-
-#: src/plugins/pgpcore/passphrase.c:268
+#: src/plugins/pgpcore/passphrase.c:265
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Repetera lösenfrasen för den nya nyckeln:"
 
-#: src/plugins/pgpcore/passphrase.c:273
-msgid "Please enter the passphrase for:"
-msgstr "Vänligen ange lösenordet för:"
-
-#: src/plugins/pgpcore/passphrase.c:276
+#: src/plugins/pgpcore/passphrase.c:269
 msgid "Bad passphrase.\n"
 msgstr "Fel lösenfras.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/passphrase.c:270
+msgid "Please enter the passphrase for:"
+msgstr "Vänligen ange lösenordet för:"
+
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "Nyckelimport"
 
-#: src/plugins/pgpcore/pgp_viewer.c:174
+#: src/plugins/pgpcore/pgp_viewer.c:180
 msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it "
-"from a keyserver?"
+"This key is not in your keyring. Do you want Claws Mail to try to import it?"
 msgstr ""
 "Den här nyckeln finns inte i din nyckelring. Vill du att Claws-Mail ska "
-"försöka importera den från en nyckelserver?"
+"försöka importera den?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "från nyckelserver"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:183
+msgid "from Web Key Directory"
+msgstr "från Web Key Directory"
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11983,15 +12507,15 @@ msgstr ""
 "\n"
 " Nyckel-ID "
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr "   Den här nyckeln finns inte i din nyckelring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr "   Det ska vara möjligt att importera den "
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
@@ -11999,17 +12523,17 @@ msgstr ""
 "när du är uppkopplad.\n"
 "   eller "
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:194
 msgid ""
-"with the following command: \n"
+"with either of the following commands: \n"
 "\n"
 "     "
 msgstr ""
-"med följande kommando: \n"
+"med något av följande kommandon: \n"
 "\n"
 "      "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -12017,29 +12541,27 @@ msgstr ""
 "\n"
 " Importerar nyckel-ID "
 
-#: src/plugins/pgpcore/pgp_viewer.c:269
+#: src/plugins/pgpcore/pgp_viewer.c:280
 msgid "   This key has been imported to your keyring.\n"
 msgstr "   Den här nyckeln har importerats till din nyckelring.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:282
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr "   Den här nyckeln kunde inte importerats till din nyckelring\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr "   Nyckelservrar är ibland långsamma.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
-msgstr ""
-"   Du kan försöka att importera den manuellt med kommandot:\n"
-"\n"
-"    "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr "   Du kan försöka att importera den manuellt med kommandot:"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr "eller"
+
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr "   Den här nyckeln finns i din nyckelring.\n"
 
@@ -12098,9 +12620,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:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: 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
 msgid "minutes"
 msgstr "minuter"
 
@@ -12160,69 +12682,69 @@ msgstr "Generera ett nytt nyckelpar"
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:35
+#: src/plugins/smime/smime.c:1078
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "Ingen exakt matchning för '%s': vänligen välj nyckel."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Samlar information för '%s' ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:166
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Marginal"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
-#: src/plugins/pgpcore/sgpgme.c:170
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "Ultimat"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Välj nycklar"
 
-#: src/plugins/pgpcore/select-keys.c:458
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "Nyckel-ID"
 
-#: src/plugins/pgpcore/select-keys.c:476
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Tillit"
 
-#: src/plugins/pgpcore/select-keys.c:495
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Övrigt"
 
-#: src/plugins/pgpcore/select-keys.c:496
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "Kryptera i_nte"
 
-#: src/plugins/pgpcore/select-keys.c:677
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Lägg till nyckel"
 
-#: src/plugins/pgpcore/select-keys.c:678
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Skriv in ett annan användar- eller nyckel-ID:"
 
-#: src/plugins/pgpcore/select-keys.c:700
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "Kryptera till %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:701
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -12241,179 +12763,178 @@ msgstr ""
 "\n"
 "Litar du tillräckligt på den för att använda den ändå?"
 
-#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
-#: src/privacy.c:270 src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:281 src/privacy.c:286
 msgid "No signature found"
 msgstr "Ingen signatur funnen"
 
-#: src/plugins/pgpcore/sgpgme.c:164
+#: src/plugins/pgpcore/sgpgme.c:350
 msgid "Untrusted"
 msgstr "Icke betrodd"
 
-#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:424 src/plugins/pgpcore/sgpgme.c:443
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Signaturen kan inte kontrolleras - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
+#: src/plugins/pgpcore/sgpgme.c:428 src/plugins/pgpcore/sgpgme.c:432
 msgid "The signature has not been checked."
 msgstr "Signaturen har inte kontrollerats."
 
-#: src/plugins/pgpcore/sgpgme.c:252
+#: src/plugins/pgpcore/sgpgme.c:438
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: Kan inte hämta nyckel - ingen gpg-agent körs."
 
-#: src/plugins/pgpcore/sgpgme.c:270
+#: src/plugins/pgpcore/sgpgme.c:456
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "Bra signatur från \"%s\" [förbehållslös]"
 
-#: src/plugins/pgpcore/sgpgme.c:273
+#: src/plugins/pgpcore/sgpgme.c:459
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "Bra signatur från \"%s\" [fullständig]"
 
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:462
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "Bra signatur från \"%s\" [marginell]"
 
-#: src/plugins/pgpcore/sgpgme.c:283
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bra signatur från \"%s\""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
+#: src/plugins/pgpcore/sgpgme.c:471 src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "Nyckel 0x%s finns inte tillgänglig för att verifiera denna signatur"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:477
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\"."
 
-#: src/plugins/pgpcore/sgpgme.c:294
+#: src/plugins/pgpcore/sgpgme.c:480
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "Bra signatur från \"%s\", men nyckeln har utgått"
 
-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:483
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "Bra signatur från \"%s\", men nyckeln har makulerats"
 
-#: src/plugins/pgpcore/sgpgme.c:300
+#: src/plugins/pgpcore/sgpgme.c:486
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "Ogiltig signatur från \"%s\"."
 
-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:493
 msgid "The signature has not been checked"
 msgstr "Signaturen har inte kontrollerats"
 
-#: src/plugins/pgpcore/sgpgme.c:330
+#: src/plugins/pgpcore/sgpgme.c:516
 msgid "Error checking signature: no status\n"
 msgstr "Fel vid signaturkontroll: ingen status\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:535
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "Fel vid signaturkontroll: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:553
 #, 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:372
+#: src/plugins/pgpcore/sgpgme.c:559
 #, 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:377
+#: src/plugins/pgpcore/sgpgme.c:564
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "Utgången nyckel uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:569
 #, 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:387
+#: src/plugins/pgpcore/sgpgme.c:574
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "Spärrad nyckel-uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:392
+#: src/plugins/pgpcore/sgpgme.c:579
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "DÅLIG signatur från \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:405
+#: src/plugins/pgpcore/sgpgme.c:591
 #, c-format
-msgid "uid \"%s\" (Validity: %s)\n"
-msgstr "uid \"%s\" (Giltighet %s)\n"
+msgid "                    uid \"%s\" (Validity: %s)\n"
+msgstr "                    uid \"%s\" (Giltighet %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:593
 msgid "Revoked"
 msgstr "Spärrad"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:598
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "Ägartillit: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:413
+#: src/plugins/pgpcore/sgpgme.c:599
 msgid "No key!"
 msgstr "Ingen nyckel!"
 
-#: src/plugins/pgpcore/sgpgme.c:415
+#: src/plugins/pgpcore/sgpgme.c:601
 msgid "Primary key fingerprint:"
 msgstr "Primärnyckel fingeravtryck:"
 
-#: src/plugins/pgpcore/sgpgme.c:433
+#: src/plugins/pgpcore/sgpgme.c:619
 #, 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:439
+#: src/plugins/pgpcore/sgpgme.c:625
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Verifierad signerares adress är \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:473
+#: src/plugins/pgpcore/sgpgme.c:660
 #, 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:489
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Kunde inte initiera data, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:855
 msgid "Secret key specification is ambiguous"
 msgstr "Hemlig nyckels specifikation är inte entydig"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:865
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Hemlig nyckel kunde inte hittas (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:689
+#: src/plugins/pgpcore/sgpgme.c:878
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fel vid inställning av hemlig nyckel %s"
 
-#: src/plugins/pgpcore/sgpgme.c:782
+#: src/plugins/pgpcore/sgpgme.c:971
 #, 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:788
+#: src/plugins/pgpcore/sgpgme.c:977
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12422,12 +12943,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:796
+#: src/plugins/pgpcore/sgpgme.c:985
 #, 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:812
+#: src/plugins/pgpcore/sgpgme.c:1001
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12435,7 +12956,7 @@ msgstr ""
 "GnuPG är inte korrekt installerat eller behöver uppgraderas.\n"
 "OpenPGP-stöd avstängt."
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:1078
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
@@ -12443,11 +12964,11 @@ msgstr ""
 "Du måste spara kontots information med \"OK\" innan du kan generera ett "
 "nyckelpar.\n"
 
-#: src/plugins/pgpcore/sgpgme.c:894
+#: src/plugins/pgpcore/sgpgme.c:1083
 msgid "No PGP key found"
 msgstr "Ingen PGP-nyckel hittad"
 
-#: src/plugins/pgpcore/sgpgme.c:895
+#: src/plugins/pgpcore/sgpgme.c:1084
 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"
@@ -12457,12 +12978,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:984 src/plugins/pgpcore/sgpgme.c:1006
+#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Kunde inte generera ett nytt nyckelpar: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:994
+#: src/plugins/pgpcore/sgpgme.c:1184
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12470,11 +12991,11 @@ msgstr ""
 "Genererar ditt nya nyckelpar... Flytta runt muspekaren för att hjälpa till "
 "att generera entropi..."
 
-#: src/plugins/pgpcore/sgpgme.c:1012
+#: src/plugins/pgpcore/sgpgme.c:1202
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Kunde inte generera nytt nyckelpar: okänt fel"
 
-#: src/plugins/pgpcore/sgpgme.c:1016
+#: src/plugins/pgpcore/sgpgme.c:1206
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12487,62 +13008,41 @@ msgstr ""
 "\n"
 "Vill du exportera det till en nyckelserver?"
 
-#: src/plugins/pgpcore/sgpgme.c:1020
+#: src/plugins/pgpcore/sgpgme.c:1210
 msgid "Key generated"
 msgstr "Nyckel genererad"
 
-#: src/plugins/pgpcore/sgpgme.c:1096
+#: src/plugins/pgpcore/sgpgme.c:1286
 msgid "Key exported."
 msgstr "Nyckel exporterad."
 
-#: src/plugins/pgpcore/sgpgme.c:1098
+#: src/plugins/pgpcore/sgpgme.c:1288
 msgid "Couldn't export key."
 msgstr "Kunde inte exportera nyckel."
 
-#: src/plugins/pgpinline/pgpinline.c:156
-msgid "Incorrect part"
-msgstr "Felaktig del"
-
-#: src/plugins/pgpinline/pgpinline.c:160
-msgid "Not a text part"
-msgstr "Inte en textdel"
+#: src/plugins/pgpinline/pgpinline.c:385
+msgid "Couldn't parse mime part."
+msgstr "Kunde inte tolka mime-del."
 
-#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
+#: src/plugins/pgpinline/pgpinline.c:392
 msgid "Couldn't get text data."
 msgstr "Kunde inte hämta textdata."
 
-#: src/plugins/pgpinline/pgpinline.c:189
-msgid "Couldn't convert text data to any sane charset."
-msgstr "Kunde inte konvertera text-data till någon vettig teckenuppsättning."
-
-#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
-#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
-#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
-#: src/plugins/smime/smime.c:418
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "Kunde inte initiera GPG-sammanhang, %s"
-
-#: src/plugins/pgpinline/pgpinline.c:316
-msgid "Couldn't parse mime part."
-msgstr "Kunde inte tolka mime-del."
-
-#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
+#: src/plugins/pgpinline/pgpinline.c:423 src/plugins/pgpmime/pgpmime.c:262
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Kunde inte öppna dekrypterad fil %s"
 
-#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
-#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
-#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
-#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#: src/plugins/pgpinline/pgpinline.c:442 src/plugins/pgpinline/pgpinline.c:451
+#: src/plugins/pgpinline/pgpinline.c:460 src/plugins/pgpinline/pgpinline.c:468
+#: src/plugins/pgpinline/pgpinline.c:478 src/plugins/pgpinline/pgpinline.c:487
+#: src/plugins/pgpmime/pgpmime.c:274 src/plugins/pgpmime/pgpmime.c:289
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "Kunde inte skriva till dekrypterad fil %s"
 
-#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
-#: src/plugins/pgpinline/pgpinline.c:379
+#: src/plugins/pgpinline/pgpinline.c:456 src/plugins/pgpinline/pgpinline.c:457
+#: src/plugins/pgpinline/pgpinline.c:458
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12550,53 +13050,61 @@ msgstr ""
 "\n"
 "--- Start av PGP/Infoga-krypterat data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
-#: src/plugins/pgpinline/pgpinline.c:397
+#: 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 "--- Slut på PGP/Infoga-krypterat data ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
+#: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpmime/pgpmime.c:302
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "Kunde inte stänga dekrypterad fil %s"
 
-#: src/plugins/pgpinline/pgpinline.c:428
+#: src/plugins/pgpinline/pgpinline.c:509
 msgid "Couldn't scan decrypted file."
 msgstr "Kunde inte läsa dekryptera fil."
 
-#: src/plugins/pgpinline/pgpinline.c:436
+#: src/plugins/pgpinline/pgpinline.c:518
 msgid "Couldn't scan decrypted file parts."
 msgstr "Kunde inte läsa dekrypterade fildelar."
 
-#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
+#: src/plugins/pgpinline/pgpinline.c:575 src/plugins/pgpinline/pgpinline.c:770
 msgid "Malformed message"
 msgstr "Felaktigt meddelande"
 
-#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
-#: src/plugins/pgpmime/pgpmime.c:696
+#: src/plugins/pgpinline/pgpinline.c:586 src/plugins/pgpinline/pgpinline.c:784
+#: src/plugins/pgpmime/pgpmime.c:614
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Kunde inte skapa tillfällig fil, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
+#: src/plugins/pgpinline/pgpinline.c:601 src/plugins/pgpinline/pgpinline.c:740
+#: src/plugins/pgpinline/pgpinline.c:805 src/plugins/pgpmime/pgpmime.c:230
+#: src/plugins/pgpmime/pgpmime.c:425 src/plugins/pgpmime/pgpmime.c:569
+#: src/plugins/smime/smime.c:559
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "Kunde inte initiera GPG-sammanhang, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:625 src/plugins/pgpmime/pgpmime.c:452
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Signering av data misslyckades, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
+#: src/plugins/pgpinline/pgpinline.c:643 src/plugins/pgpmime/pgpmime.c:479
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Signering av data misslyckades på grund av ogiltig signerare: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
+#: src/plugins/pgpinline/pgpinline.c:652 src/plugins/pgpmime/pgpmime.c:488
 msgid "Data signing failed, no results."
 msgstr "Signering av data misslyckades, inga resultat."
 
-#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
+#: src/plugins/pgpinline/pgpinline.c:662 src/plugins/pgpmime/pgpmime.c:499
 msgid "Data signing failed, no contents."
 msgstr "Signering av data misslyckades, inget innehåll."
 
-#: src/plugins/pgpinline/pgpinline.c:624
+#: src/plugins/pgpinline/pgpinline.c:706
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
@@ -12604,17 +13112,17 @@ msgstr ""
 "Vänligen notera att bilagor inte krypteras av PGP/Inline-systemet, ej heller "
 "brevhuvuden, så som Ämne."
 
-#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:580
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Kunde inte lägga till GPG-nyckel %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpinline/pgpinline.c:823 src/plugins/pgpmime/pgpmime.c:649
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Kryptering misslyckades, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:796
+#: src/plugins/pgpinline/pgpinline.c:892
 msgid "PGP/Inline"
 msgstr "PGP/Infoga"
 
@@ -12648,28 +13156,24 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:204
-msgid "Signature boundary not found."
-msgstr "Signaturavgränsare inte funnen."
-
-#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
+#: src/plugins/pgpmime/pgpmime.c:314 src/plugins/smime/smime.c:653
 msgid "Couldn't parse decrypted file."
 msgstr "Kunde inte tolka dektrypterad fil."
 
-#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
+#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/smime/smime.c:661
 msgid "Couldn't parse decrypted file parts."
 msgstr "Kunde inte tolka dekrypterade fildelar."
 
-#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
+#: src/plugins/pgpmime/pgpmime.c:369 src/plugins/pgpmime/pgpmime.c:408
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Kunde inte skapa tillfällig fil: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:599
+#: src/plugins/pgpmime/pgpmime.c:513
 msgid "OpenPGP digital signature"
 msgstr "OpenPGP digital signatur"
 
-#: src/plugins/pgpmime/pgpmime.c:622
+#: src/plugins/pgpmime/pgpmime.c:536
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
@@ -12677,7 +13181,7 @@ msgstr ""
 "Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av PGP/Mime-"
 "systemet."
 
-#: src/plugins/pgpmime/pgpmime.c:798
+#: src/plugins/pgpmime/pgpmime.c:723
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12710,38 +13214,38 @@ msgstr ""
 "\n"
 "GPGME har copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:379
-#: src/plugins/python/python_plugin.c:523
+#: src/plugins/python/python_plugin.c:380
+#: src/plugins/python/python_plugin.c:524
 msgid "Python scripts"
 msgstr "Pythonskript"
 
-#: src/plugins/python/python_plugin.c:518
+#: src/plugins/python/python_plugin.c:519
 msgid "Show Python console..."
 msgstr "Visa Python-konsol..."
 
-#: src/plugins/python/python_plugin.c:524
-#: src/plugins/rssyl/rssyl_feed_props.c:471
+#: src/plugins/python/python_plugin.c:525
+#: src/plugins/rssyl/rssyl_feed_props.c:470
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2707
-#: src/prefs_account.c:2735 src/prefs_account.c:3172 src/wizard.c:1206
-#: src/wizard.c:1626
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/plugins/python/python_plugin.c:672
-#: src/plugins/python/python_plugin.c:762
+#: src/plugins/python/python_plugin.c:635
+#: src/plugins/python/python_plugin.c:722
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:681
+#: src/plugins/python/python_plugin.c:644
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 "Misslyckades registrera kopplingspunkt för \"Compose Create\" i "
 "insticksmodulen Python"
 
-#: src/plugins/python/python_plugin.c:767
+#: src/plugins/python/python_plugin.c:727
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12830,11 +13334,11 @@ msgstr ""
 "\n"
 "Synpunkter till <berndth at gmx.de> uppskattas."
 
-#: src/plugins/python/python_plugin.c:818
+#: src/plugins/python/python_plugin.c:778
 msgid "Python integration"
 msgstr "Pythonintegrering"
 
-#: src/plugins/rssyl/old_feeds.c:90
+#: src/plugins/rssyl/old_feeds.c:92
 #, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
@@ -12898,40 +13402,40 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(tom)"
 
-#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
 msgid "Refresh all feeds"
 msgstr "Uppdatera alla flöden"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 msgid "Subscribe feed"
 msgstr "Prenumerara på flöde"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:67
+#: src/plugins/rssyl/rssyl_cb_menu.c:100
 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:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:136
 #, 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:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail 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:321
+#: src/plugins/rssyl/rssyl_cb_menu.c:359
 #, 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:322
+#: src/plugins/rssyl/rssyl_cb_menu.c:360
 msgid "Remove feed tree"
 msgstr "Ta bort flödesmapp"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_cb_menu.c:395
 msgid "Select an OPML file"
 msgstr "Välj en OPML-fil"
 
@@ -12975,52 +13479,52 @@ msgstr "RSSyl: Kunde inte behandla flöde vid '%s'\n"
 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:270
+#: src/plugins/rssyl/rssyl_feed_props.c:269
 msgid "HTTP Basic authentication"
 msgstr "HTTP Enkel autentisering"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:292
+#: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "Använd standard uppdateringsintervall"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:304
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
 msgstr "Behåll gamla objekt"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:310
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
 msgstr "_Trimma"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:311
 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:315
+#: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "Hämta kommentarer om möjligt"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:335
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Always mark it as new"
 msgstr "Markera alltid som ny"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:336
 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:339
+#: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Never mark it as new"
 msgstr "Markera aldrig som ny"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:344
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 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:351
+#: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Ignore title rename"
 msgstr "Ignorera byte av titel"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -13028,54 +13532,50 @@ 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:360
-#: src/plugins/vcalendar/vcal_prefs.c:593
-msgid "Verify SSL/TLS certificate validity"
-msgstr "Verifiera SSL/TLS-certifikatets giltighet"
+#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/vcalendar/vcal_prefs.c:594
+msgid "Verify TLS certificate validity"
+msgstr "Verifiera TLS-certifikatets giltighet"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:380
+#: src/plugins/rssyl/rssyl_feed_props.c:379
 msgid "User name"
 msgstr "Användarnamn"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "Source URL"
 msgstr "Käll-URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:406
+#: src/plugins/rssyl/rssyl_feed_props.c:405
 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:414
-#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: 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
 msgid "days"
 msgstr "dagar"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:415
+#: src/plugins/rssyl/rssyl_feed_props.c:414
 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:439
+#: src/plugins/rssyl/rssyl_feed_props.c:438
 msgid "If an item changes"
 msgstr "Om ett objekt förändras"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:444
+#: src/plugins/rssyl/rssyl_feed_props.c:443
 msgid "Items"
 msgstr "Objekt"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:457
+#: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Refresh interval"
 msgstr "Uppdateringsintervall"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:465
+#: src/plugins/rssyl/rssyl_feed_props.c:464
 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:517
-msgid "_OK"
-msgstr "_OK"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:525
+#: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "Set feed properties"
 msgstr "Ställ egenskaper för flöde"
 
@@ -13146,8 +13646,8 @@ msgid "Refresh all feeds on application start"
 msgstr "Uppdatera alla flöden vid applikationsstart"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-msgid "Verify SSL/TLS certificates validity for new feeds"
-msgstr "Verifiera SSL/TLS-certifikatens giltighet för nya flöden"
+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
 msgid "Path to cookies file"
@@ -13178,7 +13678,7 @@ msgstr "Prenumerera på nytt flöde?"
 msgid "Feed folder:"
 msgstr "Földesmapp:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
@@ -13186,17 +13686,17 @@ 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:77
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
 msgid "_Edit feed properties after subscribing"
 msgstr "R_edigera flödesegenskaper efter prenumerering"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:107
+#: src/plugins/rssyl/rssyl_update_comments.c:109
 #, 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:1624
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Behörighet krävs)"
 
@@ -13205,7 +13705,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Förbjuden)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1630
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Hittades inte)"
 
@@ -13275,7 +13775,7 @@ msgstr ""
 "Intern problem vid uppgradering av lagringsformatet. Detta skall inte hända. "
 "Var vänlig och rapportera detta, med debugutdata bifogat.\n"
 
-#: src/plugins/smime/plugin.c:59
+#: src/plugins/smime/plugin.c:61
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
@@ -13312,24 +13812,24 @@ msgstr ""
 "\n"
 "GPGME har copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/smime/smime.c:426
+#: src/plugins/smime/smime.c:567
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "Kunde inte ställa in GPG-protokoll, %s"
 
-#: src/plugins/smime/smime.c:454
+#: src/plugins/smime/smime.c:603
 msgid "Couldn't open temporary file"
 msgstr "Kunde inte öppna tillfällig fil"
 
-#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
+#: src/plugins/smime/smime.c:615 src/plugins/smime/smime.c:631
 msgid "Couldn't write to temporary file"
 msgstr "Kunde inte skriva till tillfällig fil"
 
-#: src/plugins/smime/smime.c:491
+#: src/plugins/smime/smime.c:643
 msgid "Couldn't close temporary file"
 msgstr "Kunde inte stänga tillfällig fil"
 
-#: src/plugins/smime/smime.c:714
+#: src/plugins/smime/smime.c:867
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
@@ -13337,21 +13837,21 @@ msgstr ""
 "Vänligen notera att brevhuvuden, så som Ämne, inte krypteras av S/MIME-"
 "systemet."
 
-#: src/plugins/spam_report/spam_report.c:307
+#: src/plugins/spam_report/spam_report.c:312
 msgid "Reporting spam..."
 msgstr "Rapporterar skräppost..."
 
-#: src/plugins/spam_report/spam_report.c:342
+#: src/plugins/spam_report/spam_report.c:347
 msgid "Report spam online..."
 msgstr "Rapportera skräppost online..."
 
-#: src/plugins/spam_report/spam_report.c:353
-#: src/plugins/spam_report/spam_report.c:391
+#: src/plugins/spam_report/spam_report.c:358
+#: src/plugins/spam_report/spam_report.c:396
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "Skräppostrapportering"
 
-#: src/plugins/spam_report/spam_report.c:396
+#: src/plugins/spam_report/spam_report.c:401
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13367,7 +13867,7 @@ msgstr ""
 " * spamcop.net\n"
 " * nomineringssystemet på lists.debian.org"
 
-#: src/plugins/spam_report/spam_report.c:421
+#: src/plugins/spam_report/spam_report.c:426
 msgid "Spam reporting"
 msgstr "Skräppostrapportering"
 
@@ -13375,16 +13875,17 @@ msgstr "Skräppostrapportering"
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/plugins/spam_report/spam_report_prefs.c:169
+#: src/plugins/spam_report/spam_report_prefs.c:167
 msgid "Forward to:"
 msgstr "Vidarebefordra till:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
+#: src/plugins/spam_report/spam_report_prefs.c:181 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_gtk.c:674
+#: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -13423,17 +13924,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:561
+#: src/plugins/spamassassin/spamassassin.c:565
 msgid "Failed to get username"
 msgstr "Kunde inte hämta användarnamn"
 
-#: src/plugins/spamassassin/spamassassin.c:578
+#: src/plugins/spamassassin/spamassassin.c:582
 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:612
+#: src/plugins/spamassassin/spamassassin.c:616
 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 "
@@ -13488,39 +13989,39 @@ msgstr "Transport"
 msgid "Type of transport"
 msgstr "Transporttyp"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:310
+#: src/plugins/spamassassin/spamassassin_gtk.c:306
 msgid "User"
 msgstr "Användare"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:323
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "User to use with spamd server"
 msgstr "Användare för spamdservern"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:325
+#: src/plugins/spamassassin/spamassassin_gtk.c:319
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:343
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
 msgstr "Datornamn eller IP-adress för spamd-server"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:354
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
 msgid "Port of spamd server"
 msgstr "Spamdserverns port"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:360
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
 msgstr "Sökväg till Unix socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:359
 msgid "Use compression"
 msgstr "Välj komprimering"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:371
+#: src/plugins/spamassassin/spamassassin_gtk.c:363
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr "Aktivera kompression om spamd använder det, inaktivera annars."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:406
+#: src/plugins/spamassassin/spamassassin_gtk.c:398
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13541,29 +14042,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:131
-#: src/plugins/tnef_parse/tnef_parse.c:138
+#: src/plugins/tnef_parse/tnef_parse.c:134
+#: src/plugins/tnef_parse/tnef_parse.c:142
 msgid "Failed to write the part data."
 msgstr "Misslyckades att skriva del-datan."
 
-#: src/plugins/tnef_parse/tnef_parse.c:183
+#: src/plugins/tnef_parse/tnef_parse.c:187
 msgid "Failed to parse VCalendar data."
 msgstr "Misslyckades att tolka VCalendar-data."
 
-#: src/plugins/tnef_parse/tnef_parse.c:222
+#: src/plugins/tnef_parse/tnef_parse.c:226
 msgid "Failed to parse VTask data."
 msgstr "Misslyckade att tolka VTask-data."
 
-#: src/plugins/tnef_parse/tnef_parse.c:274
+#: src/plugins/tnef_parse/tnef_parse.c:278
 msgid "Failed to parse VCard data."
 msgstr "Misslyckades att tolka VCard-data."
 
-#: src/plugins/tnef_parse/tnef_parse.c:414
-#: src/plugins/tnef_parse/tnef_parse.c:438
+#: src/plugins/tnef_parse/tnef_parse.c:418
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid "TNEF Parser"
 msgstr "TNEF-tolk"
 
-#: src/plugins/tnef_parse/tnef_parse.c:443
+#: src/plugins/tnef_parse/tnef_parse.c:447
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13576,115 +14077,115 @@ msgstr ""
 "Insticksmodulen använder sig av Ytnef-biblioteket, som är copyright "
 "2002-2007 Randall Hand <yerase at yerot.com>"
 
-#: src/plugins/vcalendar/common-views.c:62
+#: src/plugins/vcalendar/common-views.c:61
 msgid "_Edit this meeting..."
 msgstr "Modifiera detta möte..."
 
-#: src/plugins/vcalendar/common-views.c:63
+#: src/plugins/vcalendar/common-views.c:62
 msgid "_Cancel this meeting..."
 msgstr "Ställ in möte..."
 
-#: src/plugins/vcalendar/common-views.c:65
+#: src/plugins/vcalendar/common-views.c:64
 msgid "_Create new meeting..."
 msgstr "Skapa nytt möte..."
 
-#: src/plugins/vcalendar/common-views.c:67
+#: src/plugins/vcalendar/common-views.c:66
 msgid "_Go to today"
 msgstr "_Gå till idag"
 
-#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:599 src/plugins/vcalendar/month-view.c:688
 msgid "Start"
 msgstr "Start"
 
-#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:701
 msgid "Show"
 msgstr "Visa"
 
-#: src/plugins/vcalendar/month-view.c:109
+#: src/plugins/vcalendar/month-view.c:108
 msgid "Monday"
 msgstr "måndag"
 
-#: src/plugins/vcalendar/month-view.c:110
+#: src/plugins/vcalendar/month-view.c:109
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: src/plugins/vcalendar/month-view.c:111
+#: src/plugins/vcalendar/month-view.c:110
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: src/plugins/vcalendar/month-view.c:112
+#: src/plugins/vcalendar/month-view.c:111
 msgid "Thursday"
 msgstr "torsdag"
 
-#: src/plugins/vcalendar/month-view.c:113
+#: src/plugins/vcalendar/month-view.c:112
 msgid "Friday"
 msgstr "fredag"
 
-#: src/plugins/vcalendar/month-view.c:114
+#: src/plugins/vcalendar/month-view.c:113
 msgid "Saturday"
 msgstr "lördag"
 
-#: src/plugins/vcalendar/month-view.c:115
+#: src/plugins/vcalendar/month-view.c:114
 msgid "Sunday"
 msgstr "söndag"
 
-#: src/plugins/vcalendar/month-view.c:118
+#: src/plugins/vcalendar/month-view.c:117
 msgid "January"
 msgstr "januari"
 
-#: src/plugins/vcalendar/month-view.c:119
+#: src/plugins/vcalendar/month-view.c:118
 msgid "February"
 msgstr "februari"
 
-#: src/plugins/vcalendar/month-view.c:120
+#: src/plugins/vcalendar/month-view.c:119
 msgid "March"
 msgstr "mars"
 
-#: src/plugins/vcalendar/month-view.c:121
+#: src/plugins/vcalendar/month-view.c:120
 msgid "April"
 msgstr "april"
 
-#: src/plugins/vcalendar/month-view.c:122
+#: src/plugins/vcalendar/month-view.c:121
 msgid "May"
 msgstr "maj"
 
-#: src/plugins/vcalendar/month-view.c:123
+#: src/plugins/vcalendar/month-view.c:122
 msgid "June"
 msgstr "juni"
 
-#: src/plugins/vcalendar/month-view.c:124
+#: src/plugins/vcalendar/month-view.c:123
 msgid "July"
 msgstr "juli"
 
-#: src/plugins/vcalendar/month-view.c:125
+#: src/plugins/vcalendar/month-view.c:124
 msgid "August"
 msgstr "augusti"
 
-#: src/plugins/vcalendar/month-view.c:126
+#: src/plugins/vcalendar/month-view.c:125
 msgid "September"
 msgstr "september"
 
-#: src/plugins/vcalendar/month-view.c:127
+#: src/plugins/vcalendar/month-view.c:126
 msgid "October"
 msgstr "oktober"
 
-#: src/plugins/vcalendar/month-view.c:128
+#: src/plugins/vcalendar/month-view.c:127
 msgid "November"
 msgstr "november"
 
-#: src/plugins/vcalendar/month-view.c:129
+#: src/plugins/vcalendar/month-view.c:128
 msgid "December"
 msgstr "december"
 
-#: src/plugins/vcalendar/month-view.c:798
+#: src/plugins/vcalendar/month-view.c:789
 msgid "Week number"
 msgstr "Veckonummer"
 
-#: src/plugins/vcalendar/month-view.c:889
+#: src/plugins/vcalendar/month-view.c:874
 msgid "Previous month"
 msgstr "Föregående månad"
 
-#: src/plugins/vcalendar/month-view.c:909
+#: src/plugins/vcalendar/month-view.c:893
 msgid "Next month"
 msgstr "Nästa månad"
 
@@ -13722,75 +14223,75 @@ msgstr ""
 msgid "Calendar"
 msgstr "Kalender"
 
-#: src/plugins/vcalendar/vcalendar.c:100
+#: src/plugins/vcalendar/vcalendar.c:97
 msgid "Create meeting from message..."
 msgstr "Skapa möte från meddelande..."
 
-#: src/plugins/vcalendar/vcalendar.c:120
+#: src/plugins/vcalendar/vcalendar.c:117
 #, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "Du är på väg att skapa %d möten, ett efter ett. Vill du fortsätta?"
 
-#: src/plugins/vcalendar/vcalendar.c:140
+#: src/plugins/vcalendar/vcalendar.c:137
 msgid "Creating meeting..."
 msgstr "Skapar möte..."
 
-#: src/plugins/vcalendar/vcalendar.c:159
+#: src/plugins/vcalendar/vcalendar.c:156
 msgid "no subject"
 msgstr "inget ämne"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:382
 msgid "Accept"
 msgstr "Acceptera"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:383
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: src/plugins/vcalendar/vcalendar.c:387
+#: src/plugins/vcalendar/vcalendar.c:384
 msgid "Decline"
 msgstr "Avvisa"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:473
 msgid "You have a Todo item."
 msgstr "Du har en Att-Göra-post."
 
-#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
-#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
-#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
+#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:712
 msgid "Details follow:"
 msgstr "Detaljer följer:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:480
 msgid "You have created a meeting."
 msgstr "Du har skapat ett möte."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:485
 msgid "You have been invited to a meeting."
 msgstr "Du har blivit inbjuden till ett möte."
 
-#: src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:493
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "Ett möte som du har blivit inbjuden till har blivit inställt."
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:502
 msgid "You have been forwarded an appointment."
 msgstr "Ett möte har blivit vidarebefordrat till dig."
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:556
 msgid "(this event recurs)"
 msgstr "(denna händelse återkommer)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:562
 msgid "(this event is part of a recurring event)"
 msgstr "(denna händelse är en del av en återkommande händelse)"
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:711
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "Du har fått ett svar på ett okänt mötesförslag."
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:715
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13799,15 +14300,15 @@ msgstr ""
 "Du har fått ett svar på ett mötesförslag.\n"
 "%s har %s mötet var detaljer följer:"
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:796
 msgid "Error - could not get the calendar MIME part."
 msgstr "Fel - Kunde inte hämta MIME-delen av kalendern."
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:803
 msgid "Error - no calendar part found."
 msgstr "Fel - Ingen kalenderdel hittad."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:817
 msgid "Error - Unknown calendar component type."
 msgstr "Fel - Okänd typ på kalenderkomponenten."
 
@@ -13839,124 +14340,124 @@ msgstr ""
 msgid "Reply anyway"
 msgstr "Svara ändå"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Answer"
 msgstr "Svar"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Edit meeting..."
 msgstr "Redigera möte..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Cancel meeting..."
 msgstr "Ställ in möte..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "Launch website"
 msgstr "Starta webbplats"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1199
 msgid "You are already busy at this time."
 msgstr "Du är redan upptagen vid denna tidpunkt."
 
-#: src/plugins/vcalendar/vcalendar.c:1234
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
 msgid "Event:"
 msgstr "Händelse:"
 
-#: src/plugins/vcalendar/vcalendar.c:1235
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
+#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
 msgid "Organizer:"
 msgstr "Organisatör:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
+#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1611
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1621
 msgid "Location:"
 msgstr "Plats:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Starting:"
 msgstr "Startar:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Ending:"
 msgstr "Slutar:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
+#: src/plugins/vcalendar/vcalendar.c:1245
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
 msgid "Attendees:"
 msgstr "Närvarande:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1247
 msgid "Action:"
 msgstr "Aktivitet:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Nytt möte..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "_Exportera kalender..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "_Prenumerera på Webcal..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "Byt namn..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Updatera pren_umerationer"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "_Listvy"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Veckovy"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "_Månadsvy"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Möten"
 
-#: src/plugins/vcalendar/vcal_folder.c:1502
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "i det förflutna"
 
-#: src/plugins/vcalendar/vcal_folder.c:1505
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "idag"
 
-#: src/plugins/vcalendar/vcal_folder.c:1508
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "imorgon"
 
-#: src/plugins/vcalendar/vcal_folder.c:1511
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "den här veckan"
 
-#: src/plugins/vcalendar/vcal_folder.c:1514
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "senare"
 
-#: src/plugins/vcalendar/vcal_folder.c:1518
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -13965,21 +14466,21 @@ msgstr ""
 "\n"
 "Detta är aktiviteterna som är planerade %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1615
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, 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:1627
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Obehörig)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1633
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Fel: %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1815
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13992,7 +14493,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1846
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14003,50 +14504,50 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1877
-#: src/plugins/vcalendar/vcal_folder.c:1880
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "Kunde inte skapa mapp %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1931
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "Hämtar kalender för %s..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1932
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "ny prenumeration"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1939
 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:1955
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Prenumerera på Webcal"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "Mata in Webcal URL-en:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1967
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "Kunde inte tolka URLen."
 
-#: src/plugins/vcalendar/vcal_folder.c:1995
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Vill du verkligen avbryta prenumerationen?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1996
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Ta bort prenumeration"
 
@@ -14114,23 +14615,23 @@ msgstr "Avvisad: "
 msgid "Tentatively Accepted: "
 msgstr "Preliminärt Accepterat: "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:320
 msgid "Individual"
 msgstr "Individ"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:322
 msgid "Resource"
 msgstr "Resurs"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
 msgid "Room"
 msgstr "Rum"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:336
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -14138,62 +14639,62 @@ msgstr ""
 "Följande person(er) är upptagna vid tiden för ditt planerade möte:\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:830
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:916
 msgid "You"
 msgstr "Du"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:742
 msgid "You are busy at the time of your planned meeting"
 msgstr "Du är upptagen vid tiden för det planerade mötet"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:744
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s är upptagen vid tillfället för ditt planerade möte"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:746
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d timme tidigare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:748
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d timmar tidigare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:750
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d timmar och %d minuter tidigare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:752
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d minuter tidigare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid "%d hour later"
 msgstr "%d timmar senare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid "%d hours later"
 msgstr "%d timmar senare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d timmar och %d minuter senare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:763
 #, c-format
 msgid "%d minutes later"
 msgstr "%d minuter senare"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:769
 #, c-format
 msgid ""
 "\n"
@@ -14204,7 +14705,7 @@ msgstr ""
 "\n"
 "Alla skulle vara tillgängliga %s eller %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:771
 #, c-format
 msgid ""
 "\n"
@@ -14215,7 +14716,7 @@ msgstr ""
 "\n"
 "Alla skulle vara tillgängliga %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 msgid ""
 "\n"
 "\n"
@@ -14227,73 +14728,73 @@ msgstr ""
 "Det är inte möjligt att ha detta möte med alla i föregående eller nästa 6 "
 "timmar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:778
 #, c-format
 msgid "would be available %s or %s"
 msgstr "skulle vara tillgänglig %s eller %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
 #, c-format
 msgid "would be available %s"
 msgstr "skulle vara tillgänglig %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:782
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:843
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:913
 msgid "not available"
 msgstr "inte tillgänglig"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", men skulle vara tillgänglig %s eller %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
 #, c-format
 msgid ", but would be available %s."
 msgstr ", men skulle vara tillgänglig %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", och är inte tillgänglig föregående eller dom 6 kommande timmarna."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:846
 msgid "available"
 msgstr "tillgänglig"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:848
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1105
 msgid "Free/busy retrieval failed"
 msgstr "Hämtning av ledig/upptagen misslyckades"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available"
 msgstr "Alla är inte tillgängliga"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931
 msgid "Send anyway"
 msgstr "Skicka ändå"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:943
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "Alla är inte tillgängliga. Se verktygstipsen för mer information..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Hämtar planering för %s...."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1114
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1127
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1134
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1142
 msgid "Everyone is available."
 msgstr "Alla är tillgängliga."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1143
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14301,7 +14802,7 @@ msgstr ""
 "Alla verkar vara tillgängliga, men en del ledig/upptagen-information "
 "misslyckades att hämtas."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1315
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14309,61 +14810,61 @@ msgstr ""
 "Kunde inte skicka mötesinbjudan.\n"
 "Kontrollera mottagarna."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1393
 msgid "Save & Send"
 msgstr "Spara & Skicka"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1394
 msgid "Check availability"
 msgstr "Kontrollera tillgänglighet"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1488
 msgid "Starts at:"
 msgstr "Startar vid:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1518 src/prefs_matcher.c:768
 msgid "on:"
 msgstr "på:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1512
 msgid "Ends at:"
 msgstr "Slutar vid:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1553
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1555
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Redigera möte"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1610
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1634
 msgid "Time:"
 msgstr "Tid:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1757
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1760
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Kommande aktivitet: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1772
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14380,120 +14881,120 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "Påminn mig om %d minut"
 msgstr[1] "Påminn mig om %d minuter"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1915
 msgid "Empty calendar"
 msgstr "Töm kalender"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1916
 msgid "There is nothing to export."
 msgstr "Det finns inget att exportera."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1956
 msgid "Could not export the calendar."
 msgstr "Kunde inte exportera kalendern."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1979
 msgid "Export calendar to ICS"
 msgstr "Exportera kalender till ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1996
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "Kunde inte exportera kalendern till '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Could not export the freebusy info."
 msgstr "Kunde inte exportera ledig/upptagen-information."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2144
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "Kunde inte exportera ledig/upptagen till '%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:301
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
+#: src/plugins/vcalendar/vcal_prefs.c:310
 msgid "Alert me"
 msgstr "Varna mig"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
+#: src/plugins/vcalendar/vcal_prefs.c:339
 msgid "minutes before an event"
 msgstr "minuter före en aktivitet"
 
-#: src/plugins/vcalendar/vcal_prefs.c:361
+#: src/plugins/vcalendar/vcal_prefs.c:362
 msgid "Calendar export"
 msgstr "Kalenderexport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:372
+#: src/plugins/vcalendar/vcal_prefs.c:373
 msgid "Automatically export calendar to"
 msgstr "Exportera kalender automatiskt till"
 
-#: src/plugins/vcalendar/vcal_prefs.c:381
-#: src/plugins/vcalendar/vcal_prefs.c:500
+#: 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 "Du kan exportera till en lokal fil eller URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:383
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "Specificera en lokal fil eller URL (http://server/mapp/fil.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:414
 msgid "Include Webcal subscriptions in export"
 msgstr "Inkludera Webcal-prenumerationer i export"
 
-#: src/plugins/vcalendar/vcal_prefs.c:423
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Command to run after calendar export"
 msgstr "Kommando att köra efter kalnderexport"
 
-#: src/plugins/vcalendar/vcal_prefs.c:452
+#: src/plugins/vcalendar/vcal_prefs.c:453
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "Registrera Claws kalender i XFCE's Orage clock"
 
-#: src/plugins/vcalendar/vcal_prefs.c:454
+#: src/plugins/vcalendar/vcal_prefs.c:455
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "Tillåter Orage (nyare versioner än 4.4) att se Claws-Mails kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:467
+#: src/plugins/vcalendar/vcal_prefs.c:468
 msgid "Export as GNOME shell calendar server"
 msgstr "Exportera som GNOME shell kalenderserver"
 
-#: src/plugins/vcalendar/vcal_prefs.c:469
+#: src/plugins/vcalendar/vcal_prefs.c:470
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 "Registrera D-Bus kalenderservergränssnitt för att exportera Claws Mails "
 "kalender"
 
-#: src/plugins/vcalendar/vcal_prefs.c:479
+#: src/plugins/vcalendar/vcal_prefs.c:480
 msgid "Free/Busy information"
 msgstr "Ledig/Upptagen information"
 
-#: src/plugins/vcalendar/vcal_prefs.c:491
+#: src/plugins/vcalendar/vcal_prefs.c:492
 msgid "Automatically export free/busy status to"
 msgstr "Exportera automatiskt ledig/upptagen-status till"
 
-#: src/plugins/vcalendar/vcal_prefs.c:502
+#: src/plugins/vcalendar/vcal_prefs.c:503
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "Specificera en lokal fil eller URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:532
+#: src/plugins/vcalendar/vcal_prefs.c:533
 msgid "Command to run after free/busy status export"
 msgstr "Kommando att köra efter export av ledig/upptagen-status"
 
-#: src/plugins/vcalendar/vcal_prefs.c:559
+#: src/plugins/vcalendar/vcal_prefs.c:560
 msgid "Get free/busy status of others from"
 msgstr "Hämta andras ledig/upptagen-status från"
 
-#: src/plugins/vcalendar/vcal_prefs.c:567
+#: src/plugins/vcalendar/vcal_prefs.c:568
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14502,9 +15003,9 @@ msgstr ""
 "Specificera en lokal fil eller URL (http://server/sökväg/fil.ifb). Använd %u "
 "för vänsterdelen av emailadressen, %d för domänen"
 
-#: src/plugins/vcalendar/vcal_prefs.c:581
-msgid "SSL/TLS options"
-msgstr "SSL/TLS-alternativ"
+#: src/plugins/vcalendar/vcal_prefs.c:582
+msgid "TLS options"
+msgstr "TLS-alternativ"
 
 #: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
@@ -14518,95 +15019,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:191 src/pop.c:218
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "POP protokollfel\n"
 
-#: src/pop.c:264
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ogiltigt UIDL-svar: %s\n"
 
-#: src/pop.c:843
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: Tar bort utgånget meddelande %d [%s]\n"
 
-#: src/pop.c:859
+#: src/pop.c:890
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: Hoppar över meddelande %d [%s] (%d byte)\n"
 
-#: src/pop.c:891
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "brevlådan är låst\n"
 
-#: src/pop.c:894
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "Tidsgräns för session nådd\n"
 
-#: src/pop.c:913
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "kommandot stöds inte\n"
 
-#: src/pop.c:918
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "fel uppstod i POP-session\n"
 
-#: src/pop.c:1113
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "TOP-kommandot stöds ej\n"
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
-#: src/wizard.c:1501
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "Server för diskussionsgrupper (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Inget (endast SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Använd som standard"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Auto-konfiguration"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14614,77 +15115,81 @@ msgstr ""
 "Varning: denna version av Claws-Mail\n"
 "har byggts utan IMAP- och Diskussionsgrupps-stöd."
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Denna server kräver autentisering"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Autentisera vid kontakt"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Server för diskussionsgrupper"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Lokal brevlåda"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "SMTP-server (skicka)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "Använd mail-kommandot istället för SMTP-server"
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "kommando för att skicka e-post"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Standardinkorg"
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ofiltrerade meddelande kommer sparas i denna mapp"
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
-msgstr "Använd säker autentisering (APOP)"
+#: src/prefs_account.c:1626
+msgid "Authenticate before POP connection"
+msgstr "Autentisera före POP-anslutning"
+
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
+msgid "Select"
+msgstr "Välj"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagar och 0 timmar : ta bort omedelbart"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Storleksgräns för mottagande"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14692,94 +15197,94 @@ 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:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal artiklar att ladda ner"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "obegränsad om 0 väljs"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Ren text"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "Mapp på IMAP server"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(vanligtvis tom)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Visa enbart prenumererade mappar"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1829
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreddseffektivt läge (förhindrar hämtning av fjärretiketter)"
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1831
 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:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Kontrollera automatiskt"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Använd globala inställningar"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Kolla efter ny e-post varje"
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillåt insticksmoduler filtrera vid mottagning"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1906
 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:1894 src/prefs_customheader.c:210
-#: src/prefs_matcher.c:634 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
+#: src/prefs_account.c:1996 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:1896
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "Generera Meddelande-ID"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "Skicka kontots email-adress i Meddelande-ID"
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Lägg till huvud för användaragent"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14787,172 +15292,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:2033
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Autentisera med POP innan avsändning"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "POP autentiseringstimeout"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2235
+msgid "Authorization"
+msgstr "Autentisering"
+
+#: src/prefs_account.c:2252
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Välj OAuth2 e-postleverantör"
+
+#: src/prefs_account.c:2292
+msgid "Client ID"
+msgstr "KlientID"
+
+#: src/prefs_account.c:2303
+msgid "Client secret"
+msgstr "Klienthemlighet"
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Skaffa behörighetskod"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr "Öppna standardwebbläsare med förfrågan"
+
+#: src/prefs_account.c:2339
+msgid "Copy link"
+msgstr "Kopiera länk"
+
+#: src/prefs_account.c:2352
+msgid "Authorization code"
+msgstr "Autentiseringskod"
+
+#: src/prefs_account.c:2361
+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
+msgid "Complete authorization"
+msgstr "Fullständig autentisering"
+
+#: src/prefs_account.c:2372
+msgid "Authorize"
+msgstr "Autentisera"
+
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "Infoga signatur automatiskt"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Kommando utdata"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "Ordlistor för stavningskontroll"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
-#: src/prefs_spelling.c:162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
+#: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Standardordlista"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
-#: src/prefs_spelling.c:174
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "Standard alternativordlista"
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
-#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: 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:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
-#: src/toolbar.c:490
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/toolbar.c:500
 msgid "Reply"
 msgstr "Svara"
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
-#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2711 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:2440
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Standard sekretesssystem"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "Signera alltid meddelanden"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "Kryptera alltid meddelanden"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr "Signera alltid meddelanden som svar på ett signerat meddelande"
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Kryptera alltid meddelanden som svar på ett krypterat meddelande"
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2797
 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:2481
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Spara skickade krypterade meddelanden i klartext"
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
-msgid "Don't use SSL/TLS"
-msgstr "Använd inte SSL/TLS"
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+msgid "Don't use TLS"
+msgstr "Använd inte TLS"
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
-msgid "Use SSL/TLS"
-msgstr "Använd SSL/TLS"
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
+msgid "Use TLS"
+msgstr "Använd TLS"
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Använd STARTTLS-kommando för att starta krypterad session"
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account.c:2685
-msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
-msgstr "Använd inte SSL/TLS (men, om nödvändigt, använd STARTTLS)"
+#: src/prefs_account.c:3003
+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:2696
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "Klientcertifikat"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Certifikat för mottagning"
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Klient-certifikat som PKCS12 eller PEM-fil"
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Certifikat för sändning"
 
-#: src/prefs_account.c:2772
-msgid "Automatically accept valid SSL/TLS certificates"
-msgstr "Acceptera giltiga SSL/TLS-certifikat automatiskt"
+#: src/prefs_account.c:3090
+msgid "Automatically accept valid TLS certificates"
+msgstr "Acceptera giltiga TLS-certifikat automatiskt"
 
-#: src/prefs_account.c:2775
-msgid "Use non-blocking SSL/TLS"
-msgstr "Använd icke-blockerande SSL/TLS"
+#: src/prefs_account.c:3093
+msgid "Use non-blocking TLS"
+msgstr "Använd icke-blockerande TLS"
 
-#: src/prefs_account.c:2787
-msgid "Turn this off if you have SSL/TLS connection problems"
-msgstr "Stäng av detta om du har SSL/TLS-anslutningsproblem"
+#: src/prefs_account.c:3105
+msgid "Turn this off if you have TLS connection problems"
+msgstr "Stäng av detta om du har TLS-anslutningsproblem"
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Använd proxyserver"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3206
 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:2890
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Använd globala proxyserverinställningar"
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Användarnamn"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Använd proxyserver för att skicka"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14961,27 +15512,27 @@ msgstr ""
 "till konfigurerad utgående server, och förbigå eventuellt konfigurerad "
 "proxyserver."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "POP-port"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "IMAP-port"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "NNTP-port"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Domännamn"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14989,238 +15540,273 @@ msgstr ""
 "Domännamnet kommer att användas i det genererade Meddelande-ID't, och vid "
 "anslutning till SMTP-servrar."
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Använd kommando för att kommunicera med server"
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3445
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markera kross-postade meddelanden som läst med färg:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Spara skickade meddelanden i"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Spara köade meddelanden i"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Lagra utkast i"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Lagra bortagna meddelande i"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "POP-server har inte angivits."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standardmapp för Inkorgen finns inte."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "IMAP-server har inte angivits."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "lokal brevlåda har inte angivits."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "e-postkommando har inte angivits."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "Användar-ID kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "Lösenord kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3676
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP användar-ID kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP-lösenord kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "domän inte specificerad."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "skickatmapp är inte vald."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "kömapp är inte vald."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "utkastmapp är inte vald."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "skräpmapp är inte vald."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Skicka"
+
+#: src/prefs_account.c:4153
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Sekretess"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoegenskaper"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Misslyckades (fel adress)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "Välj fil med signatur"
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Välj certifikatsfil"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (insticksmodulen kunde inte laddas)"
 
-#: src/prefs_actions.c:225
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "Auktorisation slutförd"
+
+#: src/prefs_account.c:6139
+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
+msgid "Authorisation NOT completed"
+msgstr "Auktorisation INTE slutförd"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "Din OAuth2 autentiseringskod har inte mottagits av Claws Mail"
+
+#: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Aktivitetskonfiguration"
 
-#: src/prefs_actions.c:252
+#: src/prefs_actions.c:253
 msgid "Menu name"
 msgstr "Menynamn"
 
-#: src/prefs_actions.c:285
+#: src/prefs_actions.c:282
 msgid "Shell command"
 msgstr "Skalkommando"
 
-#: src/prefs_actions.c:295
+#: src/prefs_actions.c:292
 msgid "Filter action"
 msgstr "Filteraktivitet"
 
-#: src/prefs_actions.c:301
+#: src/prefs_actions.c:298
 msgid "Edit filter action"
 msgstr "Redigera filteraktivitet"
 
-#: src/prefs_actions.c:329
+#: src/prefs_actions.c:326
 msgid "Append the new action above to the list"
 msgstr "Lägg till den nya aktiviteten sist i listan"
 
-#: src/prefs_actions.c:337
+#: src/prefs_actions.c:334
 msgid "Replace the selected action in list with the action above"
 msgstr "Ersätt vald aktivitet i listan med aktiviteten ovan"
 
-#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
-#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1024
-msgid "D_elete"
-msgstr "Ta bort"
-
-#: src/prefs_actions.c:347
+#: src/prefs_actions.c:342
 msgid "Delete the selected action from the list"
 msgstr "Ta bort vald aktivitet från listan"
 
-#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
+#: src/prefs_actions.c:350 src/prefs_filtering.c:485 src/prefs_template.c:330
 msgid "Clear all the input fields in the dialog"
 msgstr "Rensa alla inmatningsfält i dialogrutan"
 
-#: src/prefs_actions.c:365
+#: src/prefs_actions.c:358
 msgid "Show information on configuring actions"
 msgstr "Visa information om konfiguration av aktiviteter"
 
-#: src/prefs_actions.c:396
+#: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:356
+msgid "_Top"
+msgstr "Högs_t upp"
+
+#: src/prefs_actions.c:389
+msgid "Move the selected action to the top"
+msgstr "Flytta den valda aktiviteten överst"
+
+#: src/prefs_actions.c:399
 msgid "Move the selected action up"
 msgstr "Flytta upp vald aktivitet"
 
-#: src/prefs_actions.c:404
+#: src/prefs_actions.c:407
 msgid "Move selected action down"
 msgstr "Flytta ner vald aktivitet"
 
-#: src/prefs_actions.c:537 src/prefs_filtering_action.c:678
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
-#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
-#: src/prefs_template.c:472
+#: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
+msgid "_Bottom"
+msgstr "Längst ner"
+
+#: src/prefs_actions.c:417
+msgid "Move the selected action to the bottom"
+msgstr "Flytta den valda aktiviteten längst ner"
+
+#: src/prefs_actions.c:550 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:822 src/prefs_filtering.c:824
+#: src/prefs_filtering.c:825 src/prefs_filtering.c:935 src/prefs_matcher.c:918
+#: src/prefs_template.c:465
 msgid "(New)"
 msgstr "(Ny)"
 
-#: src/prefs_actions.c:602
+#: src/prefs_actions.c:615
 msgid "Menu name is not set."
 msgstr "Menynamn är inte angivet."
 
-#: src/prefs_actions.c:607
+#: src/prefs_actions.c:620
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Det är inte tillåtet att börja menynamnet med '/'."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:625
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Det är inte tillåtet att använda kolon ':' i menynamnet."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:644
 msgid "Menu name is too long."
 msgstr "Menynamnet är för långt."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:653
 msgid "Command-line not set."
 msgstr "Kommandorad är inte angivet."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:658
 msgid "Menu name and command are too long."
 msgstr "Menynamnet och kommandot är för långt."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:664
 #, c-format
 msgid ""
 "The command\n"
@@ -15231,139 +15817,139 @@ msgstr ""
 "%s\n"
 "har syntax fel."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:722
 msgid "Delete action"
 msgstr "Ta bort aktivitet"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:723
 msgid "Do you really want to delete this action?"
 msgstr "Vill du verkligen ta bort denna aktivitet?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:744
 msgid "Delete all actions"
 msgstr "Ta bort alla aktiviteter"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:745
 msgid "Do you really want to delete all the actions?"
 msgstr "Vill du verkligen ta bort alla dessa aktiviteter?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
-#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:913 src/prefs_actions.c:944 src/prefs_filtering.c:1491
+#: src/prefs_filtering.c:1514 src/prefs_matcher.c:2165 src/prefs_template.c:565
+#: src/prefs_template.c:590
 msgid "Entry not saved"
 msgstr "Posten sparades inte"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1505
-#: src/prefs_filtering.c:1527 src/prefs_template.c:573 src/prefs_template.c:598
+#: 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 "Posten sparades inte. Stänga ändå?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
-#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: 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
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Fortsätt redigera"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:918
 msgid "Actions list not saved"
 msgstr "Aktivitetslistan är inte sparad"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:919
 msgid "The actions list has been modified. Close anyway?"
 msgstr "Aktivitetslistan har ändrats. Stänga ändå?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:989
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\">Menynamn:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:990
 msgid "Use / in menu name to make submenus."
 msgstr "Använd '/' i menynamn för att skapa undermenyer."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:992
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Kommandorad:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:993
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Börjar med:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:994
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "för att skicka meddelandetexten eller markerad text till kommandots standard "
 "indata"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:995
 msgid "to send user provided text to command's standard input"
 msgstr "för att skicka text till kommandots standard indata"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:996
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "skicka gömd text som anges av användaren till kommandots standard indata"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:997
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Avsluta med:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:998
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "för att byta ut meddelandetexten eller markering med kommandots standard ut"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:999
 msgid "to insert command's standard output without replacing old text"
 msgstr "för att infoga kommandots standard ut utan att ersätta gammal text"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:1000
 msgid "to run command asynchronously"
 msgstr "för att köra kommando asynkront"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:1001
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Använd:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:1002
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "för filen från valt meddelande i RFC822/2822-format "
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:1003
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "för listan an filer från valda meddelanden i RFC822/2822-format"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:1004
 msgid "for the file of the selected decoded message MIME part"
 msgstr "för filen från valt avkodat meddelandes MIME-del"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:1005
 msgid "for a user provided argument"
 msgstr "för ett användarinmatat argument"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:1006
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "för ett användarinmatat dolt argument (dvs lösenord)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:1007
 msgid "for the text selection"
 msgstr "för textmarkering"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:1008
 msgid "apply filtering actions between {} to selected messages"
 msgstr "applicera filteraktivitet mellan {} för valda meddelanden"
 
 # xxxx här är jag xxxx
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:1009
 msgid "for a literal %"
 msgstr "för ett bokstavligt %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
 msgid "Actions"
 msgstr "Aktiviteter"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1020
 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."
@@ -15371,29 +15957,41 @@ msgstr ""
 "Aktivitetsfunktionen är ett sätt för användaren att köra externa kommandon "
 "för att behandla ett helt meddelande eller bara någon av dess delar."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
-#: src/prefs_template.c:1114
+#: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
+#: src/prefs_template.c:1107
 msgid "D_uplicate"
 msgstr "D_uplicera"
 
-#: src/prefs_actions.c:1208
+#: src/prefs_actions.c:1225
 msgid "Current actions"
 msgstr "Aktuella aktiviteter"
 
-#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
-#: src/prefs_filtering.c:1137
+#: src/prefs_actions.c:1312
+msgid "Entry was modified"
+msgstr "Posten har ändrats"
+
+#: src/prefs_actions.c:1313
+msgid ""
+"Opening the filter action dialog will clear current modifications of the "
+"command-line."
+msgstr ""
+"Att öppna dialogen för filteraktivitet kommer att ta bort aktuella ändringar "
+"av kommndoraden."
+
+#: src/prefs_actions.c:1324 src/prefs_filtering.c:1062
+#: src/prefs_filtering.c:1120
 msgid "Action string is not valid."
 msgstr "Aktivitetssträngen är inte giltig."
 
-#: src/prefs_common.c:239 src/prefs_quote.c:69
+#: src/prefs_common.c:238 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "Hej!\\n"
 
-#: src/prefs_common.c:317
+#: src/prefs_common.c:316
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "Den %d\\nskrev %s:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:323 src/prefs_quote.c:85
+#: 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"
@@ -15402,223 +16000,227 @@ msgstr ""
 "\\n}?t{Till: %t\\n}?c{Kopia: %c\\n}?n{Diskussionsgrupper: %n\\n}?s{Ämne: %s"
 "\\n}\\n\\n%M"
 
-#: src/prefs_common.c:456
+#: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
-#: src/prefs_compose_writing.c:126
+#: src/prefs_compose_writing.c:123
 msgid "Automatic account selection"
 msgstr "Välj konto automatiskt"
 
-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:131
 msgid "when replying"
 msgstr "vid svar"
 
-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:133
 msgid "when forwarding"
 msgstr "vid vidarebefordran"
 
-#: src/prefs_compose_writing.c:138
+#: src/prefs_compose_writing.c:135
 msgid "when re-editing"
 msgstr "vid om-redigering"
 
-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:138
 msgid "Editing"
 msgstr "Redigera"
 
-#: src/prefs_compose_writing.c:145
+#: src/prefs_compose_writing.c:142
 msgid "Automatically launch the external editor"
 msgstr "Starta automatiskt extern redigerare"
 
-#: src/prefs_compose_writing.c:153
+#: src/prefs_compose_writing.c:150
 msgid "Automatically save message to Drafts folder every"
 msgstr "Spara meddelandetext automatiskt till utkastmappen varje"
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
+#: src/prefs_compose_writing.c:159 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr "tecken"
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:170
 msgid "Even if message is to be encrypted"
 msgstr "Även om meddelandet skall krypteras"
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:177
 msgid "Undo level"
 msgstr "Ångranivå"
 
-#: src/prefs_compose_writing.c:197
+#: src/prefs_compose_writing.c:194
 msgid "Warn when inserting a file larger than"
 msgstr "Varna när infoga en fil större än"
 
-#: src/prefs_compose_writing.c:208
-msgid "KB into message body "
-msgstr "KB i meddelandet "
+#: src/prefs_compose_writing.c:205
+msgid "KiB into message body"
+msgstr "KiB i meddelandetexten"
 
-#: src/prefs_compose_writing.c:214
+#: src/prefs_compose_writing.c:211
 msgid "Replying"
 msgstr "Svara"
 
-#: src/prefs_compose_writing.c:217
+#: src/prefs_compose_writing.c:214
 msgid "Reply will quote by default"
 msgstr "Citera vid svar som standard"
 
-#: src/prefs_compose_writing.c:220
+#: src/prefs_compose_writing.c:217
 msgid "Reply button invokes mailing list reply"
 msgstr "Svaraknappen svarar till sändlista"
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:219
 msgid "Forwarding"
 msgstr "Vidarebefordra"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
+#: src/prefs_compose_writing.c:222 src/prefs_filtering_action.c:184
 msgid "Forward as attachment"
 msgstr "Vidarebefordra som bilaga"
 
-#: src/prefs_compose_writing.c:227
+#: src/prefs_compose_writing.c:224
 #, c-format
 msgid "Keep the original '%s' header when redirecting"
 msgstr "Behåll originalets brevhuvud '%s' vid omdirigering"
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:230
 msgid "When dropping files into the Compose window"
 msgstr "Vid 'släpp' av filer i redigerarfönstret"
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:239
 msgid "Ask"
 msgstr "Fråga"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:522
+#: src/prefs_compose_writing.c:240 src/toolbar.c:533
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:523
+#: src/prefs_compose_writing.c:241 src/toolbar.c:534
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:365
 msgid "Writing"
 msgstr "Skriver"
 
-#: src/prefs_customheader.c:185
+#: src/prefs_customheader.c:183
 msgid "Custom header configuration"
 msgstr "Anpassad brehuvudsinställning"
 
-#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
-#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
+#: src/prefs_customheader.c:494 src/prefs_display_header.c:588
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1649
 msgid "Header name is not set."
 msgstr "Brevhuvudsnamn är inte angivet."
 
-#: src/prefs_customheader.c:514
+#: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Ett kolon (:) tillåts inte i en anpassad rubrik."
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Detta brevhuvudnamn är inte tillåtet i ett anpassat brevhuvud."
 
-#: src/prefs_customheader.c:561
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Välj en PNG-fil"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Välj en XBM-fil"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Välj en textfil"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Filen är inte en bild."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Den valda bilden är inte rätt storlek (48x48)."
 
-#: src/prefs_customheader.c:589
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Bilden är för stor; den måste vara maximalt 725 bytes."
 
-#: src/prefs_customheader.c:594
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Bilden är inte i rätt format (PNG)."
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Bilden är inte i rätt format (XBM)."
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "Kunde inte anropa `compface`. Se till att det finns i din $PATH."
 
-#: src/prefs_customheader.c:618
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface-fel: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Filen innehåller radslut."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Ta bort brevhuvud"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Vill du verkligen ta bort detta brevhuvud?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Aktuella anpassade brevhuvuden"
 
-#: src/prefs_display_header.c:254
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr "Konfiguration av visade brevhuvuden"
 
-#: src/prefs_display_header.c:278
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr "Brevhuvudsnamn"
 
-#: src/prefs_display_header.c:313
+#: src/prefs_display_header.c:312
 msgid "Hidden headers"
 msgstr "Dolda brevhuvuden"
 
-#: src/prefs_display_header.c:354
+#: src/prefs_display_header.c:353
 msgid "Displayed Headers"
 msgstr "Visade brevhuvuden"
 
-#: src/prefs_display_header.c:399
+#: src/prefs_display_header.c:398
 msgid "Show all unspecified headers"
 msgstr "Visa alla ospecificerade brevhuvuden"
 
-#: src/prefs_display_header.c:599
+#: src/prefs_display_header.c:598
 msgid "This header is already in the list."
 msgstr "Detta brevhuvud finns redan i listan."
 
-#: src/prefs_ext_prog.c:102
+#: src/prefs_ext_prog.c:100
 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s kommer att ersättas med filnamnet / URI"
 
-#: src/prefs_ext_prog.c:110
+#: src/prefs_ext_prog.c:108
 msgid "For the text editor, %w will be replaced with GtkSocket ID"
 msgstr "För textredigeraren kommer %w att ersättas med GtkSocket-ID"
 
-#: src/prefs_ext_prog.c:129
+#: src/prefs_ext_prog.c:127
 msgid "Use system defaults when possible"
 msgstr "Använd systemets standardprogram, om möjligt"
 
-#: src/prefs_ext_prog.c:150
+#: src/prefs_ext_prog.c:146
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_ext_prog.c:178
+#: src/prefs_ext_prog.c:172
 msgid "Text editor"
 msgstr "Textredigerare"
 
-#: src/prefs_ext_prog.c:210
+#: src/prefs_ext_prog.c:201
 msgid "Command for 'Display as text'"
 msgstr "Kommando för 'Visa som text'"
 
-#: src/prefs_ext_prog.c:223
+#: src/prefs_ext_prog.c:212
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -15626,120 +16228,120 @@ msgstr ""
 "Detta alternativ möjliggör MIME-delar att visas i meddelandevyn via ett "
 "skript genom att använda 'Visa som text' i snabbmenyn"
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:351
+#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:172
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Meddelandevy"
 
-#: src/prefs_ext_prog.c:283
+#: src/prefs_ext_prog.c:274
 msgid "External Programs"
 msgstr "Externa program"
 
-#: src/prefs_filtering_action.c:171
+#: src/prefs_filtering_action.c:169
 msgid "Move"
 msgstr "Flytta"
 
-#: src/prefs_filtering_action.c:174
+#: src/prefs_filtering_action.c:172
 msgid "Hide"
 msgstr "Dölj"
 
+#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:174
 #: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
 #: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
-#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
 msgid "Message flags"
 msgstr "Meddelandeflaggor"
 
-#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
-#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "Markera"
 
-#: src/prefs_filtering_action.c:179
+#: src/prefs_filtering_action.c:177
 msgid "Mark as read"
 msgstr "Markera som läst"
 
-#: src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:178
 msgid "Mark as unread"
 msgstr "Markera som oläst"
 
-#: src/prefs_filtering_action.c:181
+#: src/prefs_filtering_action.c:179
 msgid "Mark as spam"
 msgstr "Markera som skräp"
 
-#: src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:180
 msgid "Mark as ham"
 msgstr "Markera som ej skräp"
 
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
+#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
+#: src/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2510
 msgid "Execute"
 msgstr "Kör"
 
-#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
 msgid "Color label"
 msgstr "Färgmarkering"
 
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:185
 msgid "Resend"
 msgstr "Skicka om"
 
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:185
 msgid "Redirect"
 msgstr "Omdirigera"
 
-#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
-#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
-#: src/summaryview.c:474
+#: 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/summaryview.c:470
 msgid "Score"
 msgstr "Poäng"
 
-#: src/prefs_filtering_action.c:188
+#: src/prefs_filtering_action.c:186
 msgid "Change score"
 msgstr "Ändra poäng"
 
-#: src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:187
 msgid "Set score"
 msgstr "Ange poäng"
 
-#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
-#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
-#: src/prefs_summary_column.c:88 src/summaryview.c:476
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:190 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:472
 msgid "Tags"
 msgstr "Etiketter"
 
-#: src/prefs_filtering_action.c:190
+#: src/prefs_filtering_action.c:188
 msgid "Apply tag"
 msgstr "Lägg till etikett"
 
-#: src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:189
 msgid "Unset tag"
 msgstr "Ta bort etikett"
 
-#: src/prefs_filtering_action.c:192
+#: src/prefs_filtering_action.c:190
 msgid "Clear tags"
 msgstr "Rensa etiketter"
 
-#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
 msgid "Threads"
 msgstr "Trådar"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:194
 msgid "Stop filter"
 msgstr "Stoppa filter"
 
-#: src/prefs_filtering_action.c:401
+#: src/prefs_filtering_action.c:399
 msgid "Action configuration"
 msgstr "Aktivitetskonfiguration"
 
-#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
-#: src/prefs_matcher.c:597
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1882
+#: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr "Regel"
 
-#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:423
 msgid "Action"
 msgstr "Aktivitet"
 
@@ -15776,25 +16378,25 @@ msgid "No action was defined."
 msgstr "Ingen aktivitet är definierad."
 
 # xxxx här är jag xxxx
-#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
-#: src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2213
+#: src/quote_fmt.c:78
 msgid "literal %"
 msgstr "bokstavligt %"
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2222
 msgid "filename (should not be modified)"
 msgstr "filnamn (får inte ändras)"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
-#: src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2223
+#: src/quote_fmt.c:86
 msgid "new line"
 msgstr "ny rad"
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2224
 msgid "escape character for quotes"
 msgstr "undantagstecken för citat"
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2225
 msgid "quote character"
 msgstr "citattecken"
 
@@ -15832,117 +16434,117 @@ msgstr "Färger"
 msgid "Current action list"
 msgstr "Aktuell aktivitetslista"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
+#: src/prefs_filtering.c:196 src/prefs_filtering.c:359
 msgid "Filtering/Processing configuration"
 msgstr "Filtrerings/Behandllingsinställningar"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
-#: src/prefs_filtering.c:986
+#: src/prefs_filtering.c:265 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:969
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alla"
 
-#: src/prefs_filtering.c:412
+#: src/prefs_filtering.c:405
 msgid "Condition"
 msgstr "Villkor"
 
-#: src/prefs_filtering.c:425
+#: src/prefs_filtering.c:416
 msgid " Def_ine... "
 msgstr " Def_iniera... "
 
-#: src/prefs_filtering.c:447
+#: src/prefs_filtering.c:434
 msgid " De_fine... "
 msgstr " De_finiera... "
 
-#: src/prefs_filtering.c:476
+#: src/prefs_filtering.c:461
 msgid "Append the new rule above to the list"
 msgstr "Lägg till den nya regeln ovan, sist i listan"
 
-#: src/prefs_filtering.c:485
+#: src/prefs_filtering.c:470
 msgid "Replace the selected rule in list with the rule above"
 msgstr "Ersätt vald regel i listan med regeln ovan"
 
-#: src/prefs_filtering.c:494
+#: src/prefs_filtering.c:477
 msgid "Delete the selected rule from the list"
 msgstr "Ta bort vald regel från listan"
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:516
 msgid "Move the selected rule to the top"
 msgstr "Flytta vald regel till början"
 
-#: src/prefs_filtering.c:538
+#: src/prefs_filtering.c:519
 msgid "Page u_p"
 msgstr "Sida u_pp"
 
-#: src/prefs_filtering.c:546
+#: src/prefs_filtering.c:527
 msgid "Move the selected rule one page up"
 msgstr "Flytta vald regel en sida upp"
 
-#: src/prefs_filtering.c:555
+#: src/prefs_filtering.c:536
 msgid "Move the selected rule up"
 msgstr "Flytta upp vald regel"
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:544
 msgid "Move the selected rule down"
 msgstr "Flytta ner vald regel"
 
-#: src/prefs_filtering.c:566
+#: src/prefs_filtering.c:547
 msgid "Page dow_n"
 msgstr "Sida n_er"
 
-#: src/prefs_filtering.c:574
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule one page down"
 msgstr "Flytta vald regel en sida ner"
 
-#: src/prefs_filtering.c:583
+#: src/prefs_filtering.c:564
 msgid "Move the selected rule to the bottom"
 msgstr "Flytta vald regel till slutet"
 
-#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
+#: src/prefs_filtering.c:1026 src/prefs_filtering.c:1112
 msgid "Condition string is not valid."
 msgstr "Villkorssträngen är inte giltig."
 
-#: src/prefs_filtering.c:1116
+#: src/prefs_filtering.c:1099
 msgid "Condition string is empty."
 msgstr "Villkorssträngen är tom."
 
-#: src/prefs_filtering.c:1122
+#: src/prefs_filtering.c:1105
 msgid "Action string is empty."
 msgstr "Aktivitetssträngen är tom."
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1194
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1195
 msgid "Do you really want to delete this rule?"
 msgstr "Vill du verkligen ta bort denna regel?"
 
-#: src/prefs_filtering.c:1230
+#: src/prefs_filtering.c:1214
 msgid "Delete all rules"
 msgstr "Ta bort alla regler"
 
-#: src/prefs_filtering.c:1231
+#: src/prefs_filtering.c:1215
 msgid "Do you really want to delete all the rules?"
 msgstr "Vill du verkligen ta bort alla regler?"
 
-#: src/prefs_filtering.c:1482
+#: src/prefs_filtering.c:1467
 msgid "Filtering rules not saved"
 msgstr "Filtreringsreglerna är inte sparade"
 
-#: src/prefs_filtering.c:1483
+#: src/prefs_filtering.c:1468
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "Listan med filterregler har ändrats. Stäng ändå?"
 
-#: src/prefs_filtering.c:1705
+#: src/prefs_filtering.c:1694
 msgid "Move one page up"
 msgstr "Flytta upp en sida"
 
-#: src/prefs_filtering.c:1706
+#: src/prefs_filtering.c:1695
 msgid "Move one page down"
 msgstr "Flytta ner en sida"
 
-#: src/prefs_filtering.c:1863
+#: src/prefs_filtering.c:1850
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -15962,17 +16564,17 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Dolda kolumner"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
-#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "Visade kolumner"
 
-#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:474
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1016
 msgid " Use default "
 msgstr " Använd standard "
 
-#: src/prefs_folder_item.c:214
+#: src/prefs_folder_item.c:216
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -15983,7 +16585,7 @@ msgstr ""
 "Dock så kan du sätta dom för hela brevlådeträdet genom att använda "
 "\"Applicera på undermappar\"."
 
-#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
+#: src/prefs_folder_item.c:300 src/prefs_folder_item.c:936
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15991,11 +16593,11 @@ msgstr ""
 "Använd på\n"
 "undermappar"
 
-#: src/prefs_folder_item.c:318
+#: src/prefs_folder_item.c:323
 msgid "Normal"
 msgstr "Normalläge"
 
-#: src/prefs_folder_item.c:320
+#: src/prefs_folder_item.c:325
 msgid "Outbox"
 msgstr "Utkorg"
 
@@ -16003,43 +16605,43 @@ msgstr "Utkorg"
 msgid "Folder type"
 msgstr "Mapptyp"
 
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:360
 msgid "Simplify Subject RegExp"
 msgstr "Förenkla RegExp för ämne"
 
-#: src/prefs_folder_item.c:374
+#: src/prefs_folder_item.c:387
 msgid "Test string"
 msgstr "Teststräng"
 
-#: src/prefs_folder_item.c:391
+#: src/prefs_folder_item.c:408
 msgid "Result"
 msgstr "Resultat"
 
-#: src/prefs_folder_item.c:406
+#: src/prefs_folder_item.c:426
 msgid "Folder chmod"
 msgstr "Mapp-chmod"
 
-#: src/prefs_folder_item.c:432
+#: src/prefs_folder_item.c:454
 msgid "Folder color"
 msgstr "Mappfärg"
 
-#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
+#: src/prefs_folder_item.c:464 src/prefs_folder_item.c:468
 msgid "Pick color for folder"
 msgstr "Välj färg för mapp"
 
-#: src/prefs_folder_item.c:462
+#: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
 msgstr "Kör behandlingsregler vid uppstart"
 
-#: src/prefs_folder_item.c:477
+#: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
 msgstr "Kör behandlingsregler vid öppnande"
 
-#: src/prefs_folder_item.c:491
+#: src/prefs_folder_item.c:505
 msgid "Scan for new mail"
 msgstr "Leta efter ny post"
 
-#: src/prefs_folder_item.c:493
+#: src/prefs_folder_item.c:507
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -16047,11 +16649,11 @@ msgstr ""
 "Aktivera detta alternativ om e-post levereras direkt till denna mapp genom "
 "filtrering på server-sidan för IMAP eller genom en extern applikation"
 
-#: src/prefs_folder_item.c:513
+#: src/prefs_folder_item.c:524
 msgid "Select the HTML part of multipart messages"
 msgstr "Välj HTML-delen av flerdels-/alternativmeddelanden"
 
-#: src/prefs_folder_item.c:530
+#: src/prefs_folder_item.c:539
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -16059,137 +16661,166 @@ msgstr ""
 "\"Standardval\" kommer att följa global inställning (som hittas i /"
 "Egenskaper/Meddelandevy/Textval)"
 
-#: src/prefs_folder_item.c:540
+#: src/prefs_folder_item.c:549
+msgid "Skip folder when searching for unread or new messages"
+msgstr "Hoppa över mapp vid sökning efter olästa eller nya meddelanden"
+
+#: src/prefs_folder_item.c:551
+msgid ""
+"Turn this option on if you want this folder to be ignored when searching for "
+"unread or new messages"
+msgstr ""
+"Aktivera detta alternativ om du vill att denna mapp ska ignoreras när du "
+"söker efter olästa eller nya meddelanden"
+
+#: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
 msgstr "Synkronisera för att arbeta frånkopplad"
 
-#: src/prefs_folder_item.c:561
+#: src/prefs_folder_item.c:582
 msgid "Fetch message bodies from the last"
 msgstr "Hämta meddelandetext från de senaste"
 
-#: src/prefs_folder_item.c:568
+#: src/prefs_folder_item.c:587
 msgid "0: all bodies"
 msgstr "0: alla meddelandetexter"
 
-#: src/prefs_folder_item.c:576
+#: src/prefs_folder_item.c:594
 msgid "Remove older messages bodies"
 msgstr "Ta bort äldre meddelandetext"
 
-#: src/prefs_folder_item.c:593
+#: src/prefs_folder_item.c:612
 msgid "Discard folder cache"
 msgstr "Överge mapp-cache"
 
-#: src/prefs_folder_item.c:905
+#: src/prefs_folder_item.c:943
 msgid "Request Return Receipt"
 msgstr "Begär läskvitto"
 
-#: src/prefs_folder_item.c:920
+#: src/prefs_folder_item.c:954
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Spara en kopia av utgående meddelande i denna mapp istället för Skickat"
 
-#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
-#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:965 src/prefs_folder_item.c:990
+#: src/prefs_folder_item.c:1040 src/prefs_folder_item.c:1065
+#: src/prefs_folder_item.c:1090
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Standard %s"
 
-#: src/prefs_folder_item.c:960
+#: src/prefs_folder_item.c:1015
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "Standard %s för svar"
 
-#: src/prefs_folder_item.c:1063
+#: src/prefs_folder_item.c:1114
 msgid "Default account"
 msgstr "Standardkonto"
 
-#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+#: src/prefs_folder_item.c:1247 src/prefs_folder_item.c:1278
 msgid "\"Default\" will follow the applicable account preference"
 msgstr "\"Standard\" kommer att följa tillämpliga kontoinställningar"
 
-#: src/prefs_folder_item.c:1781
+#: src/prefs_folder_item.c:1824
 msgid "Discard cache"
 msgstr "Överge cache"
 
-#: src/prefs_folder_item.c:1782
+#: src/prefs_folder_item.c:1825
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "Vill du verkligen lokal cachad data för denna mapp?"
 
-#: src/prefs_folder_item.c:1907
+#: src/prefs_folder_item.c:1940
 msgid "General"
 msgstr "Allmänt"
 
-#: src/prefs_folder_item.c:1986
+#: src/prefs_folder_item.c:2019
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Egenskaper för mapp %s"
 
-#: src/prefs_fonts.c:79
+#: src/prefs_fonts.c:78
 msgid "Folder and Message Lists"
 msgstr "Mapp- och meddelandelistor"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
+#: src/prefs_fonts.c:96 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/prefs_fonts.c:126
+#: src/prefs_fonts.c:119
 msgid "Derive small and bold fonts from Folder and Message Lists font"
 msgstr ""
 "Härled typsnitt för liten och fet text från Mapp- och meddelandelistors "
 "typsnitt"
 
-#: src/prefs_fonts.c:136
+#: src/prefs_fonts.c:127
 msgid "Small"
 msgstr "Liten"
 
-#: src/prefs_fonts.c:158
+#: src/prefs_fonts.c:147
 msgid "Bold"
 msgstr "Fet"
 
-#: src/prefs_fonts.c:180
+#: src/prefs_fonts.c:167
 msgid "Use different font for printing"
 msgstr "Använd ett annat typsnitt för utskrift"
 
-#: src/prefs_fonts.c:190
+#: src/prefs_fonts.c:175
 msgid "Message Printing"
 msgstr "Meddelandeutskrift"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
-#: src/prefs_themes.c:422
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_themes.c:426
 msgid "Display"
 msgstr "Visa"
 
-#: src/prefs_fonts.c:269
+#: src/prefs_fonts.c:252
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:910 src/toolbar.c:260 src/toolbar.c:528
 msgid "Preferences"
 msgstr "Egenskaper"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr "Visa bifogade bilder automatiskt"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:80
 msgid "Resize attached images by default"
 msgstr "Ändra storlek på bifogade bilder som standard"
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:83
 msgid "Clicking image toggles scaling"
 msgstr "Klicka på bild för att skala"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:92
+msgid "Fit image"
+msgstr "Anpassa bild"
+
+#: src/prefs_image_viewer.c:96
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Högerklick på bilden växlar anpassning av höjd/bredd"
+
+#: src/prefs_image_viewer.c:99
+msgid "Height"
+msgstr "Höjd"
+
+#: src/prefs_image_viewer.c:105
+msgid "Width"
+msgstr "Bredd"
+
+#: src/prefs_image_viewer.c:110
 msgid "Display images inline"
 msgstr "Visa bilder i meddelandet"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:114
 msgid "Print images"
 msgstr "Skriv ut bilder"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:173
 msgid "Image Viewer"
 msgstr "Bildvisare"
 
@@ -16311,7 +16942,7 @@ msgstr "Felmeddelanden"
 msgid "Status messages for filtering/processing log"
 msgstr "Statusmeddelanden för loggning av filtrering- och behandlingsregler"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:143 src/prefs_other.c:785
 msgid "Other"
 msgstr "Övrigt"
 
@@ -16319,168 +16950,168 @@ msgstr "Övrigt"
 msgid "Logging"
 msgstr "Loggning"
 
-#: src/prefs_matcher.c:335
+#: src/prefs_matcher.c:334
 msgid "more than"
 msgstr "mer än"
 
-#: src/prefs_matcher.c:336
+#: src/prefs_matcher.c:335
 msgid "less than"
 msgstr "mindre än"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:341
 msgid "weeks"
 msgstr "veckor"
 
-#: src/prefs_matcher.c:346
+#: src/prefs_matcher.c:345
 msgid "after"
 msgstr "efter"
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:346
 msgid "before"
 msgstr "före"
 
-#: src/prefs_matcher.c:351
+#: src/prefs_matcher.c:350
 msgid "higher than"
 msgstr "högre än"
 
-#: src/prefs_matcher.c:352
+#: src/prefs_matcher.c:351
 msgid "lower than"
 msgstr "lägre än"
 
-#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
+#: src/prefs_matcher.c:352 src/prefs_matcher.c:358
 msgid "exactly"
 msgstr "exakt"
 
-#: src/prefs_matcher.c:357
+#: src/prefs_matcher.c:356
 msgid "greater than"
 msgstr "större än"
 
-#: src/prefs_matcher.c:358
+#: src/prefs_matcher.c:357
 msgid "smaller than"
 msgstr "mindre än"
 
-#: src/prefs_matcher.c:363
+#: src/prefs_matcher.c:362
 msgid "bytes"
 msgstr "byte"
 
-#: src/prefs_matcher.c:364
-msgid "kilobytes"
-msgstr "kilobyte"
+#: src/prefs_matcher.c:363
+msgid "kibibytes"
+msgstr "kibibytes"
 
-#: src/prefs_matcher.c:365
-msgid "megabytes"
-msgstr "megabyte"
+#: src/prefs_matcher.c:364
+msgid "mebibytes"
+msgstr "mebibytes"
 
-#: src/prefs_matcher.c:369
+#: src/prefs_matcher.c:368
 msgid "contains"
 msgstr "innehåller"
 
-#: src/prefs_matcher.c:370
+#: src/prefs_matcher.c:369
 msgid "doesn't contain"
 msgstr "innehåller ej"
 
-#: src/prefs_matcher.c:394
+#: src/prefs_matcher.c:393
 msgid "headers part"
 msgstr "brevhuvudsdel"
 
-#: src/prefs_matcher.c:395
+#: src/prefs_matcher.c:394
 msgid "headers values"
 msgstr "värden i brevhuvud"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:395
 msgid "body part"
 msgstr "meddelandedel"
 
-#: src/prefs_matcher.c:397
+#: src/prefs_matcher.c:396
 msgid "whole message"
 msgstr "hela meddelandet"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:402 src/summaryview.c:6551
 msgid "Marked"
 msgstr "Markerad"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:403 src/summaryview.c:6549
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:404
 msgid "Replied"
 msgstr "Besvarat"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:405 src/summaryview.c:6543
 msgid "Forwarded"
 msgstr "Vidarebefordrat"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2342
+#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "Skräppost"
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:408
 msgid "Has attachment"
 msgstr "Har bilaga"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:409 src/summaryview.c:6569
 msgid "Signed"
 msgstr "Signerat"
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:413
 msgid "set"
 msgstr "satt"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:414
 msgid "not set"
 msgstr "inte satt"
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:418
 msgid "yes"
 msgstr "ja"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:419
 msgid "no"
 msgstr "nej"
 
-#: src/prefs_matcher.c:424
+#: src/prefs_matcher.c:423
 msgid "Any tags"
 msgstr "Någon etikett"
 
-#: src/prefs_matcher.c:425
+#: src/prefs_matcher.c:424
 msgid "Specific tag"
 msgstr "Specifik etikett"
 
-#: src/prefs_matcher.c:429
+#: src/prefs_matcher.c:428
 msgid "ignored"
 msgstr "ignorerad"
 
-#: src/prefs_matcher.c:430
+#: src/prefs_matcher.c:429
 msgid "not ignored"
 msgstr "inte ignorerad"
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:430
 msgid "watched"
 msgstr "bevakad"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:431
 msgid "not watched"
 msgstr "inte bevakad"
 
-#: src/prefs_matcher.c:436
+#: src/prefs_matcher.c:435
 msgid "found"
 msgstr "hittat"
 
-#: src/prefs_matcher.c:437
+#: src/prefs_matcher.c:436
 msgid "not found"
 msgstr "inte hittat"
 
-#: src/prefs_matcher.c:441
+#: src/prefs_matcher.c:440
 msgid "0 (Passed)"
 msgstr "0 (Lyckas)"
 
-#: src/prefs_matcher.c:442
+#: src/prefs_matcher.c:441
 msgid "non-0 (Failed)"
 msgstr "icke-0 (misslyckas)"
 
-#: src/prefs_matcher.c:580
+#: src/prefs_matcher.c:578
 msgid "Condition configuration"
 msgstr "Villkorsinställning"
 
@@ -16488,39 +17119,39 @@ msgstr "Villkorsinställning"
 msgid "Match criteria"
 msgstr "Matchningsvillkor"
 
-#: src/prefs_matcher.c:633
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr "Alla meddelanden"
 
-#: src/prefs_matcher.c:635
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr "Ålder"
 
-#: src/prefs_matcher.c:636
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr "Uttryck"
 
-#: src/prefs_matcher.c:637
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr "Flaggor"
 
-#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "Färgmarkering"
 
-#: src/prefs_matcher.c:639
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr "Tråd"
 
-#: src/prefs_matcher.c:642
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr "Delvis nedladdat"
 
-#: src/prefs_matcher.c:645
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr "Externt programtest"
 
-#: src/prefs_matcher.c:674
+#: src/prefs_matcher.c:672
 msgid ""
 "Use selector on the right to pick the header name. Type the name of the "
 "header if not available in the list."
@@ -16528,58 +17159,58 @@ msgstr ""
 "Använd väljaren till höger för att välja rubriknamn. Mata in namnet på "
 "rubriken om det inte finns i listan."
 
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1655 src/prefs_matcher.c:1670
 #: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alla"
 
-#: src/prefs_matcher.c:753
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr "Anv. regex"
 
-#: src/prefs_matcher.c:844
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr "Meddelande måste matcha"
 
-#: src/prefs_matcher.c:848
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr "minst en av"
 
-#: src/prefs_matcher.c:849
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr "alla"
 
-#: src/prefs_matcher.c:852
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr "ovanstående regler"
 
-#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
+#: src/prefs_matcher.c:1561 src/prefs_matcher.c:1639
 msgid "Search pattern is not set."
 msgstr "Sökmönster är inte angivet."
 
-#: src/prefs_matcher.c:1578
+#: src/prefs_matcher.c:1575
 msgid "Invalid hour."
 msgstr "Ogiltig timme."
 
-#: src/prefs_matcher.c:1587
+#: src/prefs_matcher.c:1585
 msgid "Test command is not set."
 msgstr "Testkommando är inte angivet."
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1656
 msgid "all addresses in all headers"
 msgstr "alla e-postadresser i alla brevhuvud"
 
-#: src/prefs_matcher.c:1662
+#: src/prefs_matcher.c:1659
 msgid "any address in any header"
 msgstr "någon e-postadress i något brevhuvud"
 
-#: src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adressen(erna) i brevhuvudet '%s'"
 
-#: src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1662
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16680,11 +17311,11 @@ msgstr ""
 "Posten sparades inte.\n"
 "Stäng ändå?"
 
-#: src/prefs_matcher.c:2233
+#: src/prefs_matcher.c:2234
 msgid "Match Type: 'Test'"
 msgstr "Matchningstyp: 'Test'"
 
-#: src/prefs_matcher.c:2234
+#: src/prefs_matcher.c:2235
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16697,87 +17328,95 @@ msgstr ""
 "\n"
 "Följande symboler kan användas:"
 
-#: src/prefs_matcher.c:2333
+#: src/prefs_matcher.c:2334
 msgid "Current condition rules"
 msgstr "Nuvarande villkorsregler"
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr "Brevhuvud"
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr "Visa brevhuvudsruta ovanför meddelandevy"
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
-msgstr "Visa (X-)Ansikte i meddelandevy"
+msgstr "Visa (X-)Face i meddelandevy"
+
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr "Spara (X-)Face i adressboken om möjligt"
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr "Visa Face i meddelandevy"
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr "Spara Face i adressbok om möjligt"
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr "Visa brevhuvuden i meddelandevy"
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr "HTML-meddelanden"
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr "Visa HTML-meddelanden som text"
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Visa meddelande med endast HTML med insticksmodul, om möjligt"
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "Välj HTML-delen av flerdels-/alternativmeddelanden"
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr "Radavstånd"
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr "bildpunkter"
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr "Rulla"
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr "Halv sida"
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr "Mjuk rullning"
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr "Stega"
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Visa bilagans beskrivning (i stället för namnet)"
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr "Citering"
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr "Kollapsa citerad text vid dubbelklick"
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr "Behandla dessa tecken som citattecken"
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr "Textval"
 
@@ -16806,145 +17445,149 @@ msgstr ""
 msgid "Configuration warning"
 msgstr "Konfigurationsvarning"
 
-#: src/prefs_msg_colors.c:155
+#: src/prefs_msg_colors.c:145
 msgid "Message view"
 msgstr "Meddelandevy"
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:152
 msgid "Enable coloration of message text"
 msgstr "Aktivera färgläggning av meddelandetext"
 
-#: src/prefs_msg_colors.c:170
+#: src/prefs_msg_colors.c:160
 msgid "Quote"
 msgstr "Citat"
 
-#: src/prefs_msg_colors.c:182
+#: src/prefs_msg_colors.c:172
 msgid "Cycle quote colors"
 msgstr "Återanvänd färger för citat"
 
-#: src/prefs_msg_colors.c:186
+#: src/prefs_msg_colors.c:176
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "Om det är mer än tre citatnivåer, kommer färgerna återanvändas"
 
-#: src/prefs_msg_colors.c:192
+#: src/prefs_msg_colors.c:182
 msgid "1st Level"
 msgstr "Nivå 1"
 
-#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:234
+#: src/prefs_msg_colors.c:188 src/prefs_msg_colors.c:206
+#: src/prefs_msg_colors.c:224
 msgid "Text"
 msgstr "Text"
 
-#: src/prefs_msg_colors.c:202
+#: src/prefs_msg_colors.c:192
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Välj färg för citeringsnivå 1"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:200
 msgid "2nd Level"
 msgstr "Nivå 2"
 
-#: src/prefs_msg_colors.c:220
+#: src/prefs_msg_colors.c:210
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Välj färg för citeringsnivå 2"
 
-#: src/prefs_msg_colors.c:228
+#: src/prefs_msg_colors.c:218
 msgid "3rd Level"
 msgstr "Nivå 3"
 
-#: src/prefs_msg_colors.c:238
+#: src/prefs_msg_colors.c:228
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Välj färg för citeringsnivå 3"
 
-#: src/prefs_msg_colors.c:247
+#: src/prefs_msg_colors.c:237
 msgid "Enable coloration of text background"
 msgstr "Aktivera färgläggning av textbakgrund"
 
-#: src/prefs_msg_colors.c:256
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:247
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Välj färg till textbakgrund för nivå 1"
 
-#: src/prefs_msg_colors.c:269
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:261
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Välj färg till textbakgrund för nivå 2"
 
-#: src/prefs_msg_colors.c:282
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:275
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Välj färg till textbakgrund för nivå 3"
 
-#: src/prefs_msg_colors.c:294
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:288
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for links"
 msgstr "Välj färg för länkar"
 
-#: src/prefs_msg_colors.c:298
+#: src/prefs_msg_colors.c:292
 msgid "URI link"
 msgstr "URI-länk"
 
-#: src/prefs_msg_colors.c:306
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:301
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for signatures"
 msgstr "Välj färg för signaturer"
 
 #. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
 #. versions of the same text file
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:311
 msgid "Patch messages and attachments"
 msgstr "Patchmeddelanden och bilagor"
 
-#: src/prefs_msg_colors.c:324
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:320
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for inserted lines"
 msgstr "Välj färg för tillagda rader"
 
-#: src/prefs_msg_colors.c:326
+#: src/prefs_msg_colors.c:322
 msgid "Inserted lines"
 msgstr "Infogade rader"
 
-#: src/prefs_msg_colors.c:333
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:330
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for removed lines"
 msgstr "Välj färg för raderade rader"
 
-#: src/prefs_msg_colors.c:336
+#: src/prefs_msg_colors.c:333
 msgid "Removed lines"
 msgstr "Raderade rader"
 
-#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:344
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:342
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for hunk lines"
 msgstr "Välj färg för hunkrader"
 
 #. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:348
+#: src/prefs_msg_colors.c:346
 msgid "Hunk lines"
 msgstr "Hunkrader"
 
-#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
 msgid "Folder list"
 msgstr "Mapplista"
 
-#: src/prefs_msg_colors.c:357
-msgctxt "Tooltip"
-msgid ""
-"Pick color for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
-msgstr ""
-"Välj färg för målfolder. Målfolder används när alternativet 'Utför "
-"omedelbart vid flyttning och borttagning av meddelanden' är inaktiverat"
+#: src/prefs_msg_colors.c:356
+msgctxt "Tooltip and Dialog title"
+msgid "Pick color for Target folder."
+msgstr "Välj färg för målmapp."
 
-#: src/prefs_msg_colors.c:362
+#: src/prefs_msg_colors.c:357
 msgid "Target folder"
 msgstr "Målmapp"
 
-#: src/prefs_msg_colors.c:369
+#: src/prefs_msg_colors.c:359
 msgctxt "Tooltip"
+msgid ""
+"Target folder is used when the option 'Execute immediately when moving or "
+"deleting messages' is turned off"
+msgstr ""
+"Målfolder används när alternativet 'Utför omedelbart vid flyttning och "
+"borttagning av meddelanden' är inaktiverat"
+
+#: src/prefs_msg_colors.c:370
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for folders containing new messages"
 msgstr "Välj färg för mappar med nya meddelanden"
 
@@ -16954,7 +17597,7 @@ msgstr "Mappen innehåller nya meddelanden"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:435
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16962,155 +17605,66 @@ msgstr "Välj färg för 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:439
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Välj etikett för 'color %d'"
 
-#: src/prefs_msg_colors.c:529
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text"
-msgstr "Välj färg för citeringsnivå 1"
-
-#: src/prefs_msg_colors.c:531
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text"
-msgstr "Välj färg för citeringsnivå 2"
-
-#: src/prefs_msg_colors.c:533
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text"
-msgstr "Välj färg för citeringsnivå 3"
-
-#: src/prefs_msg_colors.c:535
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text background"
-msgstr "Välj bakgrundsfärg för citeringsnivå 1"
-
-#: src/prefs_msg_colors.c:537
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text background"
-msgstr "Välj bakgrundsfärg för citeringsnivå 2"
-
-#: src/prefs_msg_colors.c:539
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text background"
-msgstr "Välj bakgrundsfärg för citeringsnivå 3"
-
-#: src/prefs_msg_colors.c:541
-msgctxt "Dialog title"
-msgid "Pick color for links"
-msgstr "Välj färg för länkar"
-
-#: src/prefs_msg_colors.c:543
-msgctxt "Dialog title"
-msgid "Pick color for target folder"
-msgstr "Välj färg för målmapp"
-
-#: src/prefs_msg_colors.c:545
-msgctxt "Dialog title"
-msgid "Pick color for signatures"
-msgstr "Välj färg för signaturer"
-
-#: src/prefs_msg_colors.c:547
-msgctxt "Dialog title"
-msgid "Pick color for folder"
-msgstr "Välj färg för mapp"
-
-#: src/prefs_msg_colors.c:549
-msgctxt "Dialog title"
-msgid "Pick color for inserted lines"
-msgstr "Välj färg för tillagda rader"
-
-#: src/prefs_msg_colors.c:551
-msgctxt "Dialog title"
-msgid "Pick color for removed lines"
-msgstr "Välj färg för raderade rader"
-
-#: src/prefs_msg_colors.c:553
-msgctxt "Dialog title"
-msgid "Pick color for hunk lines"
-msgstr "Välj färg för hunkrader"
-
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:576
+#: src/prefs_msg_colors.c:411 src/prefs_msg_colors.c:448
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "Välj färg för 'color %d'"
 
-#: src/prefs_msg_colors.c:777
+#: src/prefs_msg_colors.c:582
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_other.c:109
+#: src/prefs_other.c:108
 msgid "Choose preset keyboard shortcuts"
 msgstr "Välj fördefinierade tangentbordsgenvägar"
 
-#: src/prefs_other.c:124
-msgid "Select preset:"
-msgstr "Välj förinställning:"
+#: src/prefs_other.c:123
+msgid "Select preset keyboard shortcuts:"
+msgstr "Välj fördefinierade tangentbordsgenvägar:"
 
-#: src/prefs_other.c:139
-msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
-msgstr ""
-"Du kan också ändra varje meny-genväg genom att trycka\n"
-"någon tangent(er) när du har muspekaren på menyvalet."
-
-#: src/prefs_other.c:497
+#: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
 msgstr "Lägg till adress till destination vid dubbelklick"
 
-#: src/prefs_other.c:500
+#: src/prefs_other.c:498
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_other.c:503
+#: src/prefs_other.c:501
 msgid "Confirm on exit"
 msgstr "Bekräfta avslut"
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:508
 msgid "Empty trash on exit"
 msgstr "Töm papperskorg vid avslut"
 
-#: src/prefs_other.c:513
+#: src/prefs_other.c:511
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns köade meddelanden"
 
-#: src/prefs_other.c:515
+#: src/prefs_other.c:513
 msgid "Keyboard shortcuts"
 msgstr "Tangentbordsgenvägar"
 
-#: src/prefs_other.c:518
+#: src/prefs_other.c:516
 msgid "Enable keyboard shortcuts"
 msgstr "Aktivera tangentbordsgenvägar"
 
-#: src/prefs_other.c:521
-msgid "Enable customisable keyboard shortcuts"
-msgstr "Tillåt konfigurerbara tangentbordsgenvägar"
-
-#: src/prefs_other.c:524
-msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items "
-"by focusing on the menu item and pressing a key combination.\n"
-"Uncheck this option if you want to lock all existing keyboard shortcuts."
-msgstr ""
-"Om ikryssad kan du ändra tangentbordsgenvägar för de flesta menyval genom "
-"att ha fokus på menyvalet och samtidigt trycka en tangentkombination.\n"
-"Lämna  ej ikryssad om du vil låsa alla nuvarande tangentbordsgenvägar."
-
-#: src/prefs_other.c:531
+#: src/prefs_other.c:519
 msgid " Choose preset keyboard shortcuts... "
 msgstr " Välj fördefinierade tangentbordsgenvägar... "
 
-#: src/prefs_other.c:541
+#: src/prefs_other.c:529
 msgid "Metadata handling"
 msgstr "Hantering av Metadata"
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:530
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -17118,23 +17672,23 @@ msgstr ""
 "Säker hantering av metadata instruerar OS'et att skriva metadata till disk\n"
 "med en gång; Det undviker dataförluster vid krascher, men kan ta lite tid."
 
-#: src/prefs_other.c:546
+#: src/prefs_other.c:535
 msgid "Safer"
 msgstr "Säker"
 
-#: src/prefs_other.c:548
+#: src/prefs_other.c:537
 msgid "Faster"
 msgstr "Snabb"
 
-#: src/prefs_other.c:566
+#: src/prefs_other.c:555
 msgid "Socket I/O timeout"
 msgstr "Tidsgräns för socket I/O"
 
-#: src/prefs_other.c:587
+#: src/prefs_other.c:576
 msgid "Translate header names"
 msgstr "Översätt brevhuvudsnamn"
 
-#: src/prefs_other.c:589
+#: src/prefs_other.c:578
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
@@ -17142,19 +17696,19 @@ msgstr ""
 "Visning av standardbrevhuvud (så som 'From:', 'Subject:') kommer översättas "
 "till svenska."
 
-#: src/prefs_other.c:592
+#: src/prefs_other.c:581
 msgid "Ask before emptying trash"
 msgstr "Fråga före tömning av papperskorg"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:583
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "Fråga om kontospecifika filterregler vid manuell filtrering"
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:588
 msgid "Use secure file deletion if possible"
 msgstr "Använd säker filborttagning, om möjligt"
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:592
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -17162,7 +17716,7 @@ msgstr ""
 "Använd säker filborttagning, om möjligt\n"
 "(programmet 'shred' är inte tillgängligt)"
 
-#: src/prefs_other.c:608
+#: src/prefs_other.c:597
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -17171,35 +17725,35 @@ msgstr ""
 "före borttagning. Detta gör borttagning långsammare. Läs i manualen till "
 "'shred' för att få information om nackdelar."
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:601
 msgid "Synchronise offline folders as soon as possible"
 msgstr "Synkronisera frånkopplade mappar så fort som möjligt"
 
-#: src/prefs_other.c:615
-msgid "Master passphrase"
-msgstr "Huvudlösenord"
+#: src/prefs_other.c:604
+msgid "Primary passphrase"
+msgstr "Primärt lösenord"
 
-#: src/prefs_other.c:618
-msgid "Use a master passphrase"
-msgstr "Använd ett huvudlösenord"
+#: src/prefs_other.c:607
+msgid "Use a primary passphrase"
+msgstr "Använd ett primärt lösenord"
 
-#: src/prefs_other.c:621
+#: src/prefs_other.c:610
 msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
+"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 ""
-"Om ikryssad, kommer dina sparade kontolösenord att skyddas av ett "
-"huvudlösenord. Om inget huvudlösenord sätts, kommer ett att efterfrågas."
+"Om ikryssad, kommer dina sparade kontolösenord att skyddas av ett primärt "
+"lösenord. Om inget primärt lösenord sätts, kommer ett att efterfrågas."
 
-#: src/prefs_other.c:626
-msgid "Change master passphrase"
-msgstr "Ändra huvudlösenord"
+#: src/prefs_other.c:615
+msgid "Change primary passphrase"
+msgstr "Ändra primärt lösenord"
 
-#: src/prefs_other.c:816
+#: src/prefs_other.c:786
 msgid "Miscellaneous"
 msgstr "Blandat"
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+#: src/prefs_proxy.c:236 src/prefs_receive.c:415 src/prefs_send.c:411
 msgid "Mail Handling"
 msgstr "Posthantering"
 
@@ -17300,7 +17854,7 @@ msgstr "Varna när skickar till fler mottagare än"
 msgid "Outgoing encoding"
 msgstr "Utgående kodning"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:248
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
@@ -17308,131 +17862,131 @@ msgstr ""
 "Om 'Automatisk' är valt kommer den bästa teckenkodningen för den nuvarande "
 "lokalen användas"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:263
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7 bitars ASCII (US-ASCII)"
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:264
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:266
 msgid "Western European (ISO-8859-1)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:267
 msgid "Western European (ISO-8859-15)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:269
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_send.c:275
+#: src/prefs_send.c:271
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:272
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_send.c:278
+#: src/prefs_send.c:274
 msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:276
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreiska  (ISO-8859-8)"
 
-#: src/prefs_send.c:281
+#: src/prefs_send.c:277
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreiska (Windows-1255)"
 
-#: src/prefs_send.c:283
+#: src/prefs_send.c:279
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisk (ISO-8859-6)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:280
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisk (Windows-1256)"
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:282
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:284
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_send.c:289
+#: src/prefs_send.c:285
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:286
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "Kyrillisk (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:291
+#: src/prefs_send.c:287
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:288
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_send.c:294
+#: src/prefs_send.c:290
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:292
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:293
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_send.c:300
+#: src/prefs_send.c:296
 msgid "Simplified Chinese (GB18030)"
 msgstr "Förenklad kinesiska (GB18030)"
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:297
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:298
 msgid "Simplified Chinese (GBK)"
 msgstr "Förenklad kinesiska (GBK)"
 
-#: src/prefs_send.c:303
+#: src/prefs_send.c:299
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:301
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_send.c:306
+#: src/prefs_send.c:302
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_send.c:309
+#: src/prefs_send.c:305
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_send.c:311
+#: src/prefs_send.c:307
 msgid "Thai (TIS-620)"
 msgstr "Thailändska (TIS-620)"
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:308
 msgid "Thai (Windows-874)"
 msgstr "Thailändska (Windows-874)"
 
-#: src/prefs_send.c:316
+#: src/prefs_send.c:312
 msgid "Transfer encoding"
 msgstr "Överföringskodning"
 
-#: src/prefs_send.c:327
+#: src/prefs_send.c:321
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
@@ -17440,257 +17994,265 @@ msgstr ""
 "Specificera vilken Content-Transfer-Encoding som ska användas när meddelande "
 "innehåller icke ASCII-tecken"
 
-#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
-#: src/send_message.c:529
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/prefs_spelling.c:80
-msgid "Pick color for misspelled word"
-msgstr "Välj färg för felstavat ord"
-
-#: src/prefs_spelling.c:128
+#: src/prefs_spelling.c:115
 msgid "Enable spell checker"
 msgstr "Aktivera rättstaving"
 
-#: src/prefs_spelling.c:133
+#: src/prefs_spelling.c:120
 msgid "Enable alternate dictionary"
 msgstr "Aktivera alternativ ordlista"
 
-#: src/prefs_spelling.c:138
+#: src/prefs_spelling.c:125
 msgid "Faster switching with last used dictionary"
 msgstr "Byt till senast använda ordbok snabbare"
 
-#: src/prefs_spelling.c:140
+#: src/prefs_spelling.c:127
 msgid "Automatic spell checking"
 msgstr "Automatisk stavningskontroll"
 
-#: src/prefs_spelling.c:148
+#: src/prefs_spelling.c:135
 msgid "Re-check message when changing dictionary"
 msgstr "Kontrollera meddelande igen vid byte av ordlista"
 
-#: src/prefs_spelling.c:152
+#: src/prefs_spelling.c:139
 msgid "Dictionary"
 msgstr "Ordlista"
 
-#: src/prefs_spelling.c:187
+#: src/prefs_spelling.c:168
 msgid "Check with both dictionaries"
 msgstr "Kontrollera i båda ordlistorna"
 
-#: src/prefs_spelling.c:194
+#: src/prefs_spelling.c:174
 msgid "Get more dictionaries..."
 msgstr "Hämta fler ordböcker..."
 
-#: src/prefs_spelling.c:204
+#: src/prefs_spelling.c:182
 msgid "Misspelled word color"
 msgstr "Färg på felstavat ord"
 
-#: src/prefs_spelling.c:216
+#: src/prefs_spelling.c:192
+msgid "Pick color for misspelled word"
+msgstr "Välj färg för felstavat ord"
+
+#: src/prefs_spelling.c:197
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Välj färg för felstavat ord. Använd svart för att understryka"
 
-#: src/prefs_spelling.c:333
+#: src/prefs_spelling.c:309
 msgid "Spell Checking"
 msgstr "Rättstavning"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:164
 msgid "the abbreviated weekday name"
 msgstr "det förkortade veckodagsnamnet"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:165
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:166
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:167
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:168
 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:172
+#: src/prefs_summaries.c:169
 msgid "the century number (year/100)"
 msgstr "århundrandetal (årtal/100)"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:170
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:171
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:172
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:173
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:174
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:175
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:176
 msgid "either AM or PM"
 msgstr "antingen FM eller EM"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:177
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:178
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:179
 msgid "the preferred date for the current locale"
 msgstr "föredraget datum för gällande lokal"
 
-#: src/prefs_summaries.c:183
+#: src/prefs_summaries.c:180
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_summaries.c:184
+#: src/prefs_summaries.c:181
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_summaries.c:185
+#: src/prefs_summaries.c:182
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon, namn eller förkortning"
 
-#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
-#: src/prefs_summaries.c:486
+#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
+#: src/prefs_summaries.c:488
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_summaries.c:231
+#: src/prefs_summaries.c:228
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_summaries.c:273
+#: src/prefs_summaries.c:270
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_summaries.c:400
+#: src/prefs_summaries.c:398
 msgid "Display message count next to folder name"
 msgstr "Visa antal meddelanden bredvid mappnamn"
 
-#: src/prefs_summaries.c:410
+#: src/prefs_summaries.c:408
 msgid "Unread messages"
 msgstr "Olästa meddelanden"
 
-#: src/prefs_summaries.c:411
+#: src/prefs_summaries.c:409
 msgid "Unread and Total messages"
 msgstr "Olästa och totalt antal meddelanden"
 
-#: src/prefs_summaries.c:417
+#: src/prefs_summaries.c:415
 msgid "Open last opened folder at start-up"
 msgstr "Öppna senast öppnade mapp vid uppstart"
 
-#: src/prefs_summaries.c:424
+#: src/prefs_summaries.c:419
+msgid ""
+"Run processing rules before marking all messages in a folder as read or "
+"unread"
+msgstr ""
+"Kör behandlingsregler innan du markerar alla meddelande i mapp som lästa "
+"eller olästa"
+
+#: src/prefs_summaries.c:426
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Förkorta namnet på diskussionsgrupper om det är längre än"
 
-#: src/prefs_summaries.c:437
+#: src/prefs_summaries.c:439
 msgid "letters"
 msgstr "bokstäver"
 
-#: src/prefs_summaries.c:445
+#: src/prefs_summaries.c:447
 msgid "Message list"
 msgstr "Meddelandelista"
 
-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:464
 msgid "Lock column headers"
 msgstr "Lås kolumnrubriker"
 
-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:470
 msgid "Displayed in From column"
 msgstr "Visas i Från-kolumnen"
 
-#: src/prefs_summaries.c:479
+#: src/prefs_summaries.c:481
 msgid "Name and Address"
 msgstr "Namn och adress"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:507
 msgid "Date format help"
 msgstr "Datumformatshjälp"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:513
 msgid "Set message selection when entering a folder"
 msgstr "Set meddelandeval vid öppnande av mapp"
 
-#: src/prefs_summaries.c:520
+#: src/prefs_summaries.c:522
 msgid "Open message when selected"
 msgstr "Öppna meddelanden när de väljs"
 
-#: src/prefs_summaries.c:525
+#: src/prefs_summaries.c:527
 msgid "When opening a folder"
 msgstr "Vid öppnande av mapp"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:529
 msgid "When displaying search results"
 msgstr "Vid visning av sökresultat"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:531
 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:531
+#: src/prefs_summaries.c:533
 msgid "When deleting or moving messages"
 msgstr "Vid borttagning eller flyttning av meddelenden"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:535
 msgid "When using directional keys"
 msgstr "Vid användning av riktningsknappar"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:537
 msgid "Mark message as read"
 msgstr "Markera meddelande som lästa"
 
-#: src/prefs_summaries.c:538
+#: src/prefs_summaries.c:540
 msgid "when selected, after"
 msgstr "när de är valda, efter"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:559
 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:567
+#: src/prefs_summaries.c:569
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Visa \"inga olästa (eller nya) meddelande\" dialog"
 
-#: src/prefs_summaries.c:577
+#: src/prefs_summaries.c:579
 msgid "Assume 'Yes'"
 msgstr "Anta 'Ja'"
 
-#: src/prefs_summaries.c:578
+#: src/prefs_summaries.c:580
 msgid "Assume 'No'"
 msgstr "Anta 'Nej'"
 
-#: src/prefs_summaries.c:584
+#: src/prefs_summaries.c:586
 msgid "Display sender using address book"
 msgstr "Visa avsändaren från adressboken"
 
-#: src/prefs_summaries.c:588
+#: src/prefs_summaries.c:590
 msgid "Thread using subject in addition to standard headers"
 msgstr "Trådar använder ämne som tillägg till standardbrevhuvud"
 
-#: src/prefs_summaries.c:592
+#: src/prefs_summaries.c:594
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning och borttagning av meddelanden"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:596
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
@@ -17698,55 +18260,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:599
+#: src/prefs_summaries.c:601
 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:602
+#: src/prefs_summaries.c:604
 msgid "Confirm when changing color labels"
 msgstr "Bekräfta vid förändringar av färgetiketter"
 
-#: src/prefs_summaries.c:606
+#: src/prefs_summaries.c:608
 msgid "Show tooltips"
 msgstr "Visa inforutor"
 
-#: src/prefs_summaries.c:616 src/quote_fmt.c:539
+#: src/prefs_summaries.c:618 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "Standard"
 
-#: src/prefs_summaries.c:618
+#: src/prefs_summaries.c:620
 msgid "New folders"
 msgstr "Nya mappar"
 
-#: src/prefs_summaries.c:624
+#: src/prefs_summaries.c:626
 msgid "Sort by"
 msgstr "Sortera enligt"
 
-#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "Nummer"
 
-#: src/prefs_summaries.c:635
+#: src/prefs_summaries.c:637
 msgid "Thread date"
 msgstr "Tråddatum"
 
-#: src/prefs_summaries.c:646
+#: src/prefs_summaries.c:648
 msgid "Don't sort"
 msgstr "Sortera inte"
 
-#: src/prefs_summaries.c:661
+#: src/prefs_summaries.c:663
 msgid "Thread view"
 msgstr "Trådvy"
 
-#: src/prefs_summaries.c:664
+#: src/prefs_summaries.c:666
 msgid "Collapse all threads"
 msgstr "Kollapsa alla trådar"
 
-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:672
 msgid "Hide read messages"
 msgstr "Dölj lästa meddelanden"
 
-#: src/prefs_summaries.c:870
+#: src/prefs_summaries.c:877
 msgid "Summaries"
 msgstr "Sammanfattningar"
 
@@ -17798,23 +18360,23 @@ msgstr "nyaste nya e-post"
 msgid "newest unread email"
 msgstr "nyaste olästa e-post"
 
-#: src/prefs_summary_open.c:189
+#: src/prefs_summary_open.c:188
 msgid "Message selection when entering a folder"
 msgstr "Meddelandeval vid öppnande av mapp"
 
-#: src/prefs_summary_open.c:234
+#: src/prefs_summary_open.c:233
 msgid "Available selections"
 msgstr "Tillgängliga sektioner"
 
-#: src/prefs_summary_open.c:269
+#: src/prefs_summary_open.c:268
 msgid "Current selections"
 msgstr "Aktuella sektioner"
 
-#: src/prefs_template.c:80
+#: src/prefs_template.c:79
 msgid "This name is used as the Menu item"
 msgstr "Det här namnet används redan som Meny-val"
 
-#: src/prefs_template.c:82
+#: src/prefs_template.c:81
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
@@ -17822,126 +18384,126 @@ msgstr ""
 "Åsidosätt skapande kontots Från-brevhuvud. Detta ändrar inte vilket konto "
 "som används för att skapa."
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:305
 msgid "Append the new template above to the list"
 msgstr "Lägg till den nya mallen ovan sist i listan"
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:314
 msgid "Replace the selected template in list with the template above"
 msgstr "Byt ut den valda mallen i listan med mallen ovan"
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:322
 msgid "Delete the selected template from the list"
 msgstr "Ta bort den valda mallen från listan"
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:338
 msgid "Show information on configuring templates"
 msgstr "Visa information om konfigurering av mallar"
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:362
 msgid "Move the selected template to the top"
 msgstr "Flytta den valda mallen överst"
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:372
 msgid "Move the selected template up"
-msgstr "Flytta upp vald mallen"
+msgstr "Flytta upp vald mall"
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:380
 msgid "Move the selected template down"
 msgstr "Flytta ned vald mall"
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:390
 msgid "Move the selected template to the bottom"
 msgstr "Flytta den valda mallen sist"
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:406
 msgid "Template configuration"
 msgstr "Mallkonfiguration"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:595
 msgid "Templates list not saved"
 msgstr "Malllistan är inte sparad"
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:596
 msgid "The templates list has been modified. Close anyway?"
 msgstr "Listan med mallar har ändrats. Stänga ändå?"
 
-#: src/prefs_template.c:760
+#: src/prefs_template.c:753
 msgid "The template's name is not set."
 msgstr "Mallens namn är inte angivet."
 
-#: src/prefs_template.c:803
+#: src/prefs_template.c:796
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "\"Från\"-fältet i mallen innehåller en felaktig email-adress."
 
-#: src/prefs_template.c:809
+#: src/prefs_template.c:802
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "\"Till\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: src/prefs_template.c:815
+#: src/prefs_template.c:808
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "\"Cc\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: src/prefs_template.c:821
+#: src/prefs_template.c:814
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "\"Bcc\"-fältet av mallen innehåller en ogiltig email-adress."
 
-#: src/prefs_template.c:827
+#: src/prefs_template.c:820
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "\"Svara-Till\"-fältet i mallen innehåller en ogiltig e-postadress."
 
-#: src/prefs_template.c:833
+#: src/prefs_template.c:826
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "\"Ämne\"-fältet i mallen är ogiltig."
 
-#: src/prefs_template.c:904
+#: src/prefs_template.c:897
 msgid "Delete template"
 msgstr "Ta bort mall"
 
-#: src/prefs_template.c:905
+#: src/prefs_template.c:898
 msgid "Do you really want to delete this template?"
 msgstr "Vill du verkligen ta bort denna mall?"
 
-#: src/prefs_template.c:917
+#: src/prefs_template.c:910
 msgid "Delete all templates"
 msgstr "Ta bort alla mallar"
 
-#: src/prefs_template.c:918
+#: src/prefs_template.c:911
 msgid "Do you really want to delete all the templates?"
 msgstr "Vill du verkligen ta bort alla mallar?"
 
-#: src/prefs_template.c:1234
+#: src/prefs_template.c:1225
 msgid "Current templates"
 msgstr "Befintliga mallar"
 
-#: src/prefs_template.c:1262
+#: src/prefs_template.c:1253
 msgid "Template"
 msgstr "Mall"
 
-#: src/prefs_themes.c:401 src/prefs_themes.c:841
+#: src/prefs_themes.c:405 src/prefs_themes.c:939
 msgid "Default internal theme"
 msgstr "Internt standardtema"
 
-#: src/prefs_themes.c:423
+#: src/prefs_themes.c:427
 msgid "Themes"
 msgstr "Teman"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:504
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Ta bort systemtema '%s'"
 
-#: src/prefs_themes.c:502
+#: src/prefs_themes.c:506
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Ta bort tema '%s'"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:511
 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:517
+#: src/prefs_themes.c:521
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17950,24 +18512,24 @@ msgstr ""
 "Fil %s misslyckades\n"
 "när temat togs bort."
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:525
 msgid "Removing theme directory failed."
 msgstr "Borttagning av temakatalogen misslyckades."
 
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:528
 msgid "Theme removed successfully"
 msgstr "Lyckades ta bort tema"
 
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:548
 msgid "Select theme folder"
 msgstr "Välj temamapp"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:563
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Installera tema '%s'"
 
-#: src/prefs_themes.c:562
+#: src/prefs_themes.c:566
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -17975,15 +18537,15 @@ msgstr ""
 "Denna mapp verkar inte vara en temamapp.\n"
 "Installera ändå?"
 
-#: src/prefs_themes.c:572
+#: 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:592
+#: src/prefs_themes.c:596
 msgid "Theme exists"
 msgstr "Temat finns redan"
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:597
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17995,25 +18557,25 @@ msgstr ""
 "\n"
 "Vill du skriva över det?"
 
-#: src/prefs_themes.c:600
+#: src/prefs_themes.c:604
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "Kunde inte ta bort gammalt tema i %s."
 
-#: src/prefs_themes.c:609
+#: src/prefs_themes.c:613
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "Kunde inte skapa målmapp %s."
 
-#: src/prefs_themes.c:623
+#: src/prefs_themes.c:627
 msgid "Theme installed successfully."
 msgstr "Temat installerades utan fel."
 
-#: src/prefs_themes.c:630
+#: src/prefs_themes.c:634
 msgid "Failed installing theme"
 msgstr "Misslyckades med att installera tema"
 
-#: src/prefs_themes.c:633
+#: src/prefs_themes.c:637
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18022,74 +18584,82 @@ msgstr ""
 "Fil %s misslyckades\n"
 "när temat installerades."
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:686
+msgid "View all theme icons"
+msgstr "Visa alla temaikoner"
+
+#: src/prefs_themes.c:901
 #, 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:844
+#: src/prefs_themes.c:942
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "Internt tema har %d ikoner"
 
-#: src/prefs_themes.c:850
+#: src/prefs_themes.c:948
 msgid "No info file available for this theme"
 msgstr "Ingen filinformation finns tillgänglig för detta tema"
 
-#: src/prefs_themes.c:868
+#: src/prefs_themes.c:966
 msgid "Error: couldn't get theme status"
 msgstr "Fel: kunde inte hämta status för temat"
 
-#: src/prefs_themes.c:898
+#: src/prefs_themes.c:996
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d filer (%d ikoner), storlek: %s"
 
-#: src/prefs_themes.c:956
+#: src/prefs_themes.c:1055
 msgid "Selector"
 msgstr "Välj"
 
-#: src/prefs_themes.c:967
+#: src/prefs_themes.c:1066
 msgid "Install new..."
 msgstr "Installera nytt..."
 
-#: src/prefs_themes.c:972
+#: src/prefs_themes.c:1071
 msgid "Get more..."
 msgstr "Hämta mer..."
 
-#: src/prefs_themes.c:983
+#: src/prefs_themes.c:1083
 msgid "Information"
 msgstr "Information"
 
-#: src/prefs_themes.c:998
+#: src/prefs_themes.c:1098
 msgid "Author"
 msgstr "Författare"
 
-#: src/prefs_themes.c:1006
+#: src/prefs_themes.c:1104
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1048
+#: src/prefs_themes.c:1142
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: src/prefs_themes.c:1105
+#: src/prefs_themes.c:1205
+msgid "View all"
+msgstr "Visa alla"
+
+#: src/prefs_themes.c:1210
 msgid "SVG rendering"
 msgstr "SVG-rendering"
 
-#: src/prefs_themes.c:1112
+#: src/prefs_themes.c:1217
 msgid "Enable alpha channel"
 msgstr "Aktivera alfakanal"
 
-#: src/prefs_themes.c:1113
+#: src/prefs_themes.c:1218
 msgid "Force scaling"
 msgstr "Tvinga skalning"
 
-#: src/prefs_themes.c:1119
+#: src/prefs_themes.c:1224
 msgid "Pixels per inch (PPI)"
 msgstr "Pixlar per Inch (PPI)"
 
-#: src/prefs_toolbar.c:186
+#: src/prefs_toolbar.c:187
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -18097,19 +18667,19 @@ msgstr ""
 "Vald aktivitet är redan inställd.\n"
 "Välj en annan aktivitet från listan"
 
-#: src/prefs_toolbar.c:187
+#: src/prefs_toolbar.c:188
 msgid "Item has no icon defined."
 msgstr "Posten har ingen ikon definierad."
 
-#: src/prefs_toolbar.c:188
+#: src/prefs_toolbar.c:189
 msgid "Item has no text defined."
 msgstr "Posten har inte text definierad."
 
-#: src/prefs_toolbar.c:896
+#: src/prefs_toolbar.c:897
 msgid "Toolbar item"
 msgstr "Objekt på verktygsrad"
 
-#: src/prefs_toolbar.c:912
+#: src/prefs_toolbar.c:914
 msgid "Item type"
 msgstr "Typ av objekt"
 
@@ -18121,51 +18691,47 @@ msgstr "Intern funktion"
 msgid "User Action"
 msgstr "Användaraktivitet"
 
-#: src/prefs_toolbar.c:925 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:283
 msgid "Separator"
 msgstr "Separator"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:930
 msgid "Event executed on click"
 msgstr "Aktivitet vid klick"
 
-#: src/prefs_toolbar.c:959
+#: src/prefs_toolbar.c:949
 msgid "Toolbar text"
 msgstr "Text på verktygsraden"
 
-#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
+#: src/prefs_toolbar.c:962 src/prefs_toolbar.c:1338
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/prefs_toolbar.c:1010
-msgid "A_dd"
-msgstr "Lägg till"
-
-#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
+#: src/prefs_toolbar.c:1216 src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244
 msgid "Toolbars"
 msgstr "Verktygsrader"
 
-#: src/prefs_toolbar.c:1231
+#: src/prefs_toolbar.c:1217
 msgid "Main Window"
 msgstr "Huvudfönster"
 
-#: src/prefs_toolbar.c:1245
+#: src/prefs_toolbar.c:1231
 msgid "Message Window"
 msgstr "Meddelandefönster"
 
-#: src/prefs_toolbar.c:1259
+#: src/prefs_toolbar.c:1245
 msgid "Compose Window"
 msgstr "Skriv Meddelandefönster"
 
-#: src/prefs_toolbar.c:1374
+#: src/prefs_toolbar.c:1361
 msgid "Icon text"
 msgstr "Ikontext"
 
-#: src/prefs_toolbar.c:1383
+#: src/prefs_toolbar.c:1370
 msgid "Mapped event"
 msgstr "Tilldelad händelse"
 
-#: src/prefs_toolbar.c:1690
+#: src/prefs_toolbar.c:1677
 msgid "Toolbar item icon"
 msgstr "Ikon för verktygsraden"
 
@@ -18193,73 +18759,73 @@ msgstr "Radbrytning vid"
 msgid "Wrapping"
 msgstr "Radbryt"
 
-#: src/printing.c:431
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Förhandsgranskning"
 
-#: src/printing.c:474
+#: src/printing.c:479
 msgid "First page"
 msgstr "Första sidan"
 
-#: src/printing.c:484
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Sista sidan"
 
-#: src/printing.c:490
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "Zooma 100%"
 
-#: src/printing.c:492
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Anpassad zoom"
 
-#: src/printing.c:494
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Zooma in"
 
-#: src/printing.c:496
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Zooma ut"
 
-#: src/printing.c:676
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Sida %d"
 
-#: src/privacy.c:255 src/privacy.c:276
+#: src/privacy.c:289 src/privacy.c:293
 msgid "No information available"
 msgstr "Ingen information tillgänglig"
 
-#: src/privacy.c:490
+#: src/privacy.c:507
 msgid "No recipient keys defined."
 msgstr "Ingen mottagarnyckel är definierad."
 
-#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
+#: src/procmime.c:414 src/procmime.c:416 src/procmime.c:417
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fel vid avkodning av BASE64]\n"
 
-#: src/procmime.c:2755
+#: src/procmime.c:2836
 msgid "Could not decode part"
 msgstr "Kunde inte avkoda del"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:961 src/procmsg.c:964
 msgid "Already trying to send."
 msgstr "Försöker redan sända."
 
-#: src/procmsg.c:1563 src/procmsg.c:1624
+#: src/procmsg.c:1588 src/procmsg.c:1649
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Kunde inte öppna filen %s."
 
-#: src/procmsg.c:1634
+#: src/procmsg.c:1659
 msgid "Queued message header is broken."
 msgstr "Köat meddelande har felaktigt brevhuvud."
 
-#: src/procmsg.c:1654
+#: src/procmsg.c:1679
 msgid "An error happened during SMTP session."
 msgstr "Ett fel uppstod i SMTP-session."
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1693
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
@@ -18267,7 +18833,7 @@ msgstr ""
 "Inget specifikt konto har hittats för att skicka, och ett fel inträffade "
 "under SMTP-session."
 
-#: src/procmsg.c:1676
+#: src/procmsg.c:1701
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
@@ -18275,155 +18841,155 @@ msgstr ""
 "Kunde inte bestämma sändningsinformation. Möjligen har e-postmeddelandet "
 "inte skapats av Claws-Mail."
 
-#: src/procmsg.c:1699
+#: src/procmsg.c:1724
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 "Kunde inte skapa tillfällig fil för skickande av diskussionsgruppmeddelande."
 
-#: src/procmsg.c:1712
+#: src/procmsg.c:1737
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Ett fel uppstod när tillfällig fil för skickande av "
 "diskussionsgruppmeddelande skrevs."
 
-#: src/procmsg.c:1726
+#: src/procmsg.c:1751
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Fel uppstod medan meddelande till %s skickades."
 
-#: src/procmsg.c:2286
+#: src/procmsg.c:2311
 msgid "Filtering messages...\n"
 msgstr "Filtrerar meddelade...\n"
 
-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:46
 msgid "<span weight=\"bold\">symbols:</span>"
 msgstr "<span weight=\"bold\">symboler:</span>"
 
-#: src/quote_fmt.c:48
+#: src/quote_fmt.c:47
 msgid "customized date format (see 'man strftime')"
 msgstr "anpassat datumformat (se 'man strftime')"
 
-#: src/quote_fmt.c:51
+#: src/quote_fmt.c:50
 msgid "email address of sender"
 msgstr "avsändarens e-postadress"
 
-#: src/quote_fmt.c:52
+#: src/quote_fmt.c:51
 msgid "full name of sender"
 msgstr "avsändarens fullständiga namn"
 
-#: src/quote_fmt.c:53
+#: src/quote_fmt.c:52
 msgid "first name of sender"
 msgstr "avsändarens förnamn"
 
-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:53
 msgid "last name of sender"
 msgstr "avsändarens efternamn"
 
-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:54
 msgid "initials of sender"
 msgstr "avsändarens initialer"
 
-#: src/quote_fmt.c:62
+#: src/quote_fmt.c:61
 msgid "message body"
 msgstr "meddelandetext"
 
-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:62
 msgid "quoted message body"
 msgstr "citerat meddelande"
 
-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:63
 msgid "message body without signature"
 msgstr "meddelandetext utan signatur"
 
-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:64
 msgid "quoted message body without signature"
 msgstr "citerat meddelande utan signatur"
 
-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:65
 msgid "message tags"
 msgstr "meddelandeetiketter"
 
-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:66
 msgid "current dictionary"
 msgstr "nuvarande ordlista"
 
-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:67
 msgid "cursor position"
 msgstr "position för markör"
 
-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:68
 msgid "account property: your name"
 msgstr "kontoegenskap: ditt namn"
 
-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:69
 msgid "account property: your email address"
 msgstr "kontoegenskap: din e-postadress"
 
-#: src/quote_fmt.c:71
+#: src/quote_fmt.c:70
 msgid "account property: account name"
 msgstr "kontoegenskap: kontonamn"
 
-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:71
 msgid "account property: organization"
 msgstr "kontoegenskap: organisation"
 
-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:72
 msgid "account property: signature"
 msgstr "kontoegenskap: signatur"
 
-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:73
 msgid "account property: signature path"
 msgstr "kontoegenskap: sökväg till signatur"
 
-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:74
 msgid "account property: default dictionary"
 msgstr "kontoegenskap: standardordlista"
 
-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:75
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
 msgstr "adressbok <span style=\"oblique\">ifyllning</span>: Kopia"
 
-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: From"
 msgstr "adressbok <span style=\"oblique\">ifyllning</span>: Från"
 
-#: src/quote_fmt.c:78
+#: src/quote_fmt.c:77
 msgid "address book <span style=\"oblique\">completion</span>: To"
 msgstr "adressbok <span style=\"oblique\">ifyllning</span>: Till"
 
-#: src/quote_fmt.c:80
+#: src/quote_fmt.c:79
 msgid "literal backslash"
 msgstr "tecknet bakstreck"
 
-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:80
 msgid "literal question mark"
 msgstr "tecknet frågetecken"
 
-#: src/quote_fmt.c:82
+#: src/quote_fmt.c:81
 msgid "literal exclamation mark"
 msgstr "tecknet utropstecken"
 
-#: src/quote_fmt.c:83
+#: src/quote_fmt.c:82
 msgid "literal pipe"
 msgstr "tecknet lodstreck"
 
-#: src/quote_fmt.c:84
+#: src/quote_fmt.c:83
 msgid "literal opening curly brace"
 msgstr "tecknet påbörjande klammerparentes"
 
-#: src/quote_fmt.c:85
+#: src/quote_fmt.c:84
 msgid "literal closing curly brace"
 msgstr "tecknet avslutande klammerparentes"
 
-#: src/quote_fmt.c:86
+#: src/quote_fmt.c:85
 msgid "tab"
 msgstr "tabb"
 
-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:88
 msgid "<span weight=\"bold\">commands:</span>"
 msgstr "<span weight=\"bold\">kommandon:</span>"
 
-#: src/quote_fmt.c:90
+#: src/quote_fmt.c:89
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
@@ -18433,7 +18999,7 @@ msgstr ""
 "symbolerna [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "(eller deras långa motsvarighet)"
 
-#: src/quote_fmt.c:91
+#: src/quote_fmt.c:90
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
 "of\n"
@@ -18445,7 +19011,7 @@ msgstr ""
 "symbolerna [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "(eller deras långa motsvarighet)"
 
-#: src/quote_fmt.c:92
+#: src/quote_fmt.c:91
 msgid ""
 "insert file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
@@ -18455,7 +19021,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> utvärderas som sökvägen till filen "
 "att infoga"
 
-#: src/quote_fmt.c:93
+#: src/quote_fmt.c:92
 msgid ""
 "insert program output:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -18466,7 +19032,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> utvärderas som kommandorad som "
 "genererar utdata"
 
-#: src/quote_fmt.c:94
+#: src/quote_fmt.c:93
 msgid ""
 "insert user input:\n"
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
@@ -18476,7 +19042,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> är en variable som ersätts av\n"
 "användarens inmatade text"
 
-#: src/quote_fmt.c:95
+#: src/quote_fmt.c:94
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
@@ -18486,7 +19052,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> utvärderas som sökvägen till filen "
 "att bifoga"
 
-#: src/quote_fmt.c:96
+#: src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -18498,11 +19064,11 @@ msgstr ""
 "får\n"
 "filnamnet från"
 
-#: src/quote_fmt.c:98
+#: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
 msgstr "<span weight=\"bold\">definition av termer:</span>"
 
-#: src/quote_fmt.c:99
+#: src/quote_fmt.c:98
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
@@ -18510,7 +19076,7 @@ msgstr ""
 "text som kan innehålla någon av symbolerna eller\n"
 "kommandona ovan"
 
-#: src/quote_fmt.c:100
+#: src/quote_fmt.c:99
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
@@ -18518,7 +19084,7 @@ msgstr ""
 "text som kan innehålla någon av symbolerna (inga\n"
 "kommandon) ovan"
 
-#: src/quote_fmt.c:101
+#: src/quote_fmt.c:100
 msgid ""
 "completion from address book only works with the first\n"
 "address of the header, it outputs the full name\n"
@@ -18530,19 +19096,19 @@ msgstr ""
 "fullständiga namn om adressen matchar exakt\n"
 "en kontakt i adressboken"
 
-#: src/quote_fmt.c:110
+#: src/quote_fmt.c:109
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/quote_fmt.c:111
+#: src/quote_fmt.c:110
 msgid "The following symbols and commands can be used:"
 msgstr "Följande symboler och kommandon kan användas:"
 
-#: src/quote_fmt.c:174
+#: src/quote_fmt.c:173
 msgid "Use template when composing new messages"
 msgstr "Använd mall för att skapa nytt meddelande"
 
-#: src/quote_fmt.c:197
+#: src/quote_fmt.c:196
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -18560,21 +19126,21 @@ msgstr ""
 "Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att "
 "svara."
 
-#: src/quote_fmt.c:331 src/quote_fmt.c:459
+#: src/quote_fmt.c:331 src/quote_fmt.c:460
 msgid "Quotation mark"
 msgstr "Citattecken"
 
-#: src/quote_fmt.c:425
+#: src/quote_fmt.c:426
 msgid "Use template when forwarding messages"
 msgstr "Använd mall för att vidarebefordra meddelande"
 
-#: src/quote_fmt.c:448
+#: src/quote_fmt.c:449
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr ""
 "Åsidosätt Från-brevhuvud. Detta ändrar inte vilket konto som används för att "
 "vidarebefordra."
 
-#: src/quote_fmt.c:557
+#: src/quote_fmt.c:559
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
@@ -18582,15 +19148,15 @@ msgstr ""
 "\"Från\"-fältet i \"Nytt meddelande\"-mallen innehåller en ogiltig email-"
 "adress."
 
-#: src/quote_fmt.c:560
+#: src/quote_fmt.c:562
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "Fältet \"Ämne\" i \"Nytt meddelande\"-mallen är ogiltigt."
 
-#: src/quote_fmt.c:577
+#: src/quote_fmt.c:579
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "\"Citattecken\"-fältet av \"Svar\"-mallen är ogiltig."
 
-#: src/quote_fmt.c:597
+#: src/quote_fmt.c:599
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "\"Citattecken\"-fältet av \"Vidarebefordra\"-mallen är ogiltig."
 
@@ -18603,88 +19169,88 @@ msgstr "Skriv in text att ersätta '%s'"
 msgid "Enter variable"
 msgstr "Mata in variabel"
 
-#: src/send_message.c:154
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "Skickar meddelande med kommando: %s\n"
 
-#: src/send_message.c:168
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Kunde inte exekvera kommando: %s"
 
-#: src/send_message.c:204
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Ett fel uppstod medan kommando: %s kördes"
 
-#: src/send_message.c:353
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/send_message.c:358
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "Gör POP före SMTP..."
 
-#: src/send_message.c:361
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "POP innan SMTP"
 
-#: src/send_message.c:366
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "Konto '%s': Ansluter till SMTP-server: %s:%d..."
 
-#: src/send_message.c:439
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "E-post skickad framgångsrikt."
 
-#: src/send_message.c:505
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "Skickar HELO..."
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "(meddelande)verifiering"
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:510
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:519
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:523
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:528
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:532
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/send_message.c:561
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:614
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "Ett fel uppstod medan meddelandet skickades."
 
-#: src/send_message.c:686
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18709,11 +19275,11 @@ msgstr ""
 "om du har en.\n"
 "Är du inte säker, välj bara OK."
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Meddelandets källkod"
 
-#: src/sourcewindow.c:161
+#: src/sourcewindow.c:162
 #, c-format
 msgid "%s - Source"
 msgstr "%s - Källkod"
@@ -18723,352 +19289,352 @@ msgid "Expiry"
 msgstr "Utgår"
 
 #: src/ssl_manager.c:195
-msgid "Saved SSL/TLS certificates"
-msgstr "Sparade SSL/TLS-certifikat"
+msgid "Saved TLS certificates"
+msgstr "Sparade TLS-certifikat"
 
-#: src/ssl_manager.c:445
+#: src/ssl_manager.c:451
 msgid "Delete certificate"
 msgstr "Ta bort certifikat"
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:452
 msgid "Do you really want to delete this certificate?"
 msgstr "Vill du verkligen ta bort detta certifikat?"
 
-#: src/summary_search.c:290
+#: src/summary_search.c:288
 msgid "Search messages"
 msgstr "Sök meddelanden"
 
-#: src/summary_search.c:313
+#: src/summary_search.c:311
 msgid "Match any of the following"
 msgstr "Matcha någon av följande"
 
-#: src/summary_search.c:315
+#: src/summary_search.c:313
 msgid "Match all of the following"
 msgstr "Matcha alla följande"
 
-#: src/summary_search.c:436
+#: src/summary_search.c:441
 msgid "Body:"
 msgstr "Meddelandetext:"
 
-#: src/summary_search.c:443
+#: src/summary_search.c:447
 msgid "Condition:"
 msgstr "Villkor:"
 
-#: src/summary_search.c:477
+#: src/summary_search.c:480
 msgid "Find _all"
 msgstr "Hitta _alla"
 
-#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
+#: src/summary_search.c:696 src/summaryview.c:1138 src/summaryview.c:1402
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Söker i %s... \n"
 
-#: src/summary_search.c:787
+#: src/summary_search.c:792
 msgid "Beginning of list reached; continue from end?"
 msgstr "Början av lista nådd; fortsätt från slutet?"
 
-#: src/summary_search.c:789
+#: src/summary_search.c:794
 msgid "End of list reached; continue from beginning?"
 msgstr "Slutet av lista nådd; fortsätt från början?"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:426
 msgid "Re-edit"
 msgstr "Omredigera"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:439
 msgid "Create _filter rule"
 msgstr "Skapa filter_regel"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:452
 msgid "_Set displayed columns"
 msgstr "Välj vi_sade kolumner"
 
-#: src/summaryview.c:461
+#: src/summaryview.c:457
 msgid "_Lock column headers"
 msgstr "Lås kolumnhuvuden"
 
-#: src/summaryview.c:598
+#: src/summaryview.c:595
 msgid "Toggle quick search bar"
 msgstr "Visa/Dölj snabbsöksfält"
 
-#: src/summaryview.c:635
+#: src/summaryview.c:632
 msgid "Toggle multiple selection"
 msgstr "Slå av/på multipla markeringar"
 
-#: src/summaryview.c:1339
+#: src/summaryview.c:1329
 msgid "Process mark"
 msgstr "Behandlingsmarkering"
 
-#: src/summaryview.c:1340
+#: src/summaryview.c:1330
 msgid "Some marks are left. Process them?"
 msgstr "Några markeringar finns kvar. Behandla dem?"
 
-#: src/summaryview.c:1390
+#: src/summaryview.c:1381
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Genomsöker mapp (%s)..."
 
-#: src/summaryview.c:1950 src/summaryview.c:1998
+#: src/summaryview.c:1935 src/summaryview.c:1984
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1951
+#: src/summaryview.c:1936
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
-#: src/summaryview.c:2096 src/summaryview.c:2163
+#: src/summaryview.c:1949 src/summaryview.c:1998 src/summaryview.c:2036
+#: src/summaryview.c:2085 src/summaryview.c:2154
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Internt fel: oväntat värde för prefs_common.next_unread_msg_dialog\n"
 
-#: src/summaryview.c:1975
+#: src/summaryview.c:1961
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1999
+#: src/summaryview.c:1985
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:2035 src/summaryview.c:2083
+#: src/summaryview.c:2022 src/summaryview.c:2071
 msgid "No more new messages"
 msgstr "Inga fler nya meddelande"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2023
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2048
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2072
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:2117 src/summaryview.c:2150
+#: src/summaryview.c:2106 src/summaryview.c:2140
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2107
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:2127
+#: src/summaryview.c:2117
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:2151
+#: src/summaryview.c:2141
 msgid "No marked message found. Go to next folder?"
 msgstr "Inget markerat meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:2184 src/summaryview.c:2213
+#: src/summaryview.c:2175 src/summaryview.c:2205
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:2185
+#: src/summaryview.c:2176
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:2194 src/summaryview.c:2227
+#: src/summaryview.c:2186 src/summaryview.c:2220
 msgid "No labeled messages."
 msgstr "Inga färgmarkerade meddelanden."
 
-#: src/summaryview.c:2214
+#: src/summaryview.c:2206
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:2537
+#: src/summaryview.c:2530
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2718
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:2726
+#: src/summaryview.c:2722
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:2727 src/summaryview.c:2734
+#: src/summaryview.c:2723 src/summaryview.c:2730
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2732
+#: src/summaryview.c:2728
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2742
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " objekt valt"
 msgstr[1] " objekt valda"
 
-#: src/summaryview.c:2764 src/summaryview.c:2809
+#: src/summaryview.c:2760 src/summaryview.c:2805
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d ny(a), %d oläst(a), %d totalt (%s)"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2780
 msgid "Message summary"
 msgstr "Meddelandesammanfattning"
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2781
 msgid "New:"
 msgstr "Nytt:"
 
-#: src/summaryview.c:2786
+#: src/summaryview.c:2782
 msgid "Unread:"
 msgstr "Oläst(a):"
 
-#: src/summaryview.c:2787
+#: src/summaryview.c:2783
 msgid "Total:"
 msgstr "Totalt:"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2785
 msgid "Marked:"
 msgstr "Markerad:"
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2786
 msgid "Replied:"
 msgstr "Besvarat:"
 
-#: src/summaryview.c:2791
+#: src/summaryview.c:2787
 msgid "Forwarded:"
 msgstr "Vidarebefordrad:"
 
-#: src/summaryview.c:2792
+#: src/summaryview.c:2788
 msgid "Locked:"
 msgstr "Låst:"
 
-#: src/summaryview.c:2793
+#: src/summaryview.c:2789
 msgid "Ignored:"
 msgstr "Ignorerad:"
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2790
 msgid "Watched:"
 msgstr "Bevakad:"
 
-#: src/summaryview.c:2804
+#: src/summaryview.c:2800
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d valda (%s/%s), %d olästa"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3088
 msgid "Sorting summary..."
 msgstr "Sorterar sammanfattning..."
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3260
 msgid "Setting summary from message data..."
 msgstr "Skapar sammanfattning från meddelandedata..."
 
-#: src/summaryview.c:3471
+#: src/summaryview.c:3466
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
-#: src/summaryview.c:3528
+#: src/summaryview.c:3523
 msgid "(No Recipient)"
 msgstr "(Ingen mottagare)"
 
-#: src/summaryview.c:3576
+#: src/summaryview.c:3571
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Från: %s, på %s"
 
-#: src/summaryview.c:3585
+#: src/summaryview.c:3580
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Till: %s, på %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4465
 msgid "You're not the author of the article."
 msgstr "Du är inte artikelns författare."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4555
 #, 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:4574
+#: src/summaryview.c:4558
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Ta bort meddelande"
 msgstr[1] "Ta bort meddelanden"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4722
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4777
 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:4844
+#: src/summaryview.c:4828
 msgid "Destination to copy is same as current folder."
 msgstr "Destinationen att kopiera är samma som aktuell mapp."
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4862
 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:5036
+#: src/summaryview.c:5026
 msgid "Append or Overwrite"
 msgstr "Lägg till eller Skriv över"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5027
 msgid "Append or overwrite existing file?"
 msgstr "Lägg till eller skriv över befintlig fil?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5028
 msgid "_Append"
 msgstr "_Bifoga"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5028
 msgid "_Overwrite"
 msgstr "_Skriv över"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan inte spara filen '%s'."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5080
 #, 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:5544
+#: src/summaryview.c:5538
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5786
 msgid "Skip these rules"
 msgstr "Hoppa över dessa regler"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5789
 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:5798
+#: src/summaryview.c:5792
 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:5827
+#: src/summaryview.c:5821
 msgid "Filtering"
 msgstr "Filtrerar"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5822
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19076,72 +19642,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:5860
+#: src/summaryview.c:5854
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5937
 msgid "Processing configuration"
 msgstr "Behandlar konfiguration"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6087
 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:6093
+#: src/summaryview.c:6089
 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:6094
+#: src/summaryview.c:6090
 msgid "Reset color label"
 msgstr "Återställ färgetikett"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6090
 msgid "Set color label"
 msgstr "Sätt färgmarkering"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6529
 msgid "Ignored thread"
 msgstr "Ignorera tråd"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6531
 msgid "Watched thread"
 msgstr "Bevakad tråd"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6539
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Besvarat men även vidarebefordrat - klicka för att se svar"
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6541
 msgid "Replied - click to see reply"
 msgstr "Svarat på - klicka för att se svar"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6553
 msgid "To be moved"
 msgstr "Att flyttas"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6555
 msgid "To be copied"
 msgstr "Att bli kopierad"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6567
 msgid "Signed, has attachment(s)"
 msgstr "Signerat, har bilaga(or)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6571
 msgid "Encrypted, has attachment(s)"
 msgstr "Krypterad, har bilaga(or)"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6573
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6575
 msgid "Has attachment(s)"
 msgstr "Har bilaga(or)"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19150,45 +19716,45 @@ msgstr ""
 "Fel i reguljärt uttryck (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8405
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Gå tillbaka till mapplistan (Du har olästa meddelanden)"
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "Gå tillbaka till mapplistan"
 
-#: src/textview.c:242
+#: src/textview.c:241
 msgid "_Open in web browser"
 msgstr "_Öppna i webbläsare"
 
-#: src/textview.c:243
+#: src/textview.c:242
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:250
+#: src/textview.c:249
 msgid "_Reply to this address"
 msgstr "Svara till denna ad_ress"
 
-#: src/textview.c:251
+#: src/textview.c:250
 msgid "Add to _Address book"
 msgstr "Lägg till i _adressbok"
 
-#: src/textview.c:252
+#: src/textview.c:251
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:702
+#: src/textview.c:708
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d byte)]"
 
-#: src/textview.c:705
+#: src/textview.c:711
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d byte)]"
 
-#: src/textview.c:875
+#: src/textview.c:881
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19202,67 +19768,67 @@ msgstr ""
 "\n"
 "  Använd "
 
-#: src/textview.c:880
+#: src/textview.c:886
 msgid "'Network Log'"
 msgstr "'Nätverkslogg'"
 
-#: src/textview.c:881
+#: src/textview.c:887
 msgid " in the Tools menu for more information."
 msgstr " i Verktygs-menyn för mer information."
 
-#: src/textview.c:947
+#: src/textview.c:953
 msgid "  The following can be performed on this part\n"
 msgstr "  Följande kan utföras på denna del\n"
 
-#: src/textview.c:949
+#: src/textview.c:955
 msgid "  by right-clicking the icon or list item:"
 msgstr " genom att högerklicka på ikonen eller listposten:"
 
-#: src/textview.c:953
+#: src/textview.c:959
 msgid "     - To save, select "
 msgstr "     - För att spara, välj "
 
-#: src/textview.c:954
+#: src/textview.c:960
 msgid "'Save as...'"
 msgstr "'Spara som...'"
 
-#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
+#: src/textview.c:962 src/textview.c:974 src/textview.c:986 src/textview.c:996
 msgid " (Shortcut key: '"
 msgstr " (Tangentbordsgenväg: '"
 
-#: src/textview.c:964
+#: src/textview.c:970
 msgid "     - To display as text, select "
 msgstr "     - För att visa som text, välj "
 
-#: src/textview.c:965
+#: src/textview.c:971
 msgid "'Display as text'"
 msgstr "'Visa som text'"
 
-#: src/textview.c:976
+#: src/textview.c:982
 msgid "     - To open with an external program, select "
 msgstr "     - För att öppna med ett externt program, välj "
 
-#: src/textview.c:977
+#: src/textview.c:983
 msgid "'Open'"
 msgstr "'Öppna'"
 
-#: src/textview.c:985
+#: src/textview.c:991
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativt dubbelklicka, eller mittklicka "
 
-#: src/textview.c:986
+#: src/textview.c:992
 msgid "mouse button)\n"
 msgstr "musknapp)\n"
 
-#: src/textview.c:988
+#: src/textview.c:994
 msgid "     - Or use "
 msgstr "     - Eller använd "
 
-#: src/textview.c:989
+#: src/textview.c:995
 msgid "'Open with...'"
 msgstr "'Öppna _med...'"
 
-#: src/textview.c:1111
+#: src/textview.c:1118
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19273,432 +19839,468 @@ msgstr ""
 "    %s\n"
 "Slutstatus %d\n"
 
-#: src/textview.c:2195
+#: src/textview.c:2229
 msgid "Tags: "
 msgstr "Etiketter: "
 
-#: src/textview.c:2914
+#: src/textview.c:2714
+msgid "Zoom _In"
+msgstr "Zooma _in"
+
+#: src/textview.c:2723
+msgid "Zoom _Out"
+msgstr "Zooma _ut"
+
+#: src/textview.c:2732
+msgid "Reset _zoom"
+msgstr "Återställ _zoom"
+
+#: src/textview.c:3101
+msgid "Copy it anyway?"
+msgstr "Kopiera den ändå?"
+
+#: src/textview.c:3101
+msgid "Open it anyway?"
+msgstr "Öppna ändå?"
+
+#: src/textview.c:3102
+msgid "Co_py URL"
+msgstr "Ko_piera URL"
+
+#: src/textview.c:3102
+msgid "_Open URL"
+msgstr "_Öppna URL"
+
+#: src/textview.c:3108
 msgid "The real URL is different from the displayed URL."
 msgstr "Den verkliga URLen är inte samma som den visade."
 
-#: src/textview.c:2915
+#: src/textview.c:3109
 msgid "Displayed URL:"
 msgstr "Visad URL:"
 
-#: src/textview.c:2916
+#: src/textview.c:3110
 msgid "Real URL:"
 msgstr "Verklig URL:"
 
-#: src/textview.c:2917
-msgid "Open it anyway?"
-msgstr "Öppna ändå?"
-
-#: src/textview.c:2918
+#: src/textview.c:3112
 msgid "Phishing attempt warning"
 msgstr "Varning försök till nätfiske"
 
-#: src/textview.c:2919
-msgid "_Open URL"
-msgstr "_Öppna URL"
-
-#: src/toolbar.c:224 src/toolbar.c:2294
+#: src/toolbar.c:227 src/toolbar.c:2336
 msgid "Receive Mail from all Accounts"
 msgstr "Hämta e-post från alla konton"
 
-#: src/toolbar.c:225 src/toolbar.c:2299
+#: src/toolbar.c:228 src/toolbar.c:2341
 msgid "Receive Mail from current Account"
 msgstr "Hämta e-post från aktuellt konto"
 
-#: src/toolbar.c:226 src/toolbar.c:2303
+#: src/toolbar.c:229 src/toolbar.c:2345
 msgid "Send Queued Messages"
 msgstr "Skicka köade meddelande"
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
+#: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Compose Email"
 msgstr "Skriv e-postmeddelande"
 
-#: src/toolbar.c:228
+#: src/toolbar.c:231
 msgid "Compose News"
 msgstr "Skriv diskussionsgruppmeddelande"
 
-#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
+#: src/toolbar.c:232 src/toolbar.c:2418 src/toolbar.c:2428
 msgid "Reply to Message"
 msgstr "Svara på meddelande"
 
-#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
+#: src/toolbar.c:233 src/toolbar.c:2435 src/toolbar.c:2445
 msgid "Reply to Sender"
 msgstr "Svara till avsändare"
 
-#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
+#: src/toolbar.c:234 src/toolbar.c:2452 src/toolbar.c:2462
 msgid "Reply to All"
 msgstr "Svara till Alla"
 
-#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
+#: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
 msgid "Reply to Mailing-list"
 msgstr "Svara till sändlista"
 
-#: src/toolbar.c:233 src/toolbar.c:2315
+#: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
 msgstr "Öppna e-post"
 
-#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
+#: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
 msgid "Forward Message"
 msgstr "Vidarebefordra meddelande"
 
-#: src/toolbar.c:235 src/toolbar.c:2460
+#: src/toolbar.c:238 src/toolbar.c:2502
 msgid "Trash Message"
 msgstr "Flytta till papperskorg"
 
-#: src/toolbar.c:236 src/toolbar.c:2464
+#: src/toolbar.c:239 src/toolbar.c:2506
 msgid "Delete Message"
 msgstr "Ta bort meddelande"
 
-#: src/toolbar.c:237
+#: src/toolbar.c:240
 msgid "Delete duplicate messages"
 msgstr "Ta bort meddelande_dubbletter"
 
-#: src/toolbar.c:239 src/toolbar.c:2472
+#: src/toolbar.c:242 src/toolbar.c:2514
 msgid "Go to Previous Unread Message"
 msgstr "Gå till föregående olästa meddelande"
 
-#: src/toolbar.c:240 src/toolbar.c:2476
+#: src/toolbar.c:243 src/toolbar.c:2518
 msgid "Go to Next Unread Message"
 msgstr "Gå till nästa olästa meddelande"
 
-#: src/toolbar.c:244
+#: src/toolbar.c:247
 msgid "Mark Message"
 msgstr "Markera Meddelande"
 
-#: src/toolbar.c:245
+#: src/toolbar.c:248
 msgid "Unmark Message"
 msgstr "Avmarkera Meddelande"
 
-#: src/toolbar.c:246
+#: src/toolbar.c:249
 msgid "Lock Message"
 msgstr "Lås Meddelande"
 
-#: src/toolbar.c:247
+#: src/toolbar.c:250
 msgid "Unlock Message"
 msgstr "Lås upp Meddelande"
 
-#: src/toolbar.c:248
+#: src/toolbar.c:251
 msgid "Mark all Messages as read"
 msgstr "Markera alla Meddelanden som lästa"
 
-#: src/toolbar.c:249
+#: src/toolbar.c:252
 msgid "Mark all Messages as unread"
 msgstr "Markera alla Meddelanden som olästa"
 
-#: src/toolbar.c:250
+#: src/toolbar.c:253
 msgid "Mark Message as read"
 msgstr "Markera Meddelande som läst"
 
-#: src/toolbar.c:251
+#: src/toolbar.c:254
 msgid "Mark Message as unread"
 msgstr "Markera Meddelande som oläst"
 
-#: src/toolbar.c:253 src/toolbar.c:514
+#: src/toolbar.c:255
+msgid "Run folder processing rules"
+msgstr "Kör behandlingsregler för mappen"
+
+#: src/toolbar.c:257 src/toolbar.c:525
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/toolbar.c:254
+#: src/toolbar.c:258
 msgid "Learn Spam or Ham"
 msgstr "Inlärning Skräp eller Ej skräp"
 
-#: src/toolbar.c:255
+#: src/toolbar.c:259
 msgid "Open folder/Go to folder list"
 msgstr "Öppna mapp/Gå till mapplista"
 
-#: src/toolbar.c:258 src/toolbar.c:2482
+#: src/toolbar.c:262 src/toolbar.c:2524
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: src/toolbar.c:259 src/toolbar.c:2486
+#: src/toolbar.c:263 src/toolbar.c:2528
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/toolbar.c:260 src/toolbar.c:2490
+#: src/toolbar.c:264 src/toolbar.c:2532
 msgid "Save to draft folder"
 msgstr "Spara till utkastsmapp"
 
-#: src/toolbar.c:261 src/toolbar.c:2494
+#: src/toolbar.c:265 src/toolbar.c:2536
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/toolbar.c:262 src/toolbar.c:2498
+#: src/toolbar.c:266 src/toolbar.c:2540
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#: src/toolbar.c:263 src/toolbar.c:2502
+#: src/toolbar.c:267 src/toolbar.c:2544
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/toolbar.c:264 src/toolbar.c:2506
+#: src/toolbar.c:268 src/toolbar.c:2548
 msgid "Replace signature"
 msgstr "Ersätt signatur"
 
-#: src/toolbar.c:265 src/toolbar.c:2510
+#: src/toolbar.c:269 src/toolbar.c:2552
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/toolbar.c:266 src/toolbar.c:2514
+#: src/toolbar.c:270 src/toolbar.c:2556
 msgid "Wrap long lines of current paragraph"
 msgstr "Radbryt långa rader i aktuellt stycke"
 
-#: src/toolbar.c:267 src/toolbar.c:2518
+#: src/toolbar.c:271 src/toolbar.c:2560
 msgid "Wrap all long lines"
 msgstr "Radbryt alla långa rader"
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
+#: src/toolbar.c:274 src/toolbar.c:542 src/toolbar.c:2569
 msgid "Check spelling"
 msgstr "Kontrollera stavning"
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
+#: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2574
 msgid "Sign"
 msgstr "Signera"
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
+#: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: src/toolbar.c:274
+#: src/toolbar.c:278
 msgid "Claws Mail Actions Feature"
 msgstr "Claws-Mails aktivitetsfunktion"
 
-#: src/toolbar.c:275 src/toolbar.c:2559
+#: src/toolbar.c:279 src/toolbar.c:2601
 msgid "Cancel receiving"
 msgstr "Avbryt hämtning"
 
-#: src/toolbar.c:277 src/toolbar.c:2567
+#: src/toolbar.c:281 src/toolbar.c:2609
 msgid "Cancel receiving/sending"
 msgstr "Avbryt mottagning/sändning"
 
-#: src/toolbar.c:278 src/toolbar.c:2307
+#: src/toolbar.c:282 src/toolbar.c:2349
 msgid "Close window"
 msgstr "Stäng fönster"
 
-#: src/toolbar.c:280
+#: src/toolbar.c:284
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail Insticksmoduler"
 
-#: src/toolbar.c:445 src/toolbar.c:496
+#: src/toolbar.c:450 src/toolbar.c:506
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/toolbar.c:485
+#: src/toolbar.c:495
 msgid "Get Mail"
 msgstr "Hämta e-post"
 
-#: src/toolbar.c:486
+#: src/toolbar.c:496
 msgid "Get"
 msgstr "Hämta"
 
-#: src/toolbar.c:488 src/toolbar.c:489
+#: src/toolbar.c:498 src/toolbar.c:499
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "Nytt"
 
-#: src/toolbar.c:491
+#: src/toolbar.c:501
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "Avsändare"
 
-#: src/toolbar.c:492
+#: src/toolbar.c:502
 msgid "All"
 msgstr "Alla"
 
-#: src/toolbar.c:493
+#: src/toolbar.c:503
 msgid "List"
 msgstr "Lista"
 
-#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
+#: src/toolbar.c:508 src/toolbar.c:2402 src/toolbar.c:2411
 msgid "Delete duplicates"
 msgstr "Ta bort meddelandedubbletter"
 
-#: src/toolbar.c:500
+#: src/toolbar.c:510
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/toolbar.c:501
+#: src/toolbar.c:511
 msgid "Next"
 msgstr "Nästa"
 
-#: src/toolbar.c:509
+#: src/toolbar.c:519
 msgid "All read"
 msgstr "Alla lästa"
 
-#: src/toolbar.c:510
+#: src/toolbar.c:520
 msgid "All unread"
 msgstr "Alla olästa"
 
-#: src/toolbar.c:511
+#: src/toolbar.c:521
 msgid "Read"
 msgstr "Läs"
 
-#: src/toolbar.c:516
+#: src/toolbar.c:523
+msgid "Run proc. rules"
+msgstr "Kör behandlingsregler"
+
+#: src/toolbar.c:527
 msgid "Folders"
 msgstr "Mappar"
 
-#: src/toolbar.c:521
+#: src/toolbar.c:532
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/toolbar.c:524
+#: src/toolbar.c:535
 msgid "Insert sig."
 msgstr "Infoga sig."
 
-#: src/toolbar.c:525
+#: src/toolbar.c:536
 msgid "Replace sig."
 msgstr "Ersätt sig."
 
-#: src/toolbar.c:526
+#: src/toolbar.c:537
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/toolbar.c:527
+#: src/toolbar.c:538
 msgid "Wrap para."
 msgstr "Radbryt para."
 
-#: src/toolbar.c:528
+#: src/toolbar.c:539
 msgid "Wrap all"
 msgstr "Radbryt alla"
 
-#: src/toolbar.c:536 src/toolbar.c:537
+#: src/toolbar.c:547 src/toolbar.c:548
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/toolbar.c:538
+#: src/toolbar.c:549
 msgid "Stop all"
 msgstr "Stoppa alla"
 
-#: src/toolbar.c:951
+#: src/toolbar.c:968
 msgid "Compose News message"
 msgstr "Nytt diskussionsgrupps-meddelande"
 
-#: src/toolbar.c:990
+#: src/toolbar.c:1007
 msgid "Learn spam"
 msgstr "Markera som skräp"
 
-#: src/toolbar.c:999
+#: src/toolbar.c:1016
 msgid "Ham"
 msgstr "Icke spam"
 
-#: src/toolbar.c:1001
+#: src/toolbar.c:1018
 msgid "Learn ham"
 msgstr "Markera som ej skräp"
 
-#: src/toolbar.c:1916
+#: src/toolbar.c:1956
 msgid "Message will be signed"
 msgstr "Meddelandet kommer att signeras"
 
-#: src/toolbar.c:1918
+#: src/toolbar.c:1958
 msgid "Message will not be signed"
 msgstr "Meddelandet kommer inte att signeras"
 
-#: src/toolbar.c:1937
+#: src/toolbar.c:1977
 msgid "Message will be encrypted"
 msgstr "Meddelandet kommer att krypteras"
 
-#: src/toolbar.c:1939
+#: src/toolbar.c:1979
 msgid "Message will not be encrypted"
 msgstr "Meddelandet kommer inte att krypteras"
 
-#: src/toolbar.c:2289
+#: src/toolbar.c:2331
 msgid "Go to folder list"
 msgstr "Gå till mapplista"
 
-#: src/toolbar.c:2295
+#: src/toolbar.c:2337
 msgid "Receive Mail from selected Account"
 msgstr "Ta emot e-post från valt konto"
 
-#: src/toolbar.c:2311
+#: src/toolbar.c:2353
 msgid "Open preferences"
 msgstr "Öppna egenskaper"
 
-#: src/toolbar.c:2322
+#: src/toolbar.c:2364
 msgid "Compose with selected Account"
 msgstr "Skriv nytt från valt konto"
 
-#: src/toolbar.c:2343
+#: src/toolbar.c:2385
 msgid "Learn as..."
 msgstr "Markera som..."
 
-#: src/toolbar.c:2353
+#: src/toolbar.c:2395
 msgid "Learn as _Spam"
 msgstr "Markera som _skräp"
 
-#: src/toolbar.c:2354
+#: src/toolbar.c:2396
 msgid "Learn as _Ham"
 msgstr "Markera som _ej skräp"
 
-#: src/toolbar.c:2361
+#: src/toolbar.c:2403
 msgid "Delete duplicates options"
 msgstr "Alternativ för borttagning av dubbletter"
 
-#: src/toolbar.c:2365
+#: src/toolbar.c:2407
 msgid "Delete duplicates in selected folder"
 msgstr "Ta bort meddelandedubbletter i vald mapp"
 
-#: src/toolbar.c:2366
+#: src/toolbar.c:2408
 msgid "Delete duplicates in all folders"
 msgstr "Ta bort meddelandedubbletter i alla mappar"
 
-#: src/toolbar.c:2377
+#: src/toolbar.c:2419
 msgid "Reply to Message options"
 msgstr "Alternativ för Svarsmeddelande"
 
-#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
+#: src/toolbar.c:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "_Reply with quote"
 msgstr "Sva_ra med citat"
 
-#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
+#: src/toolbar.c:2424 src/toolbar.c:2441 src/toolbar.c:2458 src/toolbar.c:2475
 msgid "Reply without _quote"
 msgstr "Svara utan _citat"
 
-#: src/toolbar.c:2394
+#: src/toolbar.c:2436
 msgid "Reply to Sender options"
 msgstr "Alternativ för Svara till avsändare"
 
-#: src/toolbar.c:2411
+#: src/toolbar.c:2453
 msgid "Reply to All options"
 msgstr "Alternativ för Svara till Alla"
 
-#: src/toolbar.c:2428
+#: src/toolbar.c:2470
 msgid "Reply to Mailing-list options"
 msgstr "Alternativ för Svara till sändlista"
 
-#: src/toolbar.c:2445
+#: src/toolbar.c:2487
 msgid "Forward Message options"
 msgstr "Alternativ för vidarebefordra meddelande"
 
-#: src/uri_opener.c:87
+#: src/uri_opener.c:70
+msgid "C_opy URL"
+msgstr "K_opiera URL"
+
+#: src/uri_opener.c:101
 msgid "There are no URLs in this email."
 msgstr "Det finns inga webbadresser i detta meddelande."
 
-#: src/uri_opener.c:115
-msgid "Available URLs:"
-msgstr "Tillgängliga webbadresser:"
+#: src/uri_opener.c:129
+msgid "Included URLs:"
+msgstr "Inkluderade URLer:"
 
-#: src/uri_opener.c:189
+#: src/uri_opener.c:209
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Öppna webbadresser"
 
-#: src/uri_opener.c:217
-msgid "Please select the URL to open."
-msgstr "Vänligen välj webbadress att öppna."
-
 #: src/uri_opener.c:225
+msgid "Open in browser"
+msgstr "Öppna i webbläsare"
+
+#: src/uri_opener.c:237
+msgid "Any phishing URLs are shown in red, followed by the actual URL."
+msgstr "Alla phishing-URLer visas i rött, följt av den verkliga URLen."
+
+#: src/uri_opener.c:245
 msgid "Select All"
 msgstr "Markera alla"
 
-#: src/wizard.c:523
+#: src/wizard.c:522
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "Välkommen till Claws Mail"
 
-#: src/wizard.c:546
+#: src/wizard.c:545
 #, c-format
 msgid ""
 "\n"
@@ -19789,47 +20391,47 @@ msgstr ""
 "så på <%s>.\n"
 "\n"
 
-#: src/wizard.c:621
+#: src/wizard.c:620
 msgid "Please enter the mailbox name."
 msgstr "Ange brevlådenamnet."
 
-#: src/wizard.c:649
+#: src/wizard.c:648
 msgid "Please enter your name and email address."
 msgstr "Vänligen ange ditt namn och e-postadress."
 
-#: src/wizard.c:660
+#: src/wizard.c:659
 msgid "Please enter your receiving server and username."
 msgstr "Ange din mottagande server och användarnamn."
 
-#: src/wizard.c:670
+#: src/wizard.c:669
 msgid "Please enter your username."
 msgstr "Ange ditt användarnamn."
 
-#: src/wizard.c:680
+#: src/wizard.c:679
 msgid "Please enter your SMTP server."
 msgstr "Ange din SMTP-server."
 
-#: src/wizard.c:691
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr "Ange ditt SMTP-användarnamn."
 
-#: src/wizard.c:976
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "Ditt namn:"
 
-#: src/wizard.c:987
+#: src/wizard.c:981
 msgid "Your email address:"
 msgstr "Din e-postadress:"
 
-#: src/wizard.c:998
+#: src/wizard.c:994
 msgid "Your organization:"
 msgstr "Din organisation:"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1029
 msgid "Mailbox name:"
 msgstr "Brevlådenamn:"
 
-#: src/wizard.c:1040
+#: src/wizard.c:1036
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19837,7 +20439,7 @@ msgstr ""
 "Du kan också ange en absolut sökväg, till exempel: \"/home/john/Documents/"
 "Mail\""
 
-#: src/wizard.c:1111
+#: src/wizard.c:1106
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19845,51 +20447,55 @@ msgstr ""
 "Du kan ange portnummer genom att lägga till det på slutet: \"mail.example."
 "com:25\""
 
-#: src/wizard.c:1114
+#: src/wizard.c:1109
 msgid "SMTP server address:"
 msgstr "SMTP-serveradress:"
 
-#: src/wizard.c:1129
+#: src/wizard.c:1124
 msgid "(empty to use the same as receive)"
 msgstr "(tomt för samma som vid mottagning)"
 
-#: src/wizard.c:1143
+#: src/wizard.c:1139
 msgid "SMTP username:"
 msgstr "SMTP användarnamn:"
 
-#: src/wizard.c:1154
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "SMTP lösenord:"
 
-#: src/wizard.c:1167
-msgid "Use SSL/TLS to connect to SMTP server"
-msgstr "Använd SSL/TLS för att ansluta till SMTP-server"
+#: src/wizard.c:1169
+msgid "Use TLS to connect to SMTP server"
+msgstr "Använd TLS för att ansluta till SMTP-server"
 
-#: src/wizard.c:1178 src/wizard.c:1598
+#: src/wizard.c:1180 src/wizard.c:1623
 msgid "Use STARTTLS command to start encryption"
 msgstr "Använd STARTTLS-kommando för att starta kryptering"
 
-#: src/wizard.c:1190 src/wizard.c:1610
-msgid "Client SSL/TLS certificate (optional)"
-msgstr "Klient SSL/TLS-certifikat (frivilligt)"
+#: src/wizard.c:1192 src/wizard.c:1636
+msgid "Client TLS certificate (optional)"
+msgstr "Klient TLS-certifikat (valfritt)"
 
-#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
+#: src/wizard.c:1201 src/wizard.c:1646
+msgid "File:"
+msgstr "Fil:"
+
+#: src/wizard.c:1274 src/wizard.c:1306 src/wizard.c:1560
 msgid "Server address:"
 msgstr "Serveradress:"
 
-#: src/wizard.c:1322
+#: src/wizard.c:1338
 msgid "Local mailbox:"
 msgstr "Lokal brevlåda:"
 
-#: src/wizard.c:1491
+#: src/wizard.c:1506
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: src/wizard.c:1500
+#: src/wizard.c:1515
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1556
+#: src/wizard.c:1573
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19897,19 +20503,19 @@ msgstr ""
 "Du kan ange portnummer genom att lägga till det på slutet: \"mail.example."
 "com:110\""
 
-#: src/wizard.c:1587
-msgid "Use SSL/TLS to connect to receiving server"
-msgstr "Använd SSL/TLS för att ansluta till mottagande server"
+#: src/wizard.c:1612
+msgid "Use TLS to connect to receiving server"
+msgstr "Använd TLS för att ansluta till mottagande server"
 
-#: src/wizard.c:1652
+#: src/wizard.c:1690
 msgid "IMAP server directory:"
 msgstr "IMAP-serverkatalog:"
 
-#: src/wizard.c:1663
+#: src/wizard.c:1701
 msgid "Show only subscribed folders"
 msgstr "Visa endast prenumererade mappar"
 
-#: src/wizard.c:1671
+#: src/wizard.c:1709
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19917,15 +20523,15 @@ msgstr ""
 "Varning: denna version av Claws-Mail\n"
 "har byggts utan IMAP-stöd."
 
-#: src/wizard.c:1789
+#: src/wizard.c:1828
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws-Mails konfigurationsguide"
 
-#: src/wizard.c:1822
+#: src/wizard.c:1862
 msgid "Welcome to Claws Mail"
 msgstr "Välkommen till Claws-Mail"
 
-#: src/wizard.c:1829
+#: src/wizard.c:1869
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19939,34 +20545,35 @@ msgstr ""
 "vanligaste e-postinställningar så att du kan börja använda Claws Mail på "
 "mindre än fem minuter."
 
-#: src/wizard.c:1842
+#: src/wizard.c:1882
 msgid "About You"
 msgstr "Om Dig"
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: src/wizard.c:1889 src/wizard.c:1903 src/wizard.c:1917 src/wizard.c:1932
 msgid "Bold fields must be completed"
 msgstr "Fetmarkerade fält måste fyllas i"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1896
 msgid "Receiving mail"
 msgstr "Tar emot post"
 
-#: src/wizard.c:1872
+#: src/wizard.c:1910
 msgid "Sending mail"
 msgstr "Skickar post"
 
-#: src/wizard.c:1888
+#: src/wizard.c:1925
 msgid "Saving mail on disk"
 msgstr "Sparar brev på disk"
 
-#: src/wizard.c:1904
+#: src/wizard.c:1940
 msgid "Configuration finished"
 msgstr "Konfigurationen är klar"
 
-#: src/wizard.c:1911
+#: src/wizard.c:1947
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 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 97c8ba78f..6a0fca349 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: claws-mail 4.0.0\n"
+"Project-Id-Version: claws-mail 4.1.0git71\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-03-27 09:41+0100\n"
-"PO-Revision-Date: 2022-03-30 00:22+0300\n"
+"POT-Creation-Date: 2022-10-11 10:26+0100\n"
+"PO-Revision-Date: 2022-10-13 22:28+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"
@@ -53,7 +53,7 @@ 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/mainwindow.c:518 src/messageview.c:213
+#: src/mainwindow.c:516 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Düzenle"
@@ -82,7 +82,7 @@ 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:552
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:550
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopyala"
@@ -130,19 +130,20 @@ msgstr " Öntanımlı hesap olarak _ata "
 #: 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/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
-#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/about.c:926 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:841 src/message_search.c:238 src/message_search.c:320
-#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: 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/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/prefs_actions.c:920 src/prefs_actions.c:946 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/summary_search.c:495
-#: src/summary_search.c:785
+#: 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/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr "_Kapat"
 
@@ -175,24 +176,24 @@ msgstr "Hesabı sil"
 #: 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:10736
-#: src/compose.c:10741 src/compose.c:10815 src/compose.c:11715
-#: src/compose.c:12232 src/editaddress.c:172 src/editaddress.c:815
-#: src/editbook.c:196 src/editgroup.c:407 src/editjpilot.c:305
+#: 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/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/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
-#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/gtk/progressdialog.c:95 src/imap.c:1193 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:890 src/main.c:2286 src/mainwindow.c:4009
-#: src/mainwindow.c:4212 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:1818
-#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
-#: src/password_gtk.c:211 src/plugins/archive/archiver_gtk.c:117
+#: 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/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
@@ -203,7 +204,7 @@ msgstr "Hesabı sil"
 #: src/plugins/clamd/clamav_plugin_gtk.c:91
 #: src/plugins/gdata/cm_gdata_contacts.c:136
 #: src/plugins/keyword_warner/keyword_warner.c:196
-#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:335
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_editor.c:336
 #: src/plugins/managesieve/sieve_editor.c:435
 #: src/plugins/managesieve/sieve_editor.c:632
@@ -215,21 +216,20 @@ msgstr "Hesabı sil"
 #: src/plugins/rssyl/rssyl_feed_props.c:481
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2030
 #: 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_actions.c:1315
-#: src/prefs_customheader.c:177 src/prefs_customheader.c:693
-#: 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_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:294 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/toolbar.c:3108
-#: src/wizard.c:1833
+#: 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_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/toolbar.c:3108 src/wizard.c:1833
 msgid "_Cancel"
 msgstr "İ_ptal"
 
@@ -237,11 +237,11 @@ msgstr "İ_ptal"
 #: 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/plugins/att_remover/att_remover.c:429
-#: src/plugins/mailmbox/plugin_gtk.c:335
+#: 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:2032 src/prefs_actions.c:1105
-#: src/prefs_customheader.c:693 src/prefs_display_header.c:328
+#: src/plugins/vcalendar/vcal_folder.c:2030 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
 msgid "_Delete"
 msgstr "_Sil"
@@ -260,17 +260,17 @@ msgstr "'Posta Al' seçilen hesaplardan posta alır"
 #: 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:288 src/editjpilot.c:255 src/editldap.c:426
+#: 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/plugins/pdf_viewer/poppler_viewer.c:1860
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: 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
 msgid "Name"
 msgstr "İsim"
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -326,13 +326,13 @@ msgstr ""
 "%s"
 
 #: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
-#: src/compose.c:9751 src/ldaputil.c:334
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1829
-#: src/plugins/vcalendar/vcal_folder.c:1847
-#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
+#: 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
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
@@ -477,13 +477,13 @@ 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:9825 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:1673 src/main.c:412
-#: src/mainwindow.c:2872 src/mainwindow.c:2877 src/message_search.c:335
-#: src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -495,13 +495,14 @@ msgstr ""
 msgid "_No"
 msgstr "_Hayır"
 
-#: src/addrcustomattr.c:199 src/compose.c:9825 src/compose.c:12232
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
 #: 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:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
-#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
-#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: 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/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/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
 #: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
@@ -536,7 +537,7 @@ msgid "New attribute name:"
 msgstr "Yeni ek bilgi tanımı:"
 
 #: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
 #: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
@@ -549,14 +550,13 @@ 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/editaddress.c:816 src/editbook.c:197 src/editgroup.c:408
+#: 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/mimeview.c:1819 src/password_gtk.c:213
-#: src/plugins/archive/archiver_gtk.c:575
+#: 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
@@ -617,7 +617,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:474 src/prefs_summaries.c:480
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
 #: src/toolbar.c:540
 msgid "Address"
 msgstr "Adres Defteri"
@@ -651,7 +651,7 @@ msgid "Contact"
 msgstr "Kişiler"
 
 #: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1303 src/editgroup.c:290
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "Notlar"
 
@@ -668,7 +668,7 @@ 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/editaddress.c:1284 src/editgroup.c:289 src/expldifdlg.c:509
+#: 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"
@@ -677,7 +677,7 @@ msgstr "E-Posta Adresi"
 msgid "_Book"
 msgstr "_Defter"
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Araçlar"
@@ -780,7 +780,7 @@ msgid "_Browse Entry"
 msgstr "Kayda _Bak"
 
 #: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: 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
@@ -937,7 +937,7 @@ msgstr ""
 "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:334 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1049,7 +1049,7 @@ 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:3422 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3460 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dizin"
 
@@ -1173,18 +1173,18 @@ msgstr "Adres(ler)i güncelle"
 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:9825
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "Not"
 
 #: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
-#: src/compose.c:12232 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: 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
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Hata"
@@ -1303,63 +1303,63 @@ 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:1251
+#: src/common/session.c:201 src/imap.c:1261
 msgid "TLS handshake failed\n"
 msgstr "TLS iletişimi başarısız\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "SMTP AUTH yöntemi mevcut değil\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "Seçilen SMTP AUTH yöntemi mevcut değil\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "kötü SMTP tepkisi\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP oturumunda hata meydana geldi\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "kimlik doğrulamada hata meydana geldi\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 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:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "STARTTLS oturumu başlatılamadı\n"
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Soket GÇ zaman aşımı.\n"
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "Bağlantı zaman aşımına uğradı.\n"
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: bağlantı başarısız oldu (%s).\n"
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: bilinmeyen sunucu.\n"
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s sunucu adı bulunamadı (%s).\n"
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "fd%d üzerine yaz: %s\n"
@@ -1695,7 +1695,7 @@ msgstr ""
 msgid "_Add..."
 msgstr "_Ekle..."
 
-#: src/compose.c:605 src/editgroup.c:346 src/mh_gtk.c:376
+#: 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/prefs_actions.c:336 src/prefs_display_header.c:378
 #: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
@@ -1708,7 +1708,7 @@ msgstr "_Kaldır"
 msgid "_Properties..."
 msgstr "_Özellikler..."
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "_İleti"
 
@@ -1720,7 +1720,7 @@ msgstr "_İmlâ"
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "_Yardım"
 
@@ -1780,7 +1780,7 @@ msgstr "_Katlanmış"
 msgid "_Unwrapped"
 msgstr "_Katlanmamış"
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Hepsini _seç"
@@ -1885,47 +1885,47 @@ msgstr "Gizlilik _Sistemi"
 msgid "_Priority"
 msgstr "_Öncelik"
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Karakter _kodlaması"
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "Batı Avrupa"
 
-#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltık"
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arapça"
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Kiril"
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonca"
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "Çince"
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "Korece"
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "Tayca"
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adres defteri"
 
@@ -1933,11 +1933,11 @@ msgstr "_Adres defteri"
 msgid "_Template"
 msgstr "Şab_lon"
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "_Eylemler"
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "_Hakkında"
 
@@ -1973,12 +1973,12 @@ msgstr "Cetveli _göster"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr "_Hepsini"
 
-#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr "_Gönderene"
@@ -2003,27 +2003,27 @@ msgstr "_Düşük"
 msgid "_Lowest"
 msgstr "En _düşük"
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Otomatik"
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 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:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 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:896 src/messageview.c:365
+#: src/compose.c:764 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:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkçe (ISO-8859-_9)"
 
@@ -2147,7 +2147,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
-#: src/compose.c:3702 src/compose.c:10815 src/compose.c:11715
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "_Ekle"
 
@@ -2208,7 +2208,7 @@ 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/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Gönder"
 
@@ -2372,7 +2372,7 @@ msgstr "Seçilen hesap NNTP değil: Göndermek mümkün değil."
 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:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "Göndermeyi iptal et"
 
@@ -2401,9 +2401,11 @@ msgstr "Adres defterinden otomatik tamamlamak için <tab> kullanın"
 msgid "Mime type"
 msgstr "Mime türü"
 
-#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:468
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "Boyut"
 
@@ -2532,42 +2534,52 @@ msgstr "Haricî editörle socket iletişimi kurmak Windows'ta desteklenmemekte."
 #: src/compose.c:9710
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
-"Aşağıdaki komut oluşturulamadı:\n"
+"Harici düzenleyici komutu çalıştırılamadı:\n"
 "%s\n"
 "%s"
 
-#: src/compose.c:9750
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr "Harici metin düzenleyici çalışmayı durdurdu: %s"
 
-#: src/compose.c:9822
+#: src/compose.c:9828
+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
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %"
+"%s"
 msgstr ""
 "Harici metin düzenleyici hâlâ çalışıyor.\n"
 "İşlemi sonlandırmaya zorla?\n"
-"işlem id: %"
+"%s"
 
-#: src/compose.c:10229 src/messageview.c:1094
+#: src/compose.c:10245 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:10432
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10436
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10437
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2575,24 +2587,24 @@ msgstr ""
 "Taslak kaydedilemedi.\n"
 "Çıkmaktan ya da bu e-postadan vaz geçmek ister misiniz?"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "Çıkmaktan _vazgeç"
 
-#: src/compose.c:10439
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "E-postadan _vaz geç"
 
-#: src/compose.c:10627 src/compose.c:10641
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:10655
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' dosyası okunamadı."
 
-#: src/compose.c:10657
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2601,50 +2613,50 @@ msgstr ""
 "'%s' dosyası mevcut karakter kodlaması için\n"
 "geçersiz karakterler barındırıyor, eklemek yanlış olabilir."
 
-#: src/compose.c:10734
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "İletiden vaz geç"
 
-#: src/compose.c:10735
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "Bu ileti değiştirilmiş. Vaz geç?"
 
-#: src/compose.c:10736 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "_Vaz geç"
 
-#: src/compose.c:10736 src/compose.c:10741
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "_Taslaklara Kaydet"
 
-#: src/compose.c:10739 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: src/compose.c:10740
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bu ileti değiştirilmiş. Son değişiklikleri kaydet?"
 
-#: src/compose.c:10741
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "_Kaydetme"
 
-#: src/compose.c:10812
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "'%s' şablonunun uygulanmasını istiyor musunuz?"
 
-#: src/compose.c:10814
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:10815 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
+#: src/compose.c:10834 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:10892
+#: src/compose.c:10911
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2653,7 +2665,7 @@ msgstr ""
 "Yapıştırılan metin yapıştırma limitini (%dKiB) aşıyor.\n"
 "Dosya olarak ekleyin."
 
-#: src/compose.c:11708
+#: src/compose.c:11727
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2665,20 +2677,20 @@ msgstr[0] ""
 "%d adet dosya içeriğinin ileti gövdesine eklenmesini ya da e-postaya "
 "iliştirilmesini istiyor musunuz?"
 
-#: src/compose.c:11714
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "Ekle ya da iliştir"
 
-#: src/compose.c:11715
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "_İliştir"
 
-#: src/compose.c:11930
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "%d. satırda alıntı biçimi hatası."
 
-#: src/compose.c:12226
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2709,7 +2721,7 @@ msgstr ""
 msgid "Debug log"
 msgstr "Debug kaydı"
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:550
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
 #: src/uri_opener.c:226
 msgid "Close"
 msgstr "Kapat"
@@ -2896,7 +2908,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:2443
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2481
 msgid "File"
 msgstr "Dosya"
 
@@ -2904,52 +2916,48 @@ msgstr "Dosya"
 msgid "Add New Addressbook"
 msgstr "Yeni Adres Defteri Ekle"
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "Bir Grup Adı sağlanmalı."
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
-msgstr "Grub Verisini Düzenle"
+#: src/editgroup.c:292
+msgid "Edit group data"
+msgstr "Grub verisini düzenle"
 
-#: src/editgroup.c:323 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Grub Adı"
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr "Grubtaki Adresler"
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "Mevcut Adresler"
 
-#: src/editgroup.c:452
-msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr "Yön tuşlarıyla E-posta Adreslerini Gruba taşıyın ya da Gruptan çıkarın"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "Grubtaki Adresler"
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
-msgstr "Grup Ayrıntılarını Düzenle"
+#: src/editgroup.c:494
+msgid "Edit group details"
+msgstr "Grup ayrıntılarını düzenle"
 
-#: src/editgroup.c:503
-msgid "Add New Group"
-msgstr "Yeni Grup Ekle"
+#: src/editgroup.c:496
+msgid "Add new group"
+msgstr "Yeni grup ekle"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "Dizini düzenle"
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adını girin:"
 
-#: src/editgroup.c:555 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: 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
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/mh_gtk.c:145
+#: 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
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını girin:"
@@ -2978,13 +2986,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:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
 #: 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:3197
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -3045,7 +3053,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTSSL"
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4227
 msgid "TLS"
 msgstr "TLS"
 
@@ -3172,11 +3180,11 @@ msgstr "Arama koşulunu 'içeren' isimlerle eşleş"
 
 #: 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 ""
 "İsim ve adres araması \"bununla başla\" ya da \"içeren\" arama koşulları "
 "kullanılarak ifa edilebilir. \"içeren\" koşulunu kullanmak için bu seçeneği "
@@ -3208,8 +3216,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:1444 src/prefs_account.c:2073
-#: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "Şifreyi göster"
@@ -3231,7 +3239,7 @@ 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:4044
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "Temel"
 
@@ -3318,11 +3326,11 @@ msgstr "Yeni vCard Girdisi Ekle"
 msgid "Impossible to set the client certificate.\n"
 msgstr "İstemci sertifikasını atamak mümkün değil.\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "xover aralığı alınamadı\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "xhdr aralığı alınamadı\n"
 
@@ -3387,8 +3395,8 @@ 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:1178 src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: 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
 msgid "None"
 msgstr "Hiçbiri"
@@ -3399,7 +3407,7 @@ msgstr "Hiçbiri"
 msgid "Default"
 msgstr "Öntanımlı Ayar"
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Tam"
@@ -3638,7 +3646,7 @@ msgstr "Adres Defterini LDIF Olarak Kaydet"
 msgid "Distinguished Name"
 msgstr "Ayırt Edici İsim (dn):"
 
-#: src/export.c:112 src/summaryview.c:8485
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "mbox olarak kaydet"
 
@@ -3723,147 +3731,165 @@ msgstr ""
 "%s dosyası boş ya da bozulmuş! %s tarihindeki yedek dosyayı kullanmak "
 "istiyor musunuz?"
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
-msgstr "kural hesap temelli değil\n"
+msgstr "kural hesaba bağlı değil\n"
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"kural hesaba bağlı, iletileri almak için şu an kullanılan hesapla "
+"eşleşmiyor\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
-"kural hesap temelli [id=%d, name='%s'], iletileri almak için şu an "
+"kural hesaba bağlı [id=%d, name='%s'], iletileri almak için şu an "
 "kullanılan hesapla eşleşiyor\n"
 
-#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
-#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
-#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "NON_EXISTENT"
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
-"kural hesap temelli, iletileri almak için şu an kullanılan hesapla "
+"kural hesaba bağlı, iletileri almak için şu an kullanılan hesapla "
 "eşleşmiyor\n"
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, c-format
 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 hesap temelli [id=%d, name='%s'], iletileri almak için şu an "
+"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:646
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
-"kural hesap temelli değil, yine de kurallar kullanıcı isteği gereği "
-"uygulanıyor\n"
+"kural hesaba bağlı değil, yine de 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"
 
-#: src/filtering.c:652
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
-"kural hesap temelli [id=%d, name='%s'], fakat tüm kurallar kullanıcı isteği "
-"gereği uygulanıyor\n"
+"kural hesaba bağlı [id=%d, name='%s'], fakat tüm kurallar isteğiniz üzere "
+"uygulanıyor\n"
+
+#: 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"
 
-#: src/filtering.c:670
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr "kural hesap temelli [id=%d, name='%s'],  istek üzerine es geçiliyor\n"
+msgstr "kural hesaba bağlı [id=%d, name='%s'],  istek üzerine es geçiliyor\n"
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
-msgstr "kural hesap temelli, kullanıcı isteği gereği es geçiliyor\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "kural hesaba bağlı, kullanılan hesapla eşleşiyor\n"
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
-"kural hesap temelli [id=%d, name='%s'], şuanki hesapla eşleşmiyor [id=%d, "
+"kural hesaba bağlı [id=%d, name='%s'], şuanki hesapla eşleşiyor [id=%d, "
 "name='%s']\n"
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
-msgstr "kural hesap temelli, kullanılan hesapla eşleşmiyor\n"
+msgstr "kural hesaba bağlı, kullanılan hesapla eşleşmiyor\n"
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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 ""
-"kural hesap temelli [id=%d, name='%s'], kullanılan hesap [id=%d, name='%s']\n"
+"kural hesaba bağlı [id=%d, name='%s'], şuanki hesapla eşleşmiyor [id=%d, "
+"name='%s']\n"
 
-#: src/filtering.c:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "işlem [ %s ] uygulanıyor\n"
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "işlem uygulanamadı\n"
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "eylemden [ %s ] sonra başka işlem yok\n"
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "kural '%s' işletiliyor [ %s ]\n"
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "kural <unnamed> işletiliyor [ %s ]\n"
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "kural '%s' kapatıldı [ %s ]\n"
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "kural <unnamed> kapatıldı [ %s ]\n"
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "kararlaştırılmamış"
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "birleştirme"
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr "elle"
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "dizin işleme"
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "ön işlem"
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "son işlem"
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3880,11 +3906,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3966,17 +3992,17 @@ 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:433
+#: 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:2104
+#: src/plugins/vcalendar/vcal_folder.c:2102
 #, 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:445 src/plugins/rssyl/rssyl_cb_menu.c:252
-#: src/plugins/vcalendar/vcal_folder.c:2111
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2109
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "`%s' dizini zaten var."
@@ -4008,7 +4034,7 @@ msgstr "Bütün dizinlerdekini _okunmamuş say"
 msgid "R_un processing rules"
 msgstr "İşlem kurallarını _yürüt"
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "Dizini _ara..."
 
@@ -4060,8 +4086,9 @@ msgid "Mark all as read"
 msgstr "Hepsini okunmuş say"
 
 #: src/folderview.c:871
+#, fuzzy
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
 "Bu ve bunun alt dizinlerindeki tüm e-postaları okunmuş olarak işaretlemek "
@@ -4077,8 +4104,9 @@ msgid "Mark all as unread"
 msgstr "Hepsini okunmamış say"
 
 #: src/folderview.c:877
+#, fuzzy
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"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 "
@@ -4089,12 +4117,12 @@ 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:4693
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "%s/%s dizini taranıyor..."
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "%s dizini taranıyor..."
@@ -4141,7 +4169,7 @@ msgstr "%s dizini açılıyor..."
 msgid "Folder could not be opened."
 msgstr "Dizin açılamadı."
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
@@ -4153,7 +4181,7 @@ msgstr "Çöpteki tüm iletiler silinsin mi?"
 msgid "_Empty trash"
 msgstr "Çöpü _boşalt"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "Çevrimdışı uyarı"
 
@@ -4267,7 +4295,7 @@ msgstr "Haber grubu adı"
 msgid "Messages"
 msgstr "İletiler"
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "Tür"
 
@@ -4293,11 +4321,11 @@ msgstr "bilinmeyen"
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/grouplistdialog.c:470 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "Tamamlandı."
 
-#: src/grouplistdialog.c:503
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d haber grubu alındı (%s okundu)"
@@ -4326,7 +4354,7 @@ 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:862
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4415,46 +4443,53 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "sunuculara şifrelenmiş bağlantı desteğini sağlar.\n"
 
 #: src/gtk/about.c:463
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "Yeni internet adresleme protokolü olan IPv6 adres desteğini sağlar\n"
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 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:484
+#: src/gtk/about.c:473
+#, fuzzy
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "PalmOS adres defteri desteğini sağlar\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "PalmOS adres defteri desteğini sağlar\n"
 
-#: src/gtk/about.c:494
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "LDAP paylaşımlı adres defteri desteğini sağlar\n"
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "IMAP ve NNTP sunucuları desteğini ekler\n"
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "SVG tema desteğini sağlar\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "oturum yönetimi desteğini sağlar\n"
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 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:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "SVG tema desteğini 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"
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4465,7 +4500,7 @@ msgstr ""
 "dağıtabilir ve/ya da değiştirebilirsiniz; 3. ya da (tercih ettiğiniz) "
 "sonraki bir sürüm ile."
 
-#: src/gtk/about.c:574
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4477,7 +4512,7 @@ msgstr ""
 "GARANTİSİ dahi ima edilmeden. Daha fazla ayrıntı için GNU Genel Kamu "
 "Lisansına bakın."
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4485,73 +4520,73 @@ 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:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "Oturum istatistikleri\n"
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "Başlatıldı: %s\n"
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "Gelen trafik\n"
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Alınan iletiler: %d\n"
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "Giden trafik\n"
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Yeni/yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Cevaplanan iletiler: %d\n"
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Giden toplam ileti: %d\n"
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "Claws Mail Hakkında"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "_Bilgi"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "_Yazarlar"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "Ö_zellikler"
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "_Lisans"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "_Sürüm Notları"
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "İ_statistikler"
 
@@ -5030,7 +5065,7 @@ msgstr "Öncelik"
 msgid "Precedence:"
 msgstr "Öncelik:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "Kurum"
 
@@ -5243,7 +5278,8 @@ msgid "Folder contains marked messages"
 msgstr "İşaretlenmiş iletiler barındıran dizin"
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+#, fuzzy
+msgid "IMAP folder which contains subfolders only"
 msgstr "Sadece alt dizinleri içeren IMAP dizini"
 
 #: src/gtk/icon_legend.c:92
@@ -5412,15 +5448,15 @@ msgstr "_Uygula"
 msgid "Page Index"
 msgstr "Sayfa Fihristi"
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "_Gizle"
 
 #: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
 #: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
-#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
-#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "Hesap"
@@ -5876,8 +5912,7 @@ msgstr "(Başlık yok)"
 msgid "Error:"
 msgstr "Hata:"
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2598
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "Dosya adı:"
@@ -5890,193 +5925,193 @@ msgstr "Dosya boyutu:"
 msgid "Load Image"
 msgstr "Resmi yükle"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "IMAP bağlantısı koptu\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "%s üzerinde IMAP hatası:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr "kimlik denetimi yapıldı"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "Kimlik denetimi yapılmamış"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr "kötü durum"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr "sıralı karakter dizisi hatası"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr "ayrıştırma hatası (muhtemelen sunucu tarafında RFC uyumsuzluğu)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "bağlantı reddedildi"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "bellek hatası"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr "geri dönüşü olmayan hata"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr "protokol hatası (muhtemelen sunucu tarafında RFC uyumsuzluğu)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr "bağlantı kabul edilmedi"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr "APPEND hatası"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr "NOOP hatası"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr "LOGOUT hatası"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr "CAPABILITY hatası"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr "CHECK hatası"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr "CLOSE hatası"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr "EXPUNGE hatası"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr "COPY hatası"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr "UID COPY hatası"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr "CREATE hatası"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr "DELETE hatası"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr "EXAMINE hatası"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr "FETCH hatası"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr "UID FETCH hatası"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr "LIST hatası"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr "LOGIN hatası"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr "LSUB hatası"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr "RENAME hatası"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr "SEARCH hatası"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr "UID SEARCH hatası"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr "SELECT hatası"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr "STATUS hatası"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr "STORE hatası"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr "UID STORE hatası"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr "SUBSCRIBE hatası"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr "UNSUBSCRIBE hatası"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr "STARTSSL hatası"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr "INVAL hatası"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr "EXTENSION hatası"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr "SASL hatası"
 
-#: src/imap.c:751
+#: src/imap.c:753
 msgid "TLS error"
 msgstr "TLS hatası"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "Bilinmeyen hata [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -6088,7 +6123,7 @@ msgstr ""
 "CRAM-MD5 ile oturum açma, libetpan SASL desteğiyle derlendiyse ve CRAM-MD5 "
 "eklentisi yüklüyse çalışmakta."
 
-#: src/imap.c:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -6100,7 +6135,7 @@ msgstr ""
 "DIGEST-MD5 ile oturum açma, libetpan SASL desteğiyle derlendiyse ve DIGEST-"
 "MD5 SASL eklentisi yüklüyse çalışmakta."
 
-#: src/imap.c:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -6112,7 +6147,7 @@ msgstr ""
 "SCRAM-SHA-1 girişleri sadece libetpan SASL desteğiyle derlendiyse ve SCRAM "
 "eklentisi yüklükse çalışmakta."
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -6124,7 +6159,7 @@ msgstr ""
 "PLAIN ile oturum açma, libetpan SASL desteğiyle derlendiyse ve PLAIN SSL "
 "eklentisi yüklüyse çalışır."
 
-#: src/imap.c:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -6136,7 +6171,7 @@ msgstr ""
 "LOGIN ile oturum açma, libetpan SASL desteğiyle derlendiyse ve LOGIN SASL "
 "eklentisi yüklüyse çalışır."
 
-#: src/imap.c:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -6146,37 +6181,37 @@ msgstr ""
 "\n"
 "OAuth2 hatası. OAuth2 hesap seçeneklerinizi gözden geçirin."
 
-#: src/imap.c:1004
+#: src/imap.c:1014
 #, 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:1008
+#: src/imap.c:1018
 #, 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:1026
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "%s adresine bağlanma başarısız oldu."
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1043 src/imap.c:1046
 #, 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:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 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:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Güvensiz bağlantı"
 
-#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 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"
@@ -6190,108 +6225,108 @@ msgstr ""
 "Bu sunucuya bağlanmaya devam etmek istiyor musunuz? İletişim güvenli "
 "olmayacak."
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 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:1192
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "'%s' hesabı: IMAP sunucusuna bağlanıyor: %s:%d..."
 
-#: src/imap.c:1257
+#: src/imap.c:1267
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "IMAP sunucusuna bağlanılamıyor: %s:%d"
 
-#: src/imap.c:1260
+#: src/imap.c:1270
 #, 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:1292 src/imap.c:4164
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "STARTTLS oturumu başlatılamıyor.\n"
 
-#: src/imap.c:1364
+#: src/imap.c:1374
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "%s IMAP4 sunucusunda oturum açılamadı.\n"
 
-#: src/imap.c:1367
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "%s IMAP sunucusunda oturum açılamadı."
 
-#: src/imap.c:1795
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "İletiler ekleniyor..."
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "İletiler kopyalanıyor..."
 
-#: src/imap.c:2526
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "Arama sunucu hatasından dolayı başarısız oldu."
 
-#: src/imap.c:2610
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "silinen işaretler atanamaz\n"
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: src/imap.c:2992
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "%s içindeki abonelikten çıkılan dizinler aranıyor..."
 
-#: src/imap.c:2995
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "%s içindeki alt dizinler aranıyor..."
 
-#: src/imap.c:3286
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu oluşturulamıyor: LIST hatası\n"
 
-#: src/imap.c:3299
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamıyor\n"
 
-#: src/imap.c:3429
+#: src/imap.c:3439
 #, 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:3542
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemiyor\n"
 
-#: src/imap.c:3821
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST başarısız oldu\n"
 
-#: src/imap.c:3906
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "İletiler işaretleniyor..."
 
-#: src/imap.c:4009
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemiyor: %s\n"
 
-#: src/imap.c:4161
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "Oturum açabilmek için STARTTLS gerekli.\n"
 
-#: src/imap.c:4171
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "Kabiliyeler tazelenemedi.\n"
 
-#: src/imap.c:4176
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -6300,20 +6335,20 @@ 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:4184
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "Sunucuya oturum açma kapatılmış.\n"
 
-#: src/imap.c:4407
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "İleti alınıyor..."
 
-#: src/imap.c:5108
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "silinen işaretler atanamaz: %d\n"
 
-#: src/imap.c:6143
+#: src/imap.c:6153
 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"
@@ -6363,7 +6398,7 @@ msgstr "Ü_yelikler"
 msgid "_Subscribe..."
 msgstr "_Abone ol..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "_Abonelikten çık..."
 
@@ -6395,21 +6430,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:422 src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 #, 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:423
+#: 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:2097
+#: src/plugins/vcalendar/vcal_folder.c:2095
 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:453 src/plugins/rssyl/rssyl_cb_menu.c:258
-#: src/plugins/vcalendar/vcal_folder.c:2117
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2115
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6417,32 +6452,33 @@ msgstr ""
 "Dizin adı değiştirilemedi.\n"
 "Yeni dizin ismine izin verilmiyor."
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:375
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "'%s' dizininin taşınacağı dizini seçin"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:395
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 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/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
+#: src/plugins/rssyl/rssyl_cb_menu.c:190
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"'%s' altındaki tüm dizinler ve iletiler kalıcı olarak silinecektir. Bu "
-"işlemi geri almak mümkün değil.\n"
+"'%s' altındaki tüm dizinler ve iletiler kalıcı olarak silinecektir.\n"
+"İşlemi geri almak mümkün değil.\n"
 "\n"
 "Silmek istediğinizden emin misiniz?"
 
-#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:350
+#: 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:2050
+#: src/plugins/vcalendar/vcal_folder.c:2048
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "'%s' dizini kaldırılamıyor."
@@ -6469,7 +6505,7 @@ msgstr "_Ara"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "%s hesabı için abone olunacak alt dizini seçin:"
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "Abone ol"
 
@@ -6706,139 +6742,139 @@ msgstr "Pine Dosyası Seçin"
 msgid "Import Pine file into Address Book"
 msgstr "Pine dosyasını Adres Defterine aktar"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "E-postaları almak için ağ erişimine ihtiyaç var."
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s başarısız oldu\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Tamamlandı (%d adet ileti (%s) alındı)"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "Tamamlandı (yeni ileti yok)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "Bağlantı başarısız"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "Kimlik denetimi başarısız"
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: 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
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Tamamlandı (%d adet yeni ileti)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni ileti yok)"
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "'%s' hesabı: POP3 sunucusuna bağlanıyor: %s:%d..."
 
-#: src/inc.c:930
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3 sunucusuna bağlanılamıyor: %s:%d"
 
-#: src/inc.c:934
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucusuna bağlanılamıyor: %s:%d\n"
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "İletiler %s hesabından alınıyor (%s)..."
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti sayısı alınıyor (STAT)..."
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti sayısı alınıyor (LAST)..."
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti sayısı alınıyor (UIDL)..."
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İleti alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Alınıyor (%d adet ileti (%s) alındı)"
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "%s:%d bağlantısı başarısız oldu."
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "E-posta işlenirken bir hata oluştu."
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6847,37 +6883,37 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "Dosya yazılamıyor."
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "soket hatası"
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "%s:%d bağlantısında soket hatası meydana geldi."
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "%s:%d bağlantısı karşı taraftan kesildi."
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli."
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6886,11 +6922,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Kimlik doğrulaması başarısız oldu."
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6899,7 +6935,7 @@ msgstr ""
 "Kimlik doğrulaması başarısız oldu:\n"
 "%s"
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6907,44 +6943,44 @@ msgstr ""
 "Oturum zaman aşımına uğradı. Tercihler/Diğer/Muhtelif içindeki zaman aşımı "
 "süresini artırarak kurtarabilirsiniz."
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "%s:%d bağlantısı zaman aşımına uğradı."
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "Birleştirme iptal edildi\n"
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: 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:1834
+#: 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
 msgid "seconds"
 msgstr "saniye"
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "dakikada"
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "saat"
 
-#: src/inc.c:1661
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sÇevrim dışı çalışıyorsunuz. %d %s süre için geçersiz kıl?"
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sÇevrim dışı çalışıyorsunuz. Geçersiz kıl?"
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "_Bir kereliğine"
 
@@ -7223,8 +7259,8 @@ msgid ""
 msgstr ""
 "  --search dizin tür terim [yinelenen]\n"
 "                         postaları arar\n"
-"                         dizin ör.: \"#mh/Postakutusu/gelen\" ya da \"Posta"
-"\"\n"
+"                         dizin ör.: \"#mh/Postakutusu/gelen\" ya da "
+"\"Posta\"\n"
 "                         tür: s[başlık],f[gönderen],t[alıcı],"
 "e[genişletilmiş],m[karışık] ya da g: etiket\n"
 "                         terim: aranacak terim\n"
@@ -7364,829 +7400,829 @@ msgstr "NetworkManager: ağ devrede.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: ağ devre dışı.\n"
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "_Dosya"
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "_Görünüm"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "_Yapılandırma"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "_Posta kutusu ekle"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "Posta kutusu sırasını değiştir..."
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "_Mbox dosyasını içe aktar..."
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "_Mbox olarak dışa aktar..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "_Seçileni mbox dosyasına aktar..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "Tüm Çöp dizinlerini _boşalt"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_E-postayı farklı kaydet..."
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Bir bölümünü farklı kaydet..."
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Sayfa düzeni..."
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Yazdır...."
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "Dizinleri eşle"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "Çı_k"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "Zİncirleme konu _seç"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "_Mevcut ileti içinde bul..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "_Hızlı arama"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "Göster ya da _sakla"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "_Araç çubuğu"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "Gösterilen _sütünları ayarla"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "_Dizin listesi içinde..."
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "İ_leti listesi içinde..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "_Yerleşim"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "_Sırala"
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "_Başlığa göre çek"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "Zincirleme konuları _genişlet"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "Zincirleme konuları _küçült"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "İletiye _git"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "Ö_nceki ileti"
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Sonraki ileti"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Önceki _yeni ileti"
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "_Sonraki yeni ileti"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Önceki _işaretli ileti"
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Sonraki _işaretli ileti"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Önceki _etiketli ileti"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Sonraki _etiketli ileti"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:594
 msgid "Previously opened message"
 msgstr "Önceki açılmış ileti"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Sonraki açılmış ileti"
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "Ana ileti"
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Sonraki okunmamış _dizin"
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "D_izin"
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Sonraki bölüm"
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Önckei bölüm"
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "İleti kaydırma"
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "Önceki satır"
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "Sonraki satır"
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "Önceki sayfa"
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:488
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "Sonraki sayfa"
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "Çöz"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "Yeni _pencerede aç"
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "İl_etinin kaynağı"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "İleti bölümü"
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "Metin olarak görüntüle"
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "_Aç"
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "_Birlikte aç..."
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "Alıntılar"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "Özeti _güncelle"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "İleti _al"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "_Seçilmiş hesaptan al"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "_Tüm hesaplardan al"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "_Almaktan vaz geç"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "Kuyruktaki iletileri _gönder"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "Yeni _bir e-posta oluştur"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "Yeni bir haber oluştur"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:665 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "_Yanıtla"
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "_Yanıtla"
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "E-posta _listesi"
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "Takiben ve cevaben"
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "Ek olarak _yönlendir"
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
 #: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "_Yeniden yönlendir"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "E-posta-_Listesi"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "Posta"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "Yardım"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "Abonelikten çık"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "Arşivi göster"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "Kişi listesi sahibi"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "_Taşı..."
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "Çöpe _taşı"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "_Sil..."
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "Zincirleme konuyu çöpe t_aşı"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "Zincirleme konuyu _sil"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "Haber iletisini iptal et"
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "İşa_retle"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "İşareti _kaldır"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "_Okunmuş olarak işaretle"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "_Okunmamış olarak işaretle"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "Dizindekileri okunmuş olarak işaretle"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "Dizindekileri okunmamış olarak işaretle"
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Zincirleme konuyu dikkate alma"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "Zincirleme konuyu dikkate al"
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Zincirleme konuyu takip et"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "Zincirleme konu takibini kaldır"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "İstenmeyen olarak işaretle"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "Zararsız olarak işaretle"
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "Kilitle"
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Kilidi aç"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Renk _etiketi"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "Etiketler"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "Yeniden _düzenle"
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "İmzayı denetle"
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Göndereni adres _defterine ekle"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "Adresleri topla"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "Mevcut _dizinden..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "Seçilmiş _iletilerden..."
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "Dizindeki tüm iletileri _süz"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "_Seçilen iletileri süz"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "Dizin işleme kurallarını yürüt"
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Süzgeç kuralı _oluştur"
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Otomatik olarak"
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "_Gönderene göre"
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "_Alıcıya göre"
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "_Başlığa göre"
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Gön_derene Göre"
 
-#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "İşleme kuralı oluştur"
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "_URL'leri listele..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "Tüm dizinlerde yeni ileti olup olmadığına _bak"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "Mükerrer iletileri sil"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "Seçilen dizinde"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "Tüm dizinler"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "Çalış_tır"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "_Sil"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr "TLS ser_tifikaları"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "Süzme Ka_yıtları"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "Ağ K_ayıtları"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "Debug _Kaydı"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "Tüm oturum şifrelerini _unut"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr "A_na şifreyi unut"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "Kullanılan hesabı _değiştir"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "Kullanılan hesap için tercihler..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "_Yeni hesap oluştur..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "Hesapları _düzenle..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "_Tercihler..."
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "Ön _işlem..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "Son _işlem..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "_Süzme..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "Şab_lonlar..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "_Eylemler..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "_Etiketler..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "_Eklentiler..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "_Kullanım kılavuzu"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "Çevrimiçi _SSS"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "Simge _Açıklamaları"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "Öntanımlı istemci olarak ata"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "Çevrimdışı _mod"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "_Menü çubuğu"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "_Posta içeriği"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "_Durum çubuğu"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "Sütun başlıkları"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "_Zİncirleme konuları göster"
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Okunmuş zincirleme konuları gizle"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "Okunmuş iletileri _gizle"
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Silinen iletileri gizle"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "_Tam ekran"
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Tüm üst_bilgileri göster"
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Hepsini gizle"
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "İkinci seviyeyi _gizle"
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Üçüncü seviyeyi _gizle"
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "Simge _altında metin"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "Simge _yanında metin"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "Sadece _simge"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "Sadece _metin"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "_Standart"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "Üçlü _sütun"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "İleti bölümünü _genişlet"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "İleti listesini _genişlet"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "Küçük _ekran"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "_Numaraya göre"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "_Boyuta göre"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "_Tarihe göre"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "Zincirleme konu tarihine göre"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "Başlığa göre"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "_Renk etiketine göre"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "Etikete göre"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "İşaret_e göre"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "_Duruma göre"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "_Eke göre"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "Öneme göre"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "Kilide göre"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "Tasnif _etme"
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Artan sırada"
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Azalan sırada"
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Otomatik sapta"
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6489
 msgid "Modify tags..."
 msgstr "Etiketleri düzenle..."
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Bazı hatalar meydana geldi. Kaydı görmek için buraya tıklayın."
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "Çevrimdışısınız. Çevrimiçi olmak için simgeye tıkla"
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "Hesap seç"
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Ağ kaydı"
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "Süzme/İşlem debug kaydı"
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "Süzme kaydı açık\n"
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "Süzme kaydı kapalı\n"
 
-#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
-#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
+#: 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
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "Çöp dizinlerindeki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "Çıkma"
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8199,18 +8235,18 @@ msgstr ""
 "Mevcut bir mailbox belirtildiyse, doğrudan\n"
 "taranacaktır."
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "`%s' e-posta kutusu zaten var."
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8219,112 +8255,112 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar zaten mevcut olabilir ya da buraya yazma izniniz olmayabilir."
 
-#: src/mainwindow.c:3389
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "Posta göndermeye izin yok"
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Mbox içe aktarılamadı."
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "Mbox'a aktarılamadı."
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail'i kapat?"
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4007
 msgid "_Quit"
 msgstr "Çı_k"
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "Dizin eşleştirme"
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "Dizinleri şimdi eşleştirmek istiyor musunuz?"
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "_Eşleştir"
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "Mükerrer iletiler siliniyor..."
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Seçilen dizinde mükerrer ileti bulunamadı.\n"
 
-#: src/mainwindow.c:4711
+#: src/mainwindow.c:4709
 #, 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:4715
+#: src/mainwindow.c:4713
 #, 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:4753
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Tüm dizinlerdeki mükerrer iletiler siliniyor..."
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4757
 #, 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:4764
+#: src/mainwindow.c:4762
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "%d adet dizinde mükerrer ileti bulunamadı.\n"
 
-#: src/mainwindow.c:4926 src/messageview.c:2647
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "Gidilecek dizini seçin"
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "Dizin kurallarından önce uygulanacak işlem kuralları"
 
-#: src/mainwindow.c:5037
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "Dizin kurallarından sonra uygulanacak işlem kuralları"
 
-#: src/mainwindow.c:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "Süzme ayarları"
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5156
 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:5249
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail öntanımlı istemci olarak atandı."
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5249
 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:5265 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5407
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8641,7 +8677,7 @@ msgstr ""
 "  İ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:7290
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "Öğrenirken bir sorun meydana geldi.\n"
 
@@ -8681,7 +8717,7 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "Posta kutusunu kaldır"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "_Aç"
 
@@ -8764,9 +8800,9 @@ msgstr "İmza denetleniyor..."
 msgid "Go back to email"
 msgstr "E-postaya geri dön"
 
-#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
-#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
-#: src/plugins/fancy/fancy_viewer.c:538
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Çok bölümlü iletinin bir bölümü kaydedilemedi: %s"
@@ -8776,65 +8812,68 @@ msgstr "Çok bölümlü iletinin bir bölümü kaydedilemedi: %s"
 msgid "Overwrite existing file '%s'?"
 msgstr "'%s' dosyasının üzerine yazılsın mı?"
 
-#: src/mimeview.c:1839
-#, c-format
+#: src/mimeview.c:1840
+#, fuzzy, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"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?"
 
-#: src/mimeview.c:1842
-msgid "Error saving all message parts"
+#: src/mimeview.c:1843
+#, fuzzy
+msgid "Error saving message part"
 msgstr "İleti bölümünün hepsi kaydedilemedi"
 
-#: src/mimeview.c:1843
-msgid "Skip"
-msgstr "Atla"
+#: src/mimeview.c:1844
+#, fuzzy
+msgid "Ignore"
+msgstr "Dikkate alınmayan:"
 
-#: src/mimeview.c:1843
-msgid "Skip all"
-msgstr "Hepsini atla"
+#: src/mimeview.c:1844
+#, fuzzy
+msgid "Ignore all"
+msgstr "Zincirleme konuyu dikkate alma"
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1856
 #, 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:1861
+#: src/mimeview.c:1868
 #, 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:1866
+#: src/mimeview.c:1873
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d adet dosya kaydedilemedi."
 
-#: src/mimeview.c:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Hedef dizini seç"
 
-#: src/mimeview.c:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' bir dizin değil."
 
-#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
 #: src/summaryview.c:5017
 msgid "Save as"
 msgstr "Farklı kaydet"
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "Birlikte aç"
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8843,7 +8882,7 @@ msgstr ""
 "Dosyayı açmak için komut satırını aç:\n"
 "('%s' dosya adıyla değiştirilecek)"
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8854,11 +8893,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "Güvenilmeyen ikilik çalıştırılsın mı?"
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8870,20 +8909,20 @@ msgstr ""
 "\n"
 "Bu dosyayı çalıştırmak istiyor musunuz?"
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "İkiliği çalıştır"
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "Tür:"
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "Boyut:"
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
@@ -8994,77 +9033,77 @@ msgstr "Haber grubu aboneliğinden çık"
 msgid "Rename newsgroup folder"
 msgstr "Haber grubu dizinini yeniden adlandır"
 
-#: src/oauth2.c:239
+#: src/oauth2.c:241
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 kimlik denetim kodu eksik\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 bağlantısında hata\n"
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:257 src/oauth2.c:397
 msgid "OAuth2 TLS connection error\n"
 msgstr "OAuth2 TLS bağlantısında hata\n"
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "OAuth2 erişim bilgileri alındı\n"
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "OAuth2 erişim bilgileri alınmadı\n"
 
-#: src/oauth2.c:355
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "OAuth2 yenileme bilgisi alındı\n"
 
-#: src/oauth2.c:357
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "OAuth2 yenileme bilgisi alınmadı\n"
 
-#: src/oauth2.c:489
+#: src/oauth2.c:479
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr "OAuth2 yedek yenileme bilgisi sağlandı\n"
 
-#: src/oauth2.c:491
+#: src/oauth2.c:481
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr "OAuth2 yedek yenileme bilgisi sağlanmadı\n"
 
-#: src/oauth2.c:522
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 soket yazma hatası\n"
 
-#: src/oauth2.c:544
+#: src/oauth2.c:534
 msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 soket zaman aşım hatası\n"
 
-#: src/oauth2.c:638
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 erişim bilgisi hâlâ taze\n"
 
-#: src/oauth2.c:645
+#: src/oauth2.c:635
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 erişim bilgisini yenileyerek elde ediyor\n"
 
-#: src/oauth2.c:649
+#: src/oauth2.c:639
 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:666
+#: src/oauth2.c:656
 msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 erişim ve yenileme bilgisi güncellendi\n"
 
-#: src/oauth2.c:698
+#: src/oauth2.c:688
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 aslı: %s\n"
 
-#: src/oauth2.c:699
+#: src/oauth2.c:689
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 şifreli: %s\n"
 
-#: src/oauth2.c:700
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -9561,7 +9600,7 @@ msgstr "Yedek konumu ve adı"
 
 #: src/plugins/archive/archiver_gtk.c:1095
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "_Seç"
 
@@ -9734,6 +9773,11 @@ msgstr "Yeniden adlandır"
 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ı:"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "Ekleri kaldır"
@@ -10034,7 +10078,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:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
 msgid "KiB"
 msgstr "KiB"
 
@@ -10547,14 +10591,15 @@ msgid "Render embedded objects using plugins"
 msgstr "Gömülü nesneleri eklentiler kullanarak yorumla"
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in viewer (remote content is enabled)"
+#, fuzzy
+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
 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:4254
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
 #: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "Vekil (Proxy)"
@@ -10596,7 +10641,8 @@ 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
-msgid "Open in external browser"
+#, fuzzy
+msgid "Open in External Browser"
 msgstr "Harici tarayıcı ile aç"
 
 #: src/plugins/fancy/fancy_prefs.c:300
@@ -10606,7 +10652,7 @@ msgstr "Bu dosyadaki CSS tüm HTML parçalarına uygulanacak"
 #: 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:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
 #: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "Göz_at"
@@ -10615,86 +10661,86 @@ msgstr "Göz_at"
 msgid "Select stylesheet"
 msgstr "Sitil seç"
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "Uzak içerik yüklemesi kapatıldı"
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "Görüntüleri yükle"
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "Uzak içeriği aç"
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "Javascript'i Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "Eklentileri Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "Java'yı aç"
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "Bağlantıları harici bir tarayıcı ile aç"
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Bir hata oluştu: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:853
 #, 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:874
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "Okuyucuda Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "Tarayıcıda Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "Görüntüyü Aç"
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "Bağlantıyı Kopyala"
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "Bağlantıyı İndir"
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "Görüntüyü Farklı Kaydet"
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "Görüntüyü Kopyala"
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "Beslemeyi içe aktar"
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Okuyucu"
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10925,7 +10971,7 @@ 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:1990
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2023
 msgid "Authentication"
 msgstr "Kimlik Doğrulama"
 
@@ -11137,8 +11183,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:1663
-#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "saat"
 
@@ -11326,15 +11372,6 @@ msgstr ""
 "Mevcut bir posta kutusu belirtildiyse, doğrudan\n"
 "taranacaktır."
 
-#: src/plugins/mailmbox/plugin_gtk.c:332
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be deleted.\n"
-"Do you really want to delete?"
-msgstr ""
-"'%s' altındaki tüm dizin ve iletiler silinecek.\n"
-"Silmek istediğinizden emin misiniz?"
-
 #: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "Sieve AUTH yöntemi mevcut değil\n"
@@ -11526,7 +11563,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Sieve'yi aç"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
@@ -11577,27 +11614,27 @@ msgstr "Kimlik denetimini belirt"
 
 #: 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:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 msgid "User ID"
 msgstr "Kullanıcı ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:382
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
-#: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:134
+#: 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
 msgid "Password"
 msgstr "Parola"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
-#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: 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
 msgid "Automatic"
 msgstr "Otomatik"
@@ -11614,20 +11651,20 @@ msgstr "Sieve sunucusu girilmemiş."
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "NewMail"
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "Newmail kancası kaydedilemedi"
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "Kayıt dosyası %s açılamadı: %s\n"
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -11644,7 +11681,7 @@ msgstr ""
 "\n"
 "Mevcut kayıt: %s"
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Kayıt dosyası"
 
@@ -11892,7 +11929,7 @@ msgid "Show banner"
 msgstr "Banner'ı göster"
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "Hiç bir zaman"
@@ -12232,68 +12269,68 @@ msgstr "%d adetten"
 msgid "PDF rendering failed for an unknown reason."
 msgstr "Bilinmeyen bir sebepten PDF yorumlanamadı."
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "Belge Fihristi"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "İlk Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "Son Sayfa"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "Yakınlaş"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "Uzaklaş"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "Sayfaya Sığdır"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "Sayfa Genişliğine Sığdır"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "Sola Çevir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "Sağa Çevir"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "Belgeyi Yazdır"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "Belge Bilgisi"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "Sayfa Numarası"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "Yakınlaşma Çarpanı"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -12306,13 +12343,13 @@ msgstr ""
 "\n"
 "Geri bildirim için: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "PDF Okuyucu"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -12503,8 +12540,8 @@ 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:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1860
+#: src/prefs_account.c:2162 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "dakikada"
 
@@ -12568,64 +12605,64 @@ msgstr "GPG"
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "'%s' eşleştirilemedi; lütfen anahtarı seçin."
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "'%s' için bilgiler toplanıyor ... %c"
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "Tanımlanmamış"
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "Sınırlı güvenilen"
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "En üst düzey"
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "Anahtarları Seç"
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "Anahtar ID"
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "Güven"
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "_Diğer"
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "Ş_ifreleme"
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "Anahtar ekle"
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "Başka kullanıcı ya da anahtar ID'si ekle:"
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "%s <%s> hesabına şifreli ileti gönder"
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -13106,8 +13143,8 @@ msgstr "Python uçbirimini göster..."
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "Gözat"
@@ -13296,19 +13333,6 @@ msgstr "Abone olmak istediğiniz haber beslemesinin URL'sini girin:"
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' dizin isminde kullanılamaz."
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:190
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be permanently deleted.\n"
-"Recovery will not be possible.\n"
-"\n"
-"Do you really want to delete?"
-msgstr ""
-"'%s' altındaki tüm dizinler ve iletiler kalıcı olarak silinecektir.\n"
-"İşlemi geri almak mümkün değil.\n"
-"\n"
-"Silmek istediğinizden emin misiniz?"
-
 #: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
@@ -13439,7 +13463,7 @@ msgstr "Şu tarihten daha yeni tarihli iletilerdeki yorumları al"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:413
 #: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
+#: src/prefs_account.c:1683 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr "gün"
 
@@ -13584,7 +13608,7 @@ 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:1628
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (Yetki gerekiyor)"
 
@@ -13593,7 +13617,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (Yasaklı)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (Bulunmadı)"
 
@@ -14284,63 +14308,63 @@ msgstr "Katılımcılar:"
 msgid "Action:"
 msgstr "Eylem:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "_Yeni toplantı..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "Takvimi _dışa aktar..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "Webcal'e _abone ol..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "_Yeniden adlandır..."
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "Aboneliği gü_ncelle"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "_Liste görünümü"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "_Hafta görünümü"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "_Ay görünümü"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "Toplantılar"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "geçmişte"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "bugün"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "yarın"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "bu hafta"
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "daha sonra"
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -14350,21 +14374,21 @@ msgstr ""
 "Planlanan etkinlikler %s:\n"
 "\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, 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:1631
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (Yetkisiz)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "Hata %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -14377,7 +14401,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -14388,47 +14412,47 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "%s dizini oluşturulamadı"
 
-#: src/plugins/vcalendar/vcal_folder.c:1918
+#: src/plugins/vcalendar/vcal_folder.c:1916
 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:1929
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "%s için takvim alınıyor..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "yeni abonelik"
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1939
 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:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "Webcal'e  Abone Ol"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "WebCal URL'sini Gir"
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "URL ayrıştırılamadı."
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "Abonelikten çıkmak istiyor musunuz?"
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "Aboneliği sil"
 
@@ -14897,95 +14921,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:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "POP protokol hatası\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "geçersiz UIDL cevabı: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP: %d eski iletisi siliniyor [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP: %d iletisi atlanıyor [%s] (%d bayt)\n"
 
-#: src/pop.c:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "posta kutusu kilitli\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "oturum zaman aşımına uğradı\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "komut desteklenmiyor\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "POP oturumunda hata oluştu\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "TOP komutu desteklenmiyor\n"
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "Haberler (NNTP)"
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "Yerel mbox dosyası"
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "Hiç biri (sadece SMTP)"
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "Hesabın adı"
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "Kendiliğinden ayarla"
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14993,81 +15017,81 @@ msgstr ""
 "Uyarı: Claws Mail'in bu sürümü\n"
 "IMAP ve Haberler desteği olmadan derlenmiş."
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "Bu sunucu kimlik doğrulaması istiyor"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "Bağlanırken kimlik denetimi yap"
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "Haberler sunucusu"
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "Alımın yapılacağı sunucu"
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "Yerel posta kutusu"
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "SMTP sunucu (gönder)"
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "SMTP sunucu yerine mail komutunu kullan"
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "postaları gönderecek komut"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "Yerel"
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "Öntanımlı Gelen Kutusu"
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Süzülmemiş iletiler bu dizinde tutulacak"
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "POP bağlantısından önce kimlik denetimi yap"
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "Seç"
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "Sonra sil"
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 gün ve 0 saat : derhal sil"
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1706
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15075,94 +15099,94 @@ msgstr ""
 "Bu boyutun üstündeki iletiler tamamen indirilmeyecek. Seçtiğiniz zaman "
 "tamamen indirebilecek ya da silebileceksiniz."
 
-#: src/prefs_account.c:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "Azamî indirilecek yazı sayısı"
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "0 girildiyse sonsuz"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(genellikle boş)"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "Sadece abone olunan dizinleri göster"
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1829
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Verimli ağ kullanımı yöntemi (etiketlerin alınmasını önler)"
 
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:1831
 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:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Otomatik denetle"
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "Genel ayarları kullan"
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Yeni iletileri denetle"
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken süz"
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "İletileri alırken eklenti kullanarak süzmeye izin ver"
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1906
 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:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:1996 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:1965
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "İleti-ID Oluştur"
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "İleti-ID içinde hesap posta adresini gönder"
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "Uygulama adı üstbilgisini ekle"
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı üstbilgi ekle"
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Doğrulama (SMTP AUTH)"
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15170,217 +15194,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:2103
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "Göndermeden önce POP ile kimlik denetimi yap"
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "POP kimlik doğrulaması zaman aşımı"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "Yetkilendirme"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "OAuth2 E-posta Servis Sunucusu Seç"
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "İstemci ID"
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "İstemci gizli değeri"
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2328
 msgid "Obtain authorization code"
 msgstr "Yetkilendirme kodunu al"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2332
 msgid "Open default browser with request"
 msgstr "İsteği öntanımlı tarayıcı ile aç"
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "Bağlantıyı Kopyala"
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "Yetkilendirme kodu"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2361
 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:2331
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "Yetkilendirmeyi tamamla"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "Yetkilendir"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "İmza"
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "İmzayı kendiliğinden ekle"
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "İmza ayracı"
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri kendiliğinden ata"
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "İmlâ denetim sözlükleri"
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2584 src/prefs_folder_item.c:1162
 #: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr "Öntanımlı sözlük"
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_account.c:2596 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:2643 src/prefs_account.c:4116
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
 #: 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:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
+#: src/prefs_account.c:2711 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:2720
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "Öntanımlı gizlilik sistemi"
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "İletileri her zaman imzala"
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "İletileri her zaman şifrele"
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr "İmzalı bir iletiyi yanıtlarken iletileri her zaman imzala"
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Şifrelenmiş bir iletiyi yanıtlarken iletileri her zaman şifrele"
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2797
 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:2761
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "Şifrelenmiş iletileri metin dosyası olarak kaydet"
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
 msgid "Don't use TLS"
 msgstr "TLS kullanma"
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Şifreli oturumuna başlamak için STARTTLS komutunu kullan"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3003
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "TLS kullanma (fakat, gerekliyse, STARTTLS kullan)"
 
-#: src/prefs_account.c:2976
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "İstemci sertifikaları"
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "Alım için sertifika"
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "PKCS12 ya da PEM olarak istemci sertifikası"
 
-#: src/prefs_account.c:3012
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "Gönderim için sertifika"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Automatically accept valid TLS certificates"
 msgstr "Geçerli TLS sertifikaları doğrudan kabul et"
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3093
 msgid "Use non-blocking TLS"
 msgstr "Bloklanmamış TLS Kullan"
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3105
 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:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3206
 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:3170
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "Genel vekil sunucu (proxy) ayarlarını kullan"
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "Kimlik doğrulaması kullan"
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "Göndermek için vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15388,27 +15412,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:3354
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "SMTP portu"
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "POP portu"
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "IMAP portu"
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "NNTP portu"
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "Alan adı"
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3422
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15416,156 +15440,179 @@ msgstr ""
 "Alan adı, oluşturulan İleti-ID'sinde ve SMTP sunuculara bağlanırken "
 "kullanılacak."
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "Sunucuyla iletişim kurmak için komut kullan"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mükerrer iletileri okundu olarak ve renkle işaretle:"
 
-#: src/prefs_account.c:3456
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri buraya koy"
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "Kuyruktaki iletileri buraya koy"
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "Taslak iletilerini buraya koy"
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "Silinen iletileri buraya koy"
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "Posta adresi girilmemiş."
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "Kullanıcı ID girilmemiş."
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "POP sunucu girilmemiş."
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "Öntanımlı Gelen Kutusu yok."
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "IMAP sunucu girilmemiş."
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "yerel posta kutusunun adı girilmemiş."
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "mail komutu girilmemiş"
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "Kullanıcı ID'si yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3601
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "Şifre yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3636
+#: src/prefs_account.c:3676
 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:3641
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP şifresi yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3733
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "alan aldı belirtilmedi."
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "gönderilen dizini seçilmedi."
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "kuyruk dizini seçilmedi."
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "taslak dizini seçilmedi."
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "çöp dizini seçilmedi."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4134
+#, fuzzy
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Gönder"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Hesap tercihleri"
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "Başarısız oldu (yanlış adres)"
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "İmza dosyasını seç"
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "Sertifika dosyasını seç"
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "Protokol"
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (eklenti yüklü değil)"
 
+#: src/prefs_account.c:6138
+#, fuzzy
+msgid "Authorisation complete"
+msgstr "Yetkilendirme kodu"
+
+#: src/prefs_account.c:6139
+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
+msgid "Authorisation NOT completed"
+msgstr "Yetkilendirme TAMAMLANMADI"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "OAuth2 yetkilendirme kodunuz Claws Mail tarafından alındımadı"
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr "Eylem ayarları"
@@ -15700,10 +15747,9 @@ msgid "The entry was not saved. Close anyway?"
 msgstr "Girdi kaydedilmesi. Yine de kapat?"
 
 #: 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:2168 src/prefs_template.c:567 src/prefs_template.c:592
-#: src/prefs_template.c:597
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "_Düzenlemeye devam et"
 
@@ -15846,8 +15892,8 @@ msgstr "%d tarihinde\\n%f yazdı:\\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\\nYönlendirilen iletiye başla:\\n\\n?d{Tarih: %d\\n}?f{Gönderen: %f\\n}?"
 "t{Alıcı: %t\\n}?c{Cc: %c\\n}?n{Habergrubu: %n\\n}?s{Başlık: %s\\n}\\n\\n%M"
@@ -15901,8 +15947,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "şu boyuttan büyük dosya eklerken uyar"
 
 #: src/prefs_compose_writing.c:205
-msgid "KiB into message body "
-msgstr "KiB ileti gövdesine "
+msgid "KiB into message body"
+msgstr "KiB ileti gövdesine"
 
 #: src/prefs_compose_writing.c:211
 msgid "Replying"
@@ -15959,64 +16005,68 @@ msgid "Header name is not set."
 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"
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "Bu üstbilgi adını kişisel bir üstbilgi olarak kullanılamaz."
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "Bir PNG dosyası seç"
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "Bir XBM dosyası seç"
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "Bir metin dosyası seç"
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "Bu dosya bir görüntü değil."
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Seçilen görüntü doğru boyutta (48x48) değil."
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Görüntü çok büyük; azamî 725 bayt olmalı."
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Görüntü doğru türde değil (PNG)."
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Görüntü doğru türde değil (XBM)."
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "`compface` çalıştırılamadı. $PATH değişkeni içinde olduğundan emin olun."
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface hatası: %s"
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "Bu dosya yeni satırlar içeriyor."
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "Üstbilgiyi sil"
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "Bu üstbilgiyi silmek istiyor musunuz?"
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "Mevcut kişisel üstbilgiler:"
 
@@ -17428,8 +17478,8 @@ msgid ""
 "Target folder is used when the option 'Execute immediately when moving or "
 "deleting messages' is turned off"
 msgstr ""
-"Hedef dizin 'İletileri silerken ve taşırken hemen çalıştır' seçeneği "
-"kapalı olduğunda kullanılır."
+"Hedef dizin 'İletileri silerken ve taşırken hemen çalıştır' seçeneği kapalı "
+"olduğunda kullanılır."
 
 #: src/prefs_msg_colors.c:370
 msgctxt "Tooltip and Dialog title"
@@ -17470,16 +17520,8 @@ msgid "Choose preset keyboard shortcuts"
 msgstr "Mevcut klavye kısayollarını seçin"
 
 #: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr "Ön ayarı seç:"
-
-#: src/prefs_other.c:138
-msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
-msgstr ""
-"Her bir menü kısayolunu fare işaretçisiyle üzerindeyken\n"
-"herhangi bir tuşa basarak değiştirebilirsiniz."
+msgid "Select preset keyboard shortcuts:"
+msgstr "Öntanımlı klavye kısayollarını seçin"
 
 #: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
@@ -17847,8 +17889,8 @@ msgstr ""
 "İleti gövdesi ASCII olmayan karakterler içerdiği zaman kullanılacak İçerik "
 "Aktarım Kodlaması'nı seçiniz."
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Gönderme"
 
@@ -18614,35 +18656,35 @@ msgstr "Metni katla"
 msgid "Wrapping"
 msgstr "Katlama"
 
-#: src/printing.c:436
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "Önizlemeyi yazdır"
 
-#: src/printing.c:480
+#: src/printing.c:479
 msgid "First page"
 msgstr "İlk sayfa"
 
-#: src/printing.c:490
+#: src/printing.c:489
 msgid "Last page"
 msgstr "Son sayfa"
 
-#: src/printing.c:496
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "%100 yakınlaş"
 
-#: src/printing.c:498
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "Ekrana sığdır"
 
-#: src/printing.c:500
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "Yakınlaş"
 
-#: src/printing.c:502
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "Uzaklaş"
 
-#: src/printing.c:700
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "Sayfa %d"
@@ -19021,88 +19063,88 @@ msgstr "'%s' yerine geçecek metni girin"
 msgid "Enter variable"
 msgstr "Değişken girin"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "İleti şu komut kullanılarak gönderiliyor: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "Komut yürütülemedi: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "Komut yürütülürken hata oluştu: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "Bağlantı kuruluyor"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "SMTP'den önce POP yapılıyor"
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "SMTP'den önce POP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "'%s' hesabı: SMTP sunucuya bağlanıyor: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "İleti başarıyla gönderildi."
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "HELO gönderiliyor..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "Kimlik denetimi"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "İleti gönderiliyor..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "EHLO gönderiliyor..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM gönderiliyor..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO gönderiliyor..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "DATA gönderiliyor..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "Çıkılıyor..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "İleti gönderilirken hata oluştu."
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -19558,7 +19600,7 @@ msgstr "Şifrelenmiş"
 msgid "Has attachment(s)"
 msgstr "Eklentisi olan"
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19567,11 +19609,11 @@ msgstr ""
 "Düzenli ifade (regexp) hatası:\n"
 "%s"
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8405
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Dizin listesine geri dön (Okunmamış iletileriniz var)"
 
-#: src/summaryview.c:8406
+#: src/summaryview.c:8410
 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 6f9c41921..963877fc4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git127\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2021-07-05 14:06+0800\n"
+"POT-Creation-Date: 2022-10-11 10:26+0100\n"
 "PO-Revision-Date: 2019-07-23 10:02+8\n"
 "Last-Translator: Mark Chang <mark.cyj at gmail.com>\n"
 "Language-Team: Mark Chang <mark.cyj at gmail.com>\n"
@@ -41,61 +41,238 @@ msgstr ""
 "「收信」功能可從你已設定的帳號中標示為「已勾選」的項目,依序收取信件,其中預"
 "設的帳號將以粗體顯示。"
 
-#: src/account.c:823
+#: src/account.c:781 src/foldersel.c:348
+msgid "_New"
+msgstr "新增(_N)"
+
+#: src/account.c:787
+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/mainwindow.c:516 src/messageview.c:213
+#: src/plugins/managesieve/sieve_editor.c:82
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: src/account.c:795
+msgid "Edit preferences for the selected account"
+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/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
+#: src/prefs_actions.c:746 src/prefs_customheader.c:256
+#: src/prefs_filtering.c:472 src/prefs_filtering.c:1196
+#: src/prefs_filtering.c:1216 src/prefs_template.c:316 src/prefs_template.c:899
+#: src/prefs_template.c:912 src/prefs_toolbar.c:1010 src/ssl_manager.c:211
+#: src/ssl_manager.c:453
+msgid "D_elete"
+msgstr "刪除(_e)"
+
+#: src/account.c:803
+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/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
+msgid "_Copy"
+msgstr "複製"
+
+#: src/account.c:811
+msgid "Create a new copy of the selected account"
+msgstr "從選擇的帳號開新郵件"
+
+#: src/account.c:813 src/editaddress.c:1324 src/gtk/foldersort.c:318
+#: src/prefs_actions.c:401 src/prefs_customheader.c:289
+#: src/prefs_display_header.c:391 src/prefs_filtering_action.c:620
+#: src/prefs_filtering.c:538 src/prefs_folder_column.c:316
+#: src/prefs_matcher.c:831 src/prefs_summary_column.c:330
+#: src/prefs_summary_open.c:295 src/prefs_template.c:374
+#: src/prefs_toolbar.c:1058
+msgid "_Down"
+msgstr "往下(_D)"
+
+#: src/account.c:819
+msgid "Move the selected account down"
+msgstr "向下移動選擇的規則"
+
+#: src/account.c:821 src/editaddress.c:1323 src/gtk/foldersort.c:312
+#: src/prefs_actions.c:393 src/prefs_customheader.c:283
+#: src/prefs_display_header.c:385 src/prefs_filtering_action.c:615
+#: src/prefs_filtering.c:530 src/prefs_folder_column.c:312
+#: src/prefs_matcher.c:826 src/prefs_summary_column.c:326
+#: src/prefs_summary_open.c:289 src/prefs_template.c:366
+#: src/prefs_toolbar.c:1054
+msgid "_Up"
+msgstr "往上(_U)"
+
+#: src/account.c:827
+msgid "Move the selected account up"
+msgstr "將選擇的動作上移"
+
+#: src/account.c:834
 msgid " _Set as default account "
 msgstr " 設定為預設帳號 (_S)"
 
-#: src/account.c:915
+#: 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/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/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/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/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/summary_search.c:495 src/summary_search.c:785
+msgid "_Close"
+msgstr "關閉"
+
+#: src/account.c:926
 msgid "Accounts with remote folders cannot be copied."
 msgstr "包含遠端資料夾的帳號無法被複製"
 
-#: src/account.c:922
+#: src/account.c:933
 #, c-format
 msgid "Copy of %s"
 msgstr "複製 %s"
 
-#: src/account.c:1126
+#: src/account.c:1137
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你確認要刪除帳號 '%s' 嗎?"
 
-#: src/account.c:1128
+#: src/account.c:1139
 msgid "(Untitled)"
 msgstr "(無標題)"
 
-#: src/account.c:1129
+#: src/account.c:1140
 msgid "Delete account"
 msgstr "刪除帳號"
 
-#: src/account.c:1603
+#: src/account.c:1141 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/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/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/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/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/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/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
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:632
+#: 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/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcal_folder.c:2030
+#: 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_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/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/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/prefs_customheader.c:698 src/prefs_display_header.c:328
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+msgid "_Delete"
+msgstr "刪除"
+
+#: src/account.c:1615
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1609
+#: src/account.c:1621
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "「收信」將從選取的帳號下取回郵件"
 
-#: src/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
-#: src/editaddress.c:1503 src/editaddress.c:1519
-#: src/editaddress_other_attributes_ldap.c:371
-#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
-#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
-#: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
+#: src/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:128 src/compose.c:7500 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/plugins/pdf_viewer/poppler_viewer.c:1851
-#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
-#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
-#: src/prefs_themes.c:990
+#: 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
 msgid "Name"
 msgstr "名稱"
 
-#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
+#: src/account.c:1636 src/prefs_account.c:1294 src/prefs_account.c:5016
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/account.c:1632 src/ssl_manager.c:109
+#: src/account.c:1644 src/ssl_manager.c:109
 msgid "Server"
 msgstr "伺服器"
 
@@ -134,7 +311,7 @@ msgstr ""
 "無效的過濾動作設定:\n"
 "%s"
 
-#: src/action.c:997
+#: src/action.c:1000
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -145,36 +322,44 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:999 src/compose.c:5280 src/compose.c:5285 src/compose.c:9706
-#: src/compose.c:9745 src/ldaputil.c:333
+#: 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/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:1831
-#: src/plugins/vcalendar/vcal_folder.c:1849
-#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1845
+#: src/plugins/vcalendar/vcal_folder.c:1848 src/privacy.c:64
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
-#: src/action.c:1218 src/action.c:1390
+#: src/action.c:1223 src/action.c:1397
 msgid "Completed"
 msgstr "完成"
 
-#: src/action.c:1254
+#: src/action.c:1260
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 執行: %s\n"
 
-#: src/action.c:1258
+#: src/action.c:1264
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已結束: %s\n"
 
-#: src/action.c:1304
+#: src/action.c:1307
 msgid "Action's input/output"
 msgstr "輸出/入的動作"
 
-#: src/action.c:1636
+#: src/action.c:1371
+msgid "_Execute"
+msgstr "執行"
+
+#: src/action.c:1406
+msgid "_Stop"
+msgstr "停止"
+
+#: src/action.c:1648
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -185,11 +370,11 @@ msgstr ""
 "('%%h' 將以此命令覆蓋)\n"
 "  %s"
 
-#: src/action.c:1641
+#: src/action.c:1653
 msgid "Action's hidden user argument"
 msgstr "隱藏使用者命令的動作"
 
-#: src/action.c:1645
+#: src/action.c:1657
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -200,72 +385,72 @@ msgstr ""
 "('%%u' 將以此命令覆蓋)\n"
 "  %s"
 
-#: src/action.c:1650
+#: src/action.c:1662
 msgid "Action's user argument"
 msgstr "使用者命令的動作"
 
-#: src/addrclip.c:481
+#: src/addrclip.c:483
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "無法複製資料夾到當前位置"
 
-#: src/addrclip.c:504
+#: src/addrclip.c:506
 msgid "Cannot copy an address book to itself."
 msgstr "無法複製通訊錄到當前位置"
 
-#: src/addrclip.c:595
+#: src/addrclip.c:597
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "無法移動資料夾到當前位置"
 
-#: src/addr_compl.c:699 src/addressbook.c:5009
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr "群組"
 
-#: src/addrcustomattr.c:65
+#: src/addrcustomattr.c:64
 msgid "date of birth"
 msgstr "生日"
 
-#: src/addrcustomattr.c:66
+#: src/addrcustomattr.c:65
 msgid "address"
 msgstr "地址"
 
-#: src/addrcustomattr.c:67
+#: src/addrcustomattr.c:66
 msgid "phone"
 msgstr "電話"
 
-#: src/addrcustomattr.c:68
+#: src/addrcustomattr.c:67
 msgid "mobile phone"
 msgstr "手機"
 
-#: src/addrcustomattr.c:69
+#: src/addrcustomattr.c:68
 msgid "organization"
 msgstr "組織"
 
-#: src/addrcustomattr.c:70
+#: src/addrcustomattr.c:69
 msgid "office address"
 msgstr "公司地址"
 
-#: src/addrcustomattr.c:71
+#: src/addrcustomattr.c:70
 msgid "office phone"
 msgstr "公司電話"
 
-#: src/addrcustomattr.c:72
+#: src/addrcustomattr.c:71
 msgid "fax"
 msgstr "傳真"
 
-#: src/addrcustomattr.c:73
+#: src/addrcustomattr.c:72
 msgid "website"
 msgstr "網址"
 
-#: src/addrcustomattr.c:146
+#: src/addrcustomattr.c:145
 msgid "Attribute name"
 msgstr "屬性名稱"
 
-#: src/addrcustomattr.c:161
+#: src/addrcustomattr.c:160
 msgid "Delete all attribute names"
 msgstr "刪除所有屬性名稱"
 
-#: src/addrcustomattr.c:162
+#: src/addrcustomattr.c:161
 msgid "Do you really want to delete all attribute names?"
 msgstr "確認刪除所有屬性嗎?"
 
@@ -277,29 +462,59 @@ msgstr "刪除屬性"
 msgid "Do you really want to delete this attribute name?"
 msgstr "確認刪除此一屬性名稱嗎?"
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:197
 msgid "Reset to default"
 msgstr "恢復至預設值"
 
-#: src/addrcustomattr.c:197
+#: src/addrcustomattr.c:198
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr "確認要以預設值覆蓋所有的屬性名稱嗎?"
 
-#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
-#: src/addressbook.c:479 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
-msgid "_Delete"
-msgstr "刪除"
+#: src/addrcustomattr.c:199 src/compose.c:9838 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/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/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
+msgid "_No"
+msgstr "_N否"
 
-#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1701 src/prefs_template.c:1113
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12251
+#: 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/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/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
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: src/addrcustomattr.c:219 src/edittags.c:298 src/prefs_actions.c:1106
+#: src/prefs_filtering.c:1690 src/prefs_template.c:1106
 msgid "Delete _all"
 msgstr "刪除所有"
 
-#: src/addrcustomattr.c:219
+#: src/addrcustomattr.c:220
 msgid "_Reset to default"
 msgstr "恢復至預設值"
 
@@ -316,6 +531,48 @@ msgstr "編輯屬性名稱"
 msgid "New attribute name:"
 msgstr "新屬性名稱"
 
+#: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
+#: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
+#: src/prefs_display_header.c:321 src/prefs_display_header.c:372
+#: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
+#: src/prefs_folder_column.c:271 src/prefs_matcher.c:791
+#: src/prefs_summary_column.c:285 src/prefs_summary_open.c:241
+#: src/prefs_template.c:299 src/prefs_toolbar.c:998
+msgid "_Add"
+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/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/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/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/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_summary_open.c:182 src/prefs_template.c:400
+msgid "_OK"
+msgstr "確定(_O)"
+
 #: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
@@ -339,6 +596,11 @@ 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/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
+msgid "_Find"
+msgstr "尋找(_F)"
+
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr "通訊錄中沒有重複的email"
@@ -347,9 +609,9 @@ msgstr "通訊錄中沒有重複的email"
 msgid "Duplicate email addresses"
 msgstr "重複的email"
 
-#: src/addrduplicates.c:443 src/addressadd.c:235
-#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
-#: src/toolbar.c:529
+#: src/addrduplicates.c:443 src/addressadd.c:233
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/toolbar.c:540
 msgid "Address"
 msgstr "地址"
 
@@ -357,11 +619,11 @@ msgstr "地址"
 msgid "Address book path"
 msgstr "通訊錄路徑"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
+#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
 msgid "Delete address(es)"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1490
+#: src/addrduplicates.c:792 src/addressbook.c:1485
 msgid "Really delete the address(es)?"
 msgstr "確定要刪除地址嗎?"
 
@@ -369,286 +631,269 @@ msgstr "確定要刪除地址嗎?"
 msgid "Delete address"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1437
+#: src/addrduplicates.c:842 src/addressbook.c:1431
 msgid "This address data is read-only and cannot be deleted."
 msgstr "這個地址資訊是唯讀的,而且不能被刪除"
 
-#: src/addressadd.c:192 src/prefs_filtering_action.c:195
+#: src/addressadd.c:190 src/prefs_filtering_action.c:193
 msgid "Add to address book"
 msgstr "加入通訊錄"
 
-#: src/addressadd.c:215
+#: src/addressadd.c:213
 msgid "Contact"
 msgstr "連絡人"
 
-#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1302 src/editgroup.c:292
+#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr "備註"
 
-#: src/addressadd.c:289 src/addressbook_foldersel.c:158
+#: src/addressadd.c:288 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
+#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
 msgid "Add address(es)"
 msgstr "新增連絡人地址"
 
-#: src/addressadd.c:600
+#: src/addressadd.c:599
 msgid "Can't add the specified address"
 msgstr "無法新增指定的連絡人地址"
 
-#: src/addressbook.c:129 src/addressbook.c:4997 src/editaddress.c:1247
-#: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
-#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
+#: src/addressbook.c:129 src/addressbook.c:4996 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:405
+#: src/addressbook.c:400
 msgid "_Book"
 msgstr "通訊錄(_B)"
 
-#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
-#: src/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
-#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
-#: src/messageview.c:215
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:519
+#: src/messageview.c:216
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/addressbook.c:410 src/addressbook.c:464
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Book"
 msgstr "新增通訊錄(_B)"
 
-#: src/addressbook.c:411 src/addressbook.c:465
+#: src/addressbook.c:406 src/addressbook.c:460
 msgid "New _Folder"
 msgstr "新增資料夾(_F)"
 
-#: src/addressbook.c:412
+#: src/addressbook.c:407
 msgid "New _vCard"
 msgstr "新增vCard(_v)"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:411
 msgid "New _JPilot"
 msgstr "新增JPilot(_J)"
 
-#: src/addressbook.c:419
+#: src/addressbook.c:414
 msgid "New LDAP _Server"
 msgstr "新增 LDAP Server"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:418
 msgid "_Edit book"
 msgstr "編輯通訊錄"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:419
 msgid "_Delete book"
 msgstr "刪除通訊錄"
 
-#: src/addressbook.c:426 src/compose.c:632
+#: src/addressbook.c:421 src/compose.c:632 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:434
-#: src/plugins/managesieve/sieve_editor.c:633
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:634 src/wizard.c:1832
 msgid "_Save"
 msgstr "儲存"
 
-#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
-#: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:631
-msgid "_Close"
-msgstr "關閉"
-
-#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
+#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
 msgid "_Select all"
 msgstr "全選"
 
-#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
+#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
 msgid "C_ut"
 msgstr "剪下"
 
-#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
-#: src/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
-#: src/plugins/managesieve/sieve_editor.c:96
-msgid "_Copy"
-msgstr "複製"
-
-#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
 #: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "貼上"
 
-#: src/addressbook.c:439 src/addressbook.c:481
+#: src/addressbook.c:434 src/addressbook.c:476
 msgid "New _Address"
 msgstr "新連絡人"
 
-#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
+#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
 msgid "New _Group"
 msgstr "新群組"
 
-#: src/addressbook.c:442 src/addressbook.c:488
+#: src/addressbook.c:437 src/addressbook.c:483
 msgid "_Mail To"
 msgstr "寄給"
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:442
 msgid "Import _LDIF file..."
 msgstr "匯入 _LDIF 檔案..."
 
-#: src/addressbook.c:448
+#: src/addressbook.c:443
 msgid "Import M_utt file..."
 msgstr "匯入 M_utt 檔案..."
 
-#: src/addressbook.c:449
+#: src/addressbook.c:444
 msgid "Import _Pine file..."
 msgstr "匯入 _Pine 檔案..."
 
-#: src/addressbook.c:451
+#: src/addressbook.c:446
 msgid "Export _HTML..."
 msgstr "匯出 _HTML 檔案..."
 
-#: src/addressbook.c:452
+#: src/addressbook.c:447
 msgid "Export LDI_F..."
 msgstr "匯出 LDI_F 檔案..."
 
-#: src/addressbook.c:454
+#: src/addressbook.c:449
 msgid "Find duplicates..."
 msgstr "尋找重複連絡人..."
 
-#: src/addressbook.c:455
+#: src/addressbook.c:450
 msgid "Edit custom attributes..."
 msgstr "編輯使用者屬性"
 
-#: src/addressbook.c:490
+#: src/addressbook.c:485
 msgid "_Browse Entry"
 msgstr "瀏覽(_B)"
 
-#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
-#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
-#: src/prefs_themes.c:851 src/prefs_themes.c:852
+#: src/addressbook.c:499 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
 msgid "Unknown"
 msgstr "未知"
 
-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
+#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
 msgid "Success"
 msgstr "成功"
 
-#: src/addressbook.c:512 src/importldif.c:122
+#: src/addressbook.c:507 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "錯誤的命令"
 
-#: src/addressbook.c:513 src/importldif.c:123
+#: src/addressbook.c:508 src/importldif.c:123
 msgid "File not specified"
 msgstr "未指定檔案"
 
-#: src/addressbook.c:514 src/importldif.c:124
+#: src/addressbook.c:509 src/importldif.c:124
 msgid "Error opening file"
 msgstr "檔案開啟失敗"
 
-#: src/addressbook.c:515 src/importldif.c:125
+#: src/addressbook.c:510 src/importldif.c:125
 msgid "Error reading file"
 msgstr "讀取檔案錯誤"
 
-#: src/addressbook.c:516 src/importldif.c:126
+#: src/addressbook.c:511 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "已達檔案結尾"
 
-#: src/addressbook.c:517 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "記憶體配置錯誤"
 
-#: src/addressbook.c:518 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128
 msgid "Bad file format"
 msgstr "檔案格式錯誤"
 
-#: src/addressbook.c:519 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "檔案寫入錯誤"
 
-#: src/addressbook.c:520 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "目錄開啟錯誤"
 
-#: src/addressbook.c:521 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131
 msgid "No path specified"
 msgstr "指定的路徑不存在"
 
-#: src/addressbook.c:531
+#: src/addressbook.c:526
 msgid "Error connecting to LDAP server"
 msgstr "連線至LDAP伺服器錯誤"
 
-#: src/addressbook.c:532
+#: src/addressbook.c:527
 msgid "Error initializing LDAP"
 msgstr "LDAP初始化錯誤"
 
-#: src/addressbook.c:533
+#: src/addressbook.c:528
 msgid "Error binding to LDAP server"
 msgstr "LDAP伺服器綁定錯誤"
 
-#: src/addressbook.c:534
+#: src/addressbook.c:529
 msgid "Error searching LDAP database"
 msgstr "搜尋LDAP資料庫錯誤"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:530
 msgid "Timeout performing LDAP operation"
 msgstr "進行LDAP操作超時"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜尋標準錯誤"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP的搜尋標準進入點不存在"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "LDAP search terminated on request"
 msgstr "LDAP搜尋被要求終止"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error starting STARTTLS connection"
 msgstr "TLS連線起始失敗"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Distinguished Name (dn) is missing"
 msgstr "缺少識別名稱?"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Missing required information"
 msgstr "缺少要求的資訊"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "Another contact exists with that key"
 msgstr "發現另一個連絡人存在相同的金鑰"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "Strong(er) authentication required"
 msgstr "需要更強而有力的認證碼"
 
-#: src/addressbook.c:911
+#: src/addressbook.c:906
 msgid "Sources"
 msgstr "來源"
 
-#: src/addressbook.c:915 src/prefs_matcher.c:643 src/prefs_other.c:493
-#: src/toolbar.c:268 src/toolbar.c:2522
+#: src/addressbook.c:910 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:1109 src/editldap.c:794
+#: src/addressbook.c:1103 src/editldap.c:777
 msgid "Search"
 msgstr "搜尋"
 
-#: src/addressbook.c:1481
+#: src/addressbook.c:1475
 msgid "Delete group"
 msgstr "刪除群組"
 
-#: src/addressbook.c:1482
+#: src/addressbook.c:1476
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -656,26 +901,26 @@ msgstr ""
 "確認要刪除群組嗎?\n"
 "所有的地址將遺失"
 
-#: src/addressbook.c:2209
+#: src/addressbook.c:2205
 msgid "Cannot paste. Target address book is read-only."
 msgstr "無法貼上,此地址是唯讀的"
 
-#: src/addressbook.c:2219
+#: src/addressbook.c:2215
 msgid "Cannot paste into an address group."
 msgstr "無法貼在地址群組上"
 
-#: src/addressbook.c:2956
+#: src/addressbook.c:2950
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "確認要刪除%s內所有搜尋的結果和地址嗎?"
 
-#: src/addressbook.c:2959 src/addressbook.c:2985 src/addressbook.c:2992
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
-#: src/toolbar.c:497
+#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
+#: src/toolbar.c:507
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2963
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -683,20 +928,20 @@ msgid ""
 msgstr ""
 "確認刪除%s嗎?如果只刪除資料夾,則裡面原有的地址都將被自動移至上層資料夾內"
 
-#: src/addressbook.c:2971 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
+#: 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
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:2972
+#: src/addressbook.c:2967
 msgid "Delete _folder only"
 msgstr "只刪除資料夾(_f)"
 
-#: src/addressbook.c:2972
+#: src/addressbook.c:2968
 msgid "Delete folder and _addresses"
 msgstr "刪除資料夾和地址(_a)"
 
-#: src/addressbook.c:2983
+#: src/addressbook.c:2979
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -705,7 +950,7 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址將不會遺失"
 
-#: src/addressbook.c:2990
+#: src/addressbook.c:2986
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -714,28 +959,28 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址都將遺失"
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3100
 #, c-format
 msgid "Search '%s'"
 msgstr "尋找 %s"
 
-#: src/addressbook.c:3242 src/addressbook.c:3291
+#: src/addressbook.c:3238 src/addressbook.c:3288
 msgid "New Contacts"
 msgstr "新增連絡人"
 
-#: src/addressbook.c:4128
+#: src/addressbook.c:4127
 msgid "New user, could not save index file."
 msgstr "新連絡人無法儲存至索引檔中"
 
-#: src/addressbook.c:4132
+#: src/addressbook.c:4131
 msgid "New user, could not save address book files."
 msgstr "新連絡人無法儲存至通訊錄檔案"
 
-#: src/addressbook.c:4142
+#: src/addressbook.c:4141
 msgid "Old address book converted successfully."
 msgstr "舊通訊錄轉換成功"
 
-#: src/addressbook.c:4147
+#: src/addressbook.c:4146
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -743,7 +988,7 @@ msgstr ""
 "舊通訊錄已轉換,\n"
 "無法儲存新地址索引檔"
 
-#: src/addressbook.c:4160
+#: src/addressbook.c:4159
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -751,7 +996,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "但已建立新的空通訊錄檔案"
 
-#: src/addressbook.c:4166
+#: src/addressbook.c:4165
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -759,7 +1004,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "無法儲存新的地址索引檔"
 
-#: src/addressbook.c:4171
+#: src/addressbook.c:4170
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -767,57 +1012,57 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "且無法建立新的通訊錄檔案"
 
-#: src/addressbook.c:4178 src/addressbook.c:4184
+#: src/addressbook.c:4177 src/addressbook.c:4182
 msgid "Addressbook conversion error"
 msgstr "通訊錄轉換失敗"
 
-#: src/addressbook.c:4299
+#: src/addressbook.c:4297
 msgid "Addressbook Error"
 msgstr "通訊錄錯誤"
 
-#: src/addressbook.c:4300
+#: src/addressbook.c:4298
 msgid "Could not read address index"
 msgstr "無法讀取地址索引"
 
-#: src/addressbook.c:4631
+#: src/addressbook.c:4630
 msgid "Busy searching..."
 msgstr "正在搜尋..."
 
-#: src/addressbook.c:4961 src/prefs_send.c:220
+#: src/addressbook.c:4960 src/prefs_send.c:220
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4973
+#: src/addressbook.c:4972
 msgid "Address Books"
 msgstr "通訊錄"
 
-#: src/addressbook.c:4985
+#: src/addressbook.c:4984
 msgid "Person"
 msgstr "人員"
 
-#: src/addressbook.c:5021 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
+#: 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
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:5033
+#: src/addressbook.c:5032
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5045 src/addressbook.c:5057
+#: src/addressbook.c:5044 src/addressbook.c:5056
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5069
+#: src/addressbook.c:5068
 msgid "LDAP servers"
 msgstr "LDAP伺服器"
 
-#: src/addressbook.c:5081
+#: src/addressbook.c:5080
 msgid "LDAP Query"
 msgstr "LDAP查詢"
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:985 src/importldif.c:541
+#: 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 "通訊錄"
 
@@ -845,53 +1090,53 @@ msgstr "地址已加入 Claws-mail"
 msgid "Addresses collected successfully."
 msgstr "地址收集成功"
 
-#: src/addrgather.c:360
+#: src/addrgather.c:358
 msgid "Current folder:"
 msgstr "目前的資料夾"
 
-#: src/addrgather.c:371
+#: src/addrgather.c:367
 msgid "Address book name:"
 msgstr "通訊錄名稱"
 
-#: src/addrgather.c:398
+#: src/addrgather.c:395
 msgid "Address book folder size:"
 msgstr "通訊錄資料夾大小"
 
-#: src/addrgather.c:402 src/addrgather.c:411
+#: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "新通訊錄中每一個資料夾內最大的資料筆數"
 
-#: src/addrgather.c:415
+#: src/addrgather.c:412
 msgid "Process these mail header fields"
 msgstr "郵件標頭區處理中"
 
-#: src/addrgather.c:434
+#: src/addrgather.c:432
 msgid "Include subfolders"
 msgstr "包含子資料夾"
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
+#: src/addrgather.c:490 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr "標頭名稱"
 
-#: src/addrgather.c:498
+#: src/addrgather.c:496
 msgid "Address Count"
 msgstr "地址數量"
 
-#: src/addrgather.c:586
+#: src/addrgather.c:584
 msgid "Header Fields"
 msgstr "標頭區"
 
-#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
-#: src/importldif.c:982
+#: src/addrgather.c:585 src/exphtmldlg.c:640 src/expldifdlg.c:705
+#: src/importldif.c:967
 msgid "Finish"
 msgstr "完成"
 
-#: src/addrgather.c:645
+#: src/addrgather.c:643
 msgid "Collect email addresses from selected messages"
 msgstr "從選擇的郵件內收集郵件地址"
 
-#: src/addrgather.c:649
+#: src/addrgather.c:647
 msgid "Collect email addresses from folder"
 msgstr "從資料夾內收集郵件地址"
 
@@ -919,39 +1164,39 @@ msgstr "地址更新"
 msgid "Update failed. Changes not written to Directory."
 msgstr "更新錯誤!所有的改變將不會被儲存"
 
-#: src/alertpanel.c:144 src/compose.c:9820
+#: src/alertpanel.c:154 src/compose.c:9838 src/mimeview.c:1860
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:157 src/compose.c:5874 src/compose.c:6419
-#: src/compose.c:12221 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
+#: 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
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5811 src/inc.c:731
-#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:734
+#: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "錯誤"
 
-#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:204 src/gtk/progressdialog.c:92
 msgid "_View log"
 msgstr "顯示日誌(_V)"
 
-#: src/alertpanel.c:346
+#: src/alertpanel.c:372
 msgid "Show this message next time"
 msgstr "下一次顯示這個訊息"
 
-#: src/browseldap.c:223
+#: src/browseldap.c:221
 msgid "Browse Directory Entry"
 msgstr "瀏覽目錄"
 
-#: src/browseldap.c:243
+#: src/browseldap.c:240
 msgid "Server Name:"
 msgstr "伺服器名稱:"
 
-#: src/browseldap.c:253
+#: src/browseldap.c:251
 msgid "Distinguished Name (dn):"
 msgstr "識別名稱 (dn)"
 
@@ -992,196 +1237,196 @@ msgid "a notifier"
 msgstr "通知器"
 
 #: src/common/plugin.c:77
-msgid "an utility"
+msgid "a utility"
 msgstr "實用的"
 
 #: src/common/plugin.c:78
 msgid "things"
 msgstr "東西"
 
-#: src/common/plugin.c:335
+#: src/common/plugin.c:336
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "這個外掛提供了 %s (%s), 而這個功能已經在 %s 外掛中被提供了"
 
-#: src/common/plugin.c:438
+#: src/common/plugin.c:439
 msgid "Plugin already loaded"
 msgstr "此外掛功能已經載入"
 
-#: src/common/plugin.c:449
+#: src/common/plugin.c:450
 msgid "Failed to allocate memory for Plugin"
 msgstr "此外掛功能發生記憶體配置錯誤"
 
-#: src/common/plugin.c:483
+#: src/common/plugin.c:484
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "此模組並未取得GPL v3或更新版本的相容許可"
 
-#: src/common/plugin.c:492
+#: src/common/plugin.c:493
 msgid "This module is for Claws Mail GTK1."
 msgstr "此模組適用於 Claws Mail GTK1"
 
-#: src/common/plugin.c:770
+#: src/common/plugin.c:774
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
-#: src/common/plugin.c:773
+#: src/common/plugin.c:777
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
-#: src/common/plugin.c:782
+#: src/common/plugin.c:786
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:788
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/session.c:201 src/imap.c:1246
-msgid "SSL/TLS handshake failed\n"
+#: src/common/session.c:201 src/imap.c:1261
+msgid "TLS handshake failed\n"
 msgstr "SSL/TLS 交握失敗\n"
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:189
 msgid "No SMTP AUTH method available\n"
 msgstr "找不到有效SMTP認證方法\n"
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:192
 msgid "Selected SMTP AUTH method not available\n"
 msgstr "指定的SMPT認證方法是無效的\n"
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:546 src/common/smtp.c:603
 msgid "bad SMTP response\n"
 msgstr "錯誤的SMTP回應\n"
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:574 src/common/smtp.c:592 src/common/smtp.c:709
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP執行時期發生錯誤\n"
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:583 src/pop.c:938
 msgid "error occurred on authentication\n"
 msgstr "認證發生錯誤\n"
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:633
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "訊息太多(最大的容許量是 %s)\n"
 
-#: src/common/smtp.c:656 src/pop.c:927
+#: src/common/smtp.c:665 src/pop.c:931
 msgid "couldn't start STARTTLS session\n"
 msgstr "無法執行STARTTLS\n"
 
-#: src/common/socket.c:571
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr "Socket 輸出/入超時\n"
 
-#: src/common/socket.c:600
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr "連線超時\n"
 
-#: src/common/socket.c:740
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: 連線失敗 (%s)\n"
 
-#: src/common/socket.c:980
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: 不知名的主機\n"
 
-#: src/common/socket.c:1072
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: 尋找主機失敗 (%s)\n"
 
-#: src/common/socket.c:1385
+#: src/common/socket.c:1379
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "寫入 fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:338
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "無法指定P12認證檔 (%s)\n"
 
-#: src/common/ssl_certificate.c:346
+#: src/common/ssl_certificate.c:342
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "無法讀取P12認證檔 (%s)\n"
 
-#: src/common/ssl_certificate.c:355
+#: src/common/ssl_certificate.c:351
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "無法匯入P12認證檔 (%s)\n"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:636
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: src/common/ssl_certificate.c:645
+#: src/common/ssl_certificate.c:641
 msgid "Uncheckable"
 msgstr "無法被選取"
 
-#: src/common/ssl_certificate.c:649
+#: src/common/ssl_certificate.c:645
 msgid "Self-signed certificate"
 msgstr "自我簽署簽證"
 
-#: src/common/ssl_certificate.c:652
+#: src/common/ssl_certificate.c:648
 msgid "Revoked certificate"
 msgstr "簽證徹回"
 
-#: src/common/ssl_certificate.c:654
+#: src/common/ssl_certificate.c:650
 msgid "No certificate issuer found"
 msgstr "找不到簽證發行者"
 
-#: src/common/ssl_certificate.c:656
+#: src/common/ssl_certificate.c:652
 msgid "Certificate issuer is not a CA"
 msgstr "簽證發行者不是CA"
 
-#: src/common/ssl_certificate.c:881
+#: src/common/ssl_certificate.c:877
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "無法開啟簽證檔案 %s: %s\n"
 
-#: src/common/ssl_certificate.c:885
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "簽證檔案%s遺失(%s)\n"
 
-#: src/common/ssl_certificate.c:904
+#: src/common/ssl_certificate.c:900
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "無法開啟金鑰檔案 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:908
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "金鑰檔案%s遺失(%s)\n"
 
-#: src/common/ssl_certificate.c:1056
+#: src/common/ssl_certificate.c:1052
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "讀取P12簽證檔案%s失敗\n"
 
-#: src/common/ssl_certificate.c:1059
+#: src/common/ssl_certificate.c:1055
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "開啟P12簽證檔案 %s (%s)失敗\n"
 
-#: src/common/ssl_certificate.c:1063
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12簽證檔案%s遺失 (%s)\n"
 
-#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
-#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
-#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
-#: src/gtk/sslcertwindow.c:136
+#: src/common/ssl_certificate.c:1084 src/gtk/sslcertwindow.c:85
+#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
+#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
+#: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr "<尚未簽證>"
 
@@ -1189,237 +1434,234 @@ msgstr "<尚未簽證>"
 msgid "(Subject cleared by RegExp)"
 msgstr "標題已被RegExp清除"
 
-#: src/common/utils.c:200
+#: src/common/utils.c:184
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:201
-#, c-format
-msgid "%d.%02dKB"
+#: src/common/utils.c:185
+msgid "%d.%02dKiB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:202
-#, c-format
-msgid "%d.%02dMB"
+#: src/common/utils.c:186
+msgid "%d.%02dMiB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:203
-#, c-format
-msgid "%.2fGB"
+#: src/common/utils.c:187
+msgid "%.2fGiB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4087
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/common/utils.c:4088
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "星期一"
 
-#: src/common/utils.c:4089
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/common/utils.c:4090
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/common/utils.c:4091
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/common/utils.c:4092
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "星期五"
 
-#: src/common/utils.c:4093
+#: src/common/utils.c:4124
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/common/utils.c:4095
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "一月"
 
-#: src/common/utils.c:4096
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "二月"
 
-#: src/common/utils.c:4097
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "三月"
 
-#: src/common/utils.c:4098
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "四月"
 
-#: src/common/utils.c:4099
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4100
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "六月"
 
-#: src/common/utils.c:4101
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "七月"
 
-#: src/common/utils.c:4102
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "八月"
 
-#: src/common/utils.c:4103
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "九月"
 
-#: src/common/utils.c:4104
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "十月"
 
-#: src/common/utils.c:4105
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "十一月"
 
-#: src/common/utils.c:4106
+#: src/common/utils.c:4137
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "十二月"
 
-#: src/common/utils.c:4108
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "星期日"
 
-#: src/common/utils.c:4109
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "星期一"
 
-#: src/common/utils.c:4110
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "星期二"
 
-#: src/common/utils.c:4111
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "星期三"
 
-#: src/common/utils.c:4112
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "星期四"
 
-#: src/common/utils.c:4113
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "星期五"
 
-#: src/common/utils.c:4114
+#: src/common/utils.c:4145
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "星期六"
 
-#: src/common/utils.c:4116
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "一月"
 
-#: src/common/utils.c:4117
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "二月"
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "三月"
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "四月"
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "六月"
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "七月"
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "八月"
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "九月"
 
-#: src/common/utils.c:4125
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "十月"
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "十一月"
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4158
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "十二月"
 
-#: src/common/utils.c:4138
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "上午"
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "下午"
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "上午"
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4172
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "下午"
 
-#: src/compose.c:198
+#: src/compose.c:200
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1434,16 +1676,20 @@ msgstr ""
 msgid "_Add..."
 msgstr "新增(_A)..."
 
-#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:323
+#: 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/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
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/compose.c:607 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:255
 msgid "_Properties..."
 msgstr "屬性(_P)"
 
-#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:518 src/messageview.c:215
 msgid "_Message"
 msgstr "郵件(_M)"
 
@@ -1455,7 +1701,7 @@ msgstr "拼字(_S)"
 msgid "_Options"
 msgstr "選用(_O)"
 
-#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:521 src/messageview.c:217
 msgid "_Help"
 msgstr "協助(_H)"
 
@@ -1515,7 +1761,7 @@ msgstr "已換行(_W)"
 msgid "_Unwrapped"
 msgstr "不換行(_U)"
 
-#: src/compose.c:652 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:551
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "全選(_a)"
@@ -1580,11 +1826,6 @@ msgstr "刪除列"
 msgid "Delete to end of line"
 msgstr "刪除至列尾"
 
-#: src/compose.c:671 src/messageview.c:231
-#: src/plugins/managesieve/sieve_editor.c:102
-msgid "_Find"
-msgstr "尋找(_F)"
-
 #: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr "目前的段落換行(_W)"
@@ -1625,47 +1866,47 @@ msgstr "隱私系統(_S)"
 msgid "_Priority"
 msgstr "優先權(_P)"
 
-#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:613 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "字元編碼(_e)"
 
-#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:618 src/messageview.c:273
 msgid "Western European"
 msgstr "西歐"
 
-#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:619 src/messageview.c:274
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:620 src/messageview.c:275
 msgid "Hebrew"
 msgstr "希伯來"
 
-#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:621 src/messageview.c:276
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:622 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "西里爾"
 
-#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:623 src/messageview.c:278
 msgid "Japanese"
 msgstr "日文"
 
-#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:624 src/messageview.c:279
 msgid "Chinese"
 msgstr "中文"
 
-#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:625 src/messageview.c:280
 msgid "Korean"
 msgstr "韓文"
 
-#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:626 src/messageview.c:281
 msgid "Thai"
 msgstr "泰文"
 
-#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr "通訊錄"
 
@@ -1673,11 +1914,11 @@ msgstr "通訊錄"
 msgid "_Template"
 msgstr "樣板"
 
-#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "動作"
 
-#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr "關於"
 
@@ -1713,13 +1954,13 @@ msgstr "顯示尺標"
 msgid "_Normal"
 msgstr "一般"
 
-#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
-#: src/summaryview.c:433
+#: src/compose.c:739 src/mainwindow.c:667 src/messageview.c:306
+#: src/summaryview.c:429
 msgid "_All"
 msgstr "所有"
 
-#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
-#: src/summaryview.c:434
+#: src/compose.c:740 src/mainwindow.c:668 src/messageview.c:307
+#: src/summaryview.c:430
 msgid "_Sender"
 msgstr "傳送者"
 
@@ -1743,113 +1984,113 @@ msgstr "低"
 msgid "_Lowest"
 msgstr "最低"
 
-#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr "自動"
 
-#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 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:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "萬國碼 (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 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:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "希臘 (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "士耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:1056
+#: src/compose.c:1040
 msgid "New message From format error."
 msgstr "新訊息寄件者格式錯誤"
 
-#: src/compose.c:1149
+#: src/compose.c:1133
 msgid "New message subject format error."
 msgstr "新訊息標題格式錯誤"
 
-#: src/compose.c:1181 src/quote_fmt.c:563
+#: src/compose.c:1165 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:1450
+#: src/compose.c:1434
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "無法回覆,原始信件可能不存在"
 
-#: src/compose.c:1635 src/quote_fmt.c:580
+#: src/compose.c:1619 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "回寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1684 src/quote_fmt.c:583
+#: src/compose.c:1668 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:1825 src/compose.c:2026 src/quote_fmt.c:600
+#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "轉寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1886 src/quote_fmt.c:603
+#: src/compose.c:1870 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:2069
+#: src/compose.c:2053
 msgid "Fw: multiple emails"
 msgstr "回覆:多重郵件"
 
-#: src/compose.c:2580
+#: src/compose.c:2575
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "改寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2651 src/gtk/headers.h:14
+#: src/compose.c:2646 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "副本:"
 
-#: src/compose.c:2654 src/gtk/headers.h:15
+#: src/compose.c:2649 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "密件副本:"
 
-#: src/compose.c:2657 src/gtk/headers.h:12
+#: src/compose.c:2652 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "回信給:"
 
-#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
+#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "新聞群組:"
 
-#: src/compose.c:2663 src/gtk/headers.h:34
+#: src/compose.c:2658 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "跟隨至:"
 
-#: src/compose.c:2666 src/gtk/headers.h:17
+#: src/compose.c:2661 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "回覆至:"
 
-#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
-#: src/gtk/headers.h:13 src/summary_search.c:422
+#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr "收件者:"
 
-#: src/compose.c:2860
+#: src/compose.c:2861
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "無法夾帶檔案(字元轉換失敗)"
 
-#: src/compose.c:2866
+#: src/compose.c:2867
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1864,73 +2105,73 @@ msgstr[1] ""
 "下列檔案已經夾帶:\n"
 "%s"
 
-#: src/compose.c:3146
+#: src/compose.c:3147
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "樣板內\"引用標示\"有誤"
 
-#: src/compose.c:3675
+#: src/compose.c:3680
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "無法取得檔案'%s'大小"
 
-#: src/compose.c:3693
+#: src/compose.c:3698
 #, 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:3696
+#: src/compose.c:3701
 msgid "Are you sure?"
 msgstr "你確定嗎?"
 
-#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
+#: src/compose.c:3702 src/compose.c:10834 src/compose.c:11734
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/compose.c:3822
+#: src/compose.c:3827
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空白的"
 
-#: src/compose.c:3823
+#: src/compose.c:3828
 msgid "Empty file"
 msgstr "清空檔案"
 
-#: src/compose.c:3824
+#: src/compose.c:3829
 msgid "_Attach anyway"
 msgstr "直接夾檔(_A)"
 
-#: src/compose.c:3833
+#: src/compose.c:3838
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s"
 
-#: src/compose.c:3860
+#: src/compose.c:3865
 #, c-format
 msgid "Message: %s"
 msgstr "訊息: %s"
 
-#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " 已編輯"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新信件 %s"
 
-#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[無主題] - 新信件 %s"
 
-#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "新信件"
 
-#: src/compose.c:4909 src/messageview.c:887
+#: src/compose.c:4919 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1938,59 +2179,62 @@ msgstr ""
 "尚未指定郵件的傳送地址\n"
 "傳送前請選擇一個郵件地址"
 
-#: src/compose.c:5126 src/compose.c:5163
+#: src/compose.c:5136 src/compose.c:5173
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "只存在一個預設的收件者 '%s',確認寄出?"
 
-#: src/compose.c:5128 src/compose.c:5165 src/compose.c:5203 src/compose.c:5246
-#: src/prefs_account.c:4122 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "傳送"
 
-#: src/compose.c:5130 src/compose.c:5167 src/compose.c:5204 src/compose.c:5247
-#: src/compose.c:5812 src/folderview.c:2546 src/messageview.c:859
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
+#: 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/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: src/compose.c:5184
+#: src/compose.c:5194
 msgid "Recipient is not specified."
 msgstr "尚未指定收件者"
 
-#: src/compose.c:5199
+#: src/compose.c:5209
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "主題空白 %s"
 
-#: src/compose.c:5200 src/compose.c:5243
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5210 src/compose.c:5253
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "確認寄出?"
 
-#: src/compose.c:5201 src/compose.c:5244
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5211 src/compose.c:5254
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr "儲存至草稿?"
 
-#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
+#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
 msgid "Send later"
 msgstr "稍後寄送"
 
-#: src/compose.c:5204 src/compose.c:5247
+#: src/compose.c:5214 src/compose.c:5257
 msgid "_Queue"
 msgstr "草稿(_Q)"
 
-#: src/compose.c:5242
+#: src/compose.c:5252
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "傳送給 %d 接收者. %s"
 
-#: src/compose.c:5271
+#: src/compose.c:5281
 msgid "Could not queue message."
 msgstr "此訊息無法稍後再送出"
 
-#: src/compose.c:5274
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2001,7 +2245,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5278
+#: src/compose.c:5288
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2012,7 +2256,7 @@ msgstr ""
 "\n"
 "簽名天敗:  %s"
 
-#: src/compose.c:5283
+#: src/compose.c:5293
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2023,7 +2267,7 @@ msgstr ""
 "\n"
 "加密失敗:  %s"
 
-#: src/compose.c:5288
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2033,7 +2277,7 @@ msgstr ""
 "\n"
 "字元轉換失敗"
 
-#: src/compose.c:5292
+#: src/compose.c:5302
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2043,7 +2287,7 @@ msgstr ""
 "\n"
 "無法取得收件者的加密金鑰"
 
-#: src/compose.c:5355 src/compose.c:5415
+#: src/compose.c:5365 src/compose.c:5425
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2051,7 +2295,7 @@ msgstr ""
 "草稿信件無法被傳送\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5411
+#: src/compose.c:5421
 #, c-format
 msgid ""
 "%s\n"
@@ -2060,7 +2304,7 @@ msgstr ""
 "%s\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5808
+#: src/compose.c:5818
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2070,7 +2314,7 @@ msgstr ""
 "無法轉換訊息的字元編碼至指定的 %s 編碼\n"
 "確認以 %s 傳送?"
 
-#: src/compose.c:5870
+#: src/compose.c:5876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2082,98 +2326,100 @@ msgstr ""
 "訊息內容將被打斷以利傳輸\n"
 "確定要傳送嗎?"
 
-#: src/compose.c:6105
+#: src/compose.c:6115
 msgid "Encryption warning"
 msgstr "加密警告"
 
-#: src/compose.c:6106
+#: src/compose.c:6116
 msgid "C_ontinue"
 msgstr "繼續(_o)"
 
-#: src/compose.c:6155
+#: src/compose.c:6165
 msgid "No account for sending mails available!"
 msgstr "傳送郵件時找不到有效的帳號"
 
-#: src/compose.c:6164
+#: src/compose.c:6174
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "選擇的帳號並非NNTP:無法傳輸"
 
-#: src/compose.c:6418
+#: src/compose.c:6428
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "附加檔案%s不存在,忽略嗎?"
 
-#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6430 src/mainwindow.c:658 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr "終止傳送"
 
-#: src/compose.c:6420
+#: src/compose.c:6431
 msgid "Ignore attachment"
 msgstr "忽略附加檔案"
 
-#: src/compose.c:6476
+#: src/compose.c:6487
 #, c-format
 msgid "Original %s part"
 msgstr "原始的第%s部份"
 
-#: src/compose.c:7076
+#: src/compose.c:7094
 msgid "Add to address _book"
 msgstr "新增至通訊錄"
 
-#: src/compose.c:7243
+#: src/compose.c:7249
 msgid "Delete entry contents"
 msgstr "刪除目錄"
 
-#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "按下 <tab> 可自動完成郵件地址"
 
-#: src/compose.c:7479
+#: src/compose.c:7488
 msgid "Mime type"
 msgstr "Mime格式"
 
-#: src/compose.c:7485 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:633
-#: src/prefs_summary_column.c:84 src/summaryview.c:472
+#: src/compose.c:7494 src/mimeview.c:303
+#: 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/summaryview.c:468
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:7547
+#: src/compose.c:7556
 msgid "Save Message to "
 msgstr "儲存訊息到"
 
-#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
-#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
-#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
+#: src/compose.c:7589 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/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
-#: src/plugins/bsfilter/bsfilter_gtk.c:181
+#: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "_Browse"
 msgstr "瀏覽"
 
-#: src/compose.c:7594
+#: src/compose.c:7605
 msgid "Select folder to save message to"
 msgstr "選擇要儲存郵件的目錄"
 
-#: src/compose.c:8051
+#: src/compose.c:8059
 msgid "Hea_der"
 msgstr "標頭"
 
-#: src/compose.c:8056
+#: src/compose.c:8064
 msgid "_Attachments"
 msgstr "附件檔"
 
-#: src/compose.c:8070
+#: src/compose.c:8078
 msgid "Othe_rs"
 msgstr "其它"
 
-#: src/compose.c:8085
+#: src/compose.c:8093
 msgid "S_ubject:"
 msgstr "主旨"
 
-#: src/compose.c:8309
+#: src/compose.c:8317
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2182,69 +2428,70 @@ msgstr ""
 "拼字檢查無法正確啟用\n"
 "%s"
 
-#: src/compose.c:8456
+#: src/compose.c:8468
 msgid "_From:"
 msgstr "寄件者:"
 
-#: src/compose.c:8473
+#: src/compose.c:8476
 msgid "Account to use for this email"
 msgstr "此郵件使用的帳號"
 
-#: src/compose.c:8475
+#: src/compose.c:8478
 msgid "Sender address to be used"
 msgstr "使用的寄件者地址"
 
-#: src/compose.c:8657
+#: src/compose.c:8660
 #, 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:8768 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
 msgstr "空白(_N)"
 
-#: src/compose.c:8869 src/prefs_template.c:752
+#: src/compose.c:8872 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "此樣板內容的第%d行發現錯誤"
 
-#: src/compose.c:8966
+#: src/compose.c:8969
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "樣板中 '%s' 欄位格式錯誤"
 
-#: src/compose.c:9390
+#: src/compose.c:9394
 msgid "Invalid MIME type."
 msgstr "無效的MINE型式"
 
-#: src/compose.c:9405
+#: src/compose.c:9409
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或空白"
 
-#: src/compose.c:9479
+#: src/compose.c:9480
 msgid "Properties"
 msgstr "屬性"
 
-#: src/compose.c:9497
+#: src/compose.c:9498
 msgid "MIME type"
 msgstr "MIME型式"
 
-#: src/compose.c:9530
+#: src/compose.c:9531
 msgid "Encoding"
 msgstr "編碼中"
 
-#: src/compose.c:9550
+#: src/compose.c:9551
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:9551
+#: src/compose.c:9552
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/compose.c:9646
+#: src/compose.c:9648
+#, c-format
 msgid ""
 "Could not write the body to file:\n"
 "%s"
@@ -2252,9 +2499,14 @@ msgstr ""
 "無法將信件內容寫入檔案:\n"
 "%s"
 
-#: src/compose.c:9704
+#: src/compose.c:9677
+msgid ""
+"Socket communication with an external editor is not available on Windows."
+msgstr "在Windows系上無法以外部編輯器進行Socket通訊"
+
+#: src/compose.c:9710
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
@@ -2262,34 +2514,41 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/compose.c:9743
-#, c-format
-msgid "External editor stopped with an error:%s"
+#: src/compose.c:9754
+msgid "External editor stopped with an error: %s"
 msgstr "外部編輯圖終止,錯誤碼:%s"
 
-#: src/compose.c:9817
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr "進度 ID: %"
+
+#: src/compose.c:9830
+msgid "process id: %d"
+msgstr "處理資料夾"
+
+#: src/compose.c:9835
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %d"
+"%s"
 msgstr ""
 "外部編輯器正在使用中\n"
 "要強制終止此程序嗎?\n"
 "程序id: %d"
 
-#: src/compose.c:10223 src/messageview.c:1088
+#: src/compose.c:10245 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail 需要網路的存取權才能傳送此郵件"
 
-#: src/compose.c:10425
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10429
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10430
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2297,24 +2556,24 @@ msgstr ""
 "無法儲存為草稿\n"
 "確定要終止離開或放棄此郵件?"
 
-#: src/compose.c:10432
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr "終止離開"
 
-#: src/compose.c:10432
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr "放棄郵件"
 
-#: src/compose.c:10621 src/compose.c:10635
+#: src/compose.c:10646 src/compose.c:10660
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:10649
+#: src/compose.c:10674
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "無法讀取檔案'%s'"
 
-#: src/compose.c:10651
+#: src/compose.c:10676
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2323,50 +2582,58 @@ msgstr ""
 "目前的編碼檔案'%s'包含無效的字元\n"
 "插入可能是無效的"
 
-#: src/compose.c:10728
+#: src/compose.c:10753
 msgid "Discard message"
 msgstr "放棄訊息"
 
-#: src/compose.c:10729
+#: src/compose.c:10754
 msgid "This message has been modified. Discard it?"
 msgstr "此訊息已經被修改過了,要放棄嗎?"
 
-#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr "放棄"
 
-#: src/compose.c:10730 src/compose.c:10735
+#: src/compose.c:10755 src/compose.c:10760
 msgid "_Save to Drafts"
 msgstr "儲存至草稿(_S)"
 
-#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10758 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr "儲存異動"
 
-#: src/compose.c:10734
+#: src/compose.c:10759
 msgid "This message has been modified. Save the latest changes?"
 msgstr "此訊息已經被修改過了,要儲存最後的修改嗎?"
 
-#: src/compose.c:10735
+#: src/compose.c:10760
 msgid "_Don't save"
 msgstr "不要儲存"
 
-#: src/compose.c:10806
+#: src/compose.c:10831
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "確定要使用樣板 '%s'嗎?"
 
-#: src/compose.c:10808
+#: src/compose.c:10833
 msgid "Apply template"
 msgstr "使用樣板"
 
-#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
-#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1018
+#: src/compose.c:10834 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:11694
+#: 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
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2377,20 +2644,20 @@ msgid_plural ""
 msgstr[0] "確定要將此一檔案內容插入至郵件訊息中?還是要將它附加至郵件?"
 msgstr[1] "確定要將%d個檔案的內容插入至郵件訊息中?還是要將它們附加至郵件?"
 
-#: src/compose.c:11700
+#: src/compose.c:11733
 msgid "Insert or attach?"
 msgstr "確定插入或附加檔案?"
 
-#: src/compose.c:11701
+#: src/compose.c:11734
 msgid "_Attach"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:11919
+#: src/compose.c:11949
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "第%d格式有誤"
 
-#: src/compose.c:12215
+#: src/compose.c:12245
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2402,11 +2669,11 @@ msgstr "您企圖回覆%d訊息,開啟視窗可能會花費一些時,確認
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr "Claws Mail 進行 (%ld) 收到信號 %ld"
 
-#: src/crash.c:186
+#: src/crash.c:189
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail 不正常結束"
 
-#: src/crash.c:203
+#: src/crash.c:206
 #, c-format
 msgid ""
 "%s.\n"
@@ -2415,23 +2682,24 @@ msgstr ""
 "%s\n"
 "請提供一個bug通報,包含下列的資訊"
 
-#: src/crash.c:208
+#: src/crash.c:211
 msgid "Debug log"
 msgstr "偵錯log"
 
-#: src/crash.c:252 src/toolbar.c:539
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:550
+#: src/uri_opener.c:226
 msgid "Close"
 msgstr "關閉"
 
-#: src/crash.c:257
+#: src/crash.c:260
 msgid "Save..."
 msgstr "儲存..."
 
-#: src/crash.c:262
+#: src/crash.c:265
 msgid "Create bug report"
 msgstr "產生錯誤報告"
 
-#: src/crash.c:312
+#: src/crash.c:315
 msgid "Save crash information"
 msgstr "儲存崩潰資訊"
 
@@ -2495,11 +2763,11 @@ msgstr "編輯連絡人詳細資料"
 msgid "An Email address must be supplied."
 msgstr "必需提供一個電子郵件地址"
 
-#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:204
 msgid "A Name and Value must be supplied."
 msgstr "必需提供一個名"
 
-#: src/editaddress.c:820 src/prefs_folder_item.c:1784
+#: src/editaddress.c:820 src/prefs_folder_item.c:1827
 msgid "Discard"
 msgstr "放棄"
 
@@ -2507,15 +2775,15 @@ msgstr "放棄"
 msgid "Apply"
 msgstr "指定"
 
-#: src/editaddress.c:851 src/editaddress.c:901
+#: src/editaddress.c:851 src/editaddress.c:902
 msgid "Edit Person Data"
 msgstr "編輯連絡人資料"
 
-#: src/editaddress.c:930
+#: src/editaddress.c:931
 msgid "Choose a picture"
 msgstr "選擇一張照片"
 
-#: src/editaddress.c:949
+#: src/editaddress.c:950
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2524,32 +2792,32 @@ msgstr ""
 "匯入圖片失敗:\n"
 "%s"
 
-#: src/editaddress.c:991
+#: src/editaddress.c:992
 msgid "_Set picture"
 msgstr "設定圖片"
 
-#: src/editaddress.c:992
+#: src/editaddress.c:993
 msgid "_Unset picture"
 msgstr "恢復圖片設定"
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr "照片"
 
-#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
-#: src/exporthtml.c:762 src/ldif.c:747
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:508
+#: src/exporthtml.c:758 src/ldif.c:751
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:759
 msgid "Last Name"
 msgstr "姓"
 
-#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:755
 msgid "First Name"
 msgstr "名"
 
-#: src/editaddress.c:1115 src/editaddress.c:1117
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -2557,25 +2825,25 @@ msgstr "暱稱"
 msgid "Alias"
 msgstr "別名"
 
-#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
-#: src/editaddress_other_attributes_ldap.c:376
-#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
+#: src/editaddress.c:1483 src/editaddress.c:1510 src/editaddress.c:1529
+#: src/editaddress_other_attributes_ldap.c:374
+#: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:217
 msgid "Value"
 msgstr "數值"
 
-#: src/editaddress.c:1594
+#: src/editaddress.c:1597
 msgid "_User Data"
 msgstr "連絡人資料"
 
-#: src/editaddress.c:1595
+#: src/editaddress.c:1598
 msgid "_Email Addresses"
 msgstr "電子郵件地址"
 
-#: src/editaddress.c:1598 src/editaddress.c:1601
+#: src/editaddress.c:1601 src/editaddress.c:1604
 msgid "O_ther Attributes"
 msgstr "其它屬性"
 
-#: src/editaddress.c:1769
+#: src/editaddress.c:1772
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2584,95 +2852,90 @@ msgstr ""
 "儲存圖形檔案失敗 \n"
 "%s"
 
-#: src/editbook.c:109
+#: src/editbook.c:108
 msgid "File appears to be OK."
 msgstr "檔案看來是好的"
 
-#: src/editbook.c:112
+#: src/editbook.c:111
 msgid "File does not appear to be a valid address book format."
 msgstr "檔案看似出現無效的通訊錄格式"
 
-#: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
+#: src/editbook.c:114 src/editjpilot.c:190 src/editvcard.c:97
 msgid "Could not read file."
 msgstr "無法讀取檔案"
 
-#: src/editbook.c:149 src/editbook.c:263
+#: src/editbook.c:147 src/editbook.c:258
 msgid "Edit Addressbook"
 msgstr "編輯通訊錄"
 
-#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
+#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
 msgstr "檢查檔案"
 
-#: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
-#: src/wizard.c:1198 src/wizard.c:1618
+#: 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
 msgid "File"
 msgstr "檔案"
 
-#: src/editbook.c:282
+#: src/editbook.c:277
 msgid "Add New Addressbook"
 msgstr "新增通訊錄"
 
-#: src/editgroup.c:101
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr "需要新增群組名稱"
 
-#: src/editgroup.c:296
-msgid "Edit Group Data"
+#: src/editgroup.c:292
+msgid "Edit group data"
 msgstr "編輯群組資料"
 
-#: src/editgroup.c:326 src/exporthtml.c:598
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "群組名稱"
 
-#: src/editgroup.c:345
-msgid "Addresses in Group"
-msgstr "群組內地址"
-
-#: src/editgroup.c:379
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr "有效的地址"
 
-#: src/editgroup.c:453
-msgid "Move Email Addresses to or from Group with arrow buttons"
-msgstr "用箭號鈕將郵件地址移往或移出群組"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
+msgstr "群組內地址"
 
-#: src/editgroup.c:501
-msgid "Edit Group Details"
+#: src/editgroup.c:494
+msgid "Edit group details"
 msgstr "編輯群組詳細資料"
 
-#: src/editgroup.c:504
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr "新增群組"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr "編輯資料夾"
 
-#: src/editgroup.c:553
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr "輸入新名稱給資料夾"
 
-#: src/editgroup.c:556 src/foldersel.c:573 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: 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
 msgid "New folder"
 msgstr "新增資料夾"
 
-#: src/editgroup.c:557 src/foldersel.c:574 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: 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
 msgid "Input the name of new folder:"
 msgstr "輸入名稱給新資料夾"
 
-#: src/editjpilot.c:188
+#: src/editjpilot.c:187
 msgid "File does not appear to be JPilot format."
 msgstr "檔案無法支援JPilot格式"
 
-#: src/editjpilot.c:200
+#: src/editjpilot.c:199
 msgid "Select JPilot File"
 msgstr "選擇JPilot檔案"
 
-#: src/editjpilot.c:236 src/editjpilot.c:365
+#: src/editjpilot.c:235 src/editjpilot.c:364
 msgid "Edit JPilot Entry"
 msgstr "編輯JPilot進入點"
 
@@ -2680,38 +2943,38 @@ msgstr "編輯JPilot進入點"
 msgid "Additional e-Mail address item(s)"
 msgstr "附加的電子郵件地址項目"
 
-#: src/editjpilot.c:372
+#: src/editjpilot.c:371
 msgid "Add New JPilot Entry"
 msgstr "新增JPilot進入點"
 
-#: src/editldap_basedn.c:153
+#: src/editldap_basedn.c:152
 msgid "Edit LDAP - Select Search Base"
 msgstr "編輯LDAP - 選擇搜尋基準"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
-#: src/prefs_proxy.c:98
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3228
+#: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "主機名稱"
 
-#: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
-#: src/prefs_proxy.c:105 src/ssl_manager.c:117
+#: src/editldap_basedn.c:180 src/editldap.c:456
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3235
+#: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/editldap_basedn.c:193 src/editldap.c:502
+#: src/editldap_basedn.c:189 src/editldap.c:497
 msgid "Search Base"
 msgstr "搜尋基準"
 
-#: src/editldap_basedn.c:221
+#: src/editldap_basedn.c:219
 msgid "Available Search Base(s)"
 msgstr "有效的搜尋基準"
 
-#: src/editldap_basedn.c:327
+#: src/editldap_basedn.c:325
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "無法從伺服器中讀取搜尋基準 - 請手動設定"
 
-#: src/editldap_basedn.c:331 src/editldap.c:281
+#: src/editldap_basedn.c:329 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "無法連線至伺服器"
 
@@ -2731,15 +2994,15 @@ msgstr "至少要提供一個LDAP搜尋基準屬性"
 msgid "Connected successfully to server"
 msgstr "伺服器連線成功"
 
-#: src/editldap.c:335 src/editldap.c:991
+#: src/editldap.c:335 src/editldap.c:974
 msgid "Edit LDAP Server"
 msgstr "編輯LDAP伺器"
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr "要呼叫的伺服器名稱"
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2750,15 +3013,15 @@ msgstr ""
 "以使用IP位址。如果和Claws Mail在同一台電腦上執行LDAP伺服器,可以指定為"
 "\"localhost\"。"
 
-#: src/editldap.c:469
+#: src/editldap.c:467
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:4213
-msgid "SSL/TLS"
+#: src/editldap.c:468 src/prefs_account.c:4227
+msgid "TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:474
+#: src/editldap.c:472
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2768,28 +3031,28 @@ msgstr ""
 "透過STARTTLS可以啟用LDAP伺服器的安全連線機制。若連線失敗,務必檢查ldap.conf檔"
 "案的設定(TLS_CACERTDIR 和 TLS_REQCERT項目)"
 
-#: src/editldap.c:479
+#: src/editldap.c:477
 msgid ""
-"Enable secure connection to the LDAP server via SSL/TLS. If connection "
-"fails, be sure to check the correct configuration in ldap.conf "
-"(TLS_CACERTDIR and TLS_REQCERT fields)."
+"Enable secure connection to the LDAP server via TLS. If connection fails, be "
+"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"TLS_REQCERT fields)."
 msgstr ""
 "透過SSL/TLS可以啟用LDAP伺服器的安全連線機制。若連線失敗,務必檢查ldap.conf檔"
 "案的設定(TLS_CACERTDIR 和 TLS_REQCERT項目)"
 
-#: src/editldap.c:491
+#: src/editldap.c:487
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "這是伺服器的監聽埠,預設通訊埠是389"
 
-#: src/editldap.c:494
+#: src/editldap.c:490
 msgid " Check Server "
 msgstr "檢查伺服器"
 
-#: src/editldap.c:498
+#: src/editldap.c:494
 msgid "Press this button to test the connection to the server."
 msgstr "按下此鍵進行伺服器連線測試"
 
-#: src/editldap.c:511
+#: src/editldap.c:507
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2802,38 +3065,38 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:518
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr "按下此鍵在伺服器上搜尋有效的目錄名稱"
 
-#: src/editldap.c:578
+#: src/editldap.c:572
 msgid "Search Attributes"
 msgstr "搜尋屬性"
 
-#: src/editldap.c:587
+#: src/editldap.c:582
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr "用於搜尋名稱或地址時的LDAP屬性列表"
 
-#: src/editldap.c:590
+#: src/editldap.c:585
 msgid " Defaults "
 msgstr "預設"
 
-#: src/editldap.c:594
+#: src/editldap.c:589
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
 "將重置屬性名稱為預設值,如此可以在搜尋姓名或地址過程中,找到更多的姓名和地址"
 
-#: src/editldap.c:600
+#: src/editldap.c:594
 msgid "Max Query Age (secs)"
 msgstr "最大的搜尋年齡 (secs)"
 
-#: src/editldap.c:614
+#: src/editldap.c:607
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2852,21 +3115,21 @@ msgstr ""
 "少下一次的搜尋時間。此功能對於較慢的伺服器可以提供更多的記憶體來暫存搜搜結"
 "果,進而提高搜尋效能。"
 
-#: src/editldap.c:631
+#: src/editldap.c:623
 msgid "Include server in dynamic search"
 msgstr "動態搜尋包含伺服器"
 
-#: src/editldap.c:636
+#: src/editldap.c:627
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr "當使用地址完成功能時,檢查這個選項以包含動態搜尋"
 
-#: src/editldap.c:642
+#: src/editldap.c:632
 msgid "Match names 'containing' search term"
 msgstr "姓名符合'包含'搜尋項目"
 
-#: src/editldap.c:647
+#: 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\" "
@@ -2878,11 +3141,11 @@ msgstr ""
 "行\"包含\"的搜尋,此法通常會花費較長的時間。特別注意,為了提昇效能,地址自動"
 "完成功能使用\"以...開始\"進行所有搜尋,以取代其它的地址界面"
 
-#: src/editldap.c:710
+#: src/editldap.c:697
 msgid "Bind DN"
 msgstr "綁定 DN"
 
-#: src/editldap.c:719
+#: src/editldap.c:707
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2893,100 +3156,113 @@ msgstr ""
 "的格式一般為 \"cn=user,dc=claws-mail,dc=org\",這個欄位一般建議空白以進行搜"
 "尋。"
 
-#: src/editldap.c:726
+#: src/editldap.c:713
 msgid "Bind Password"
 msgstr "綁定密碼"
 
-#: src/editldap.c:736
+#: src/editldap.c:724
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "以\"Bind DN\"進行連線時,此密碼將被使用"
 
-#: src/editldap.c:739 src/prefs_account.c:1477 src/prefs_account.c:2108
-#: src/prefs_account.c:3041 src/prefs_account.c:3069 src/prefs_account.c:3274
-#: src/prefs_proxy.c:146
+#: 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/prefs_proxy.c:144
 msgid "Show password"
 msgstr "顯示密碼"
 
-#: src/editldap.c:748
+#: src/editldap.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
 msgid "Timeout (secs)"
 msgstr "超時 (secs)"
 
-#: src/editldap.c:761
+#: src/editldap.c:746
 msgid "The timeout period in seconds."
 msgstr "超時的週期 (單位秒)"
 
-#: src/editldap.c:765
+#: src/editldap.c:749
 msgid "Maximum Entries"
 msgstr "最大的登入數量"
 
-#: src/editldap.c:778
+#: src/editldap.c:761
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜尋結果中可以接收的最大登入數量"
 
-#: src/editldap.c:793 src/prefs_account.c:4086
+#: src/editldap.c:776 src/prefs_account.c:4098
 msgid "Basic"
 msgstr "基本"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:703
+#: src/editldap.c:778 src/gtk/quicksearch.c:878
 msgid "Extended"
 msgstr "延伸"
 
-#: src/editldap.c:996
+#: src/editldap.c:979
 msgid "Add New LDAP Server"
 msgstr "新增LDAP伺服器?"
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1403
-#: src/prefs_summaries.c:640
+#: src/edittags.c:135
+msgctxt "Window title"
+msgid "Tags configuration"
+msgstr "樣版設定"
+
+#: src/edittags.c:140
+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
 msgid "Tag"
 msgstr "標籤"
 
-#: src/edittags.c:221
+#: src/edittags.c:232
 msgid "Delete tag"
 msgstr "刪除標籤"
 
-#: src/edittags.c:222
+#: src/edittags.c:233
 msgid "Do you really want to delete this tag?"
 msgstr "確認要刪除標籤?"
 
-#: src/edittags.c:257
+#: src/edittags.c:268
 msgid "Delete all tags"
 msgstr "刪除所有的標籤"
 
-#: src/edittags.c:258
+#: src/edittags.c:269
 msgid "Do you really want to delete all tags?"
 msgstr "確認刪除所有的標籤?"
 
-#: src/edittags.c:430
+#: src/edittags.c:441
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "此標籤名稱是保留的,請選擇另一個"
 
-#: src/edittags.c:472
-msgid "Tag is not set."
-msgstr "沒有設定標籤"
-
-#: src/edittags.c:550
-msgctxt "Dialog title"
-msgid "Apply tags"
-msgstr "指定標籤"
-
-#: src/edittags.c:567
+#: src/edittags.c:572
 msgid "New tag:"
 msgstr "新標籤"
 
-#: src/edittags.c:600
-msgid "Please select tags to apply/remove. Changes are immediate."
-msgstr "請選擇標籤以指定或移除,修改將立即生效。"
+#: src/edittags.c:584
+msgid "Add the new tag"
+msgstr "增加新標籤"
+
+#: src/edittags.c:589
+msgid "Delete the selected tag"
+msgstr "刪除選擇的檔案"
+
+#: src/edittags.c:608
+msgid ""
+"Choose the tag(s) for the message(s).\n"
+"Changes are immediately applied."
+msgstr ""
+"為信件選擇標籤"
+"所有的異動會立即生效"
 
-#: src/editvcard.c:95
+#: src/editvcard.c:94
 msgid "File does not appear to be vCard format."
 msgstr "檔案不是vCard格式"
 
-#: src/editvcard.c:107
+#: src/editvcard.c:106
 msgid "Select vCard File"
 msgstr "選擇vCard檔案"
 
-#: src/editvcard.c:152 src/editvcard.c:257
+#: src/editvcard.c:150 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr "編輯vCard進入點"
 
@@ -2998,11 +3274,11 @@ msgstr "新增vCard進入點"
 msgid "Impossible to set the client certificate.\n"
 msgstr "無法設定客戶端認證\n"
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:950
 msgid "couldn't get xover range\n"
 msgstr "無法取得 xover 的範圍\n"
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1049
 msgid "couldn't get xhdr range\n"
 msgstr "無法取得 xhdr 的範圍\n"
 
@@ -3031,22 +3307,22 @@ msgstr ""
 msgid "Create directory"
 msgstr "建立目錄"
 
-#: src/exphtmldlg.c:189
+#: src/exphtmldlg.c:190
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
 msgstr "無法建立HTML檔案的輸出目錄%s"
 
-#: src/exphtmldlg.c:191 src/expldifdlg.c:201
+#: src/exphtmldlg.c:192 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr "建立目錄失敗"
 
-#: src/exphtmldlg.c:233
+#: src/exphtmldlg.c:235
 msgid "Error creating HTML file"
 msgstr "建立HTML檔案錯誤"
 
-#: src/exphtmldlg.c:319
+#: src/exphtmldlg.c:324
 msgid "Select HTML output file"
 msgstr "選擇HTML輸出檔案"
 
@@ -3054,95 +3330,105 @@ msgstr "選擇HTML輸出檔案"
 msgid "HTML Output File"
 msgstr "HTML輸出檔案"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
-#: src/importldif.c:568
+#: src/exphtmldlg.c:392 src/expldifdlg.c:406 src/export.c:167 src/import.c:166
+#: src/importldif.c:567
 msgid "B_rowse"
 msgstr "瀏覽"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
 msgid "Stylesheet"
 msgstr "樣式"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
-#: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6273
+#: 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
 msgid "None"
 msgstr "無"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
-#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
-#: src/prefs_other.c:129 src/prefs_other.c:417
+#: src/exphtmldlg.c:449 src/prefs_folder_item.c:532
+#: src/prefs_folder_item.c:1240 src/prefs_folder_item.c:1271
+#: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr "預設"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
+#: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "完整"
 
-#: src/exphtmldlg.c:456
+#: src/exphtmldlg.c:451
 msgid "Custom"
 msgstr "自訂"
 
-#: src/exphtmldlg.c:457
+#: src/exphtmldlg.c:452
 msgid "Custom-2"
 msgstr "自訂-2"
 
-#: src/exphtmldlg.c:458
+#: src/exphtmldlg.c:453
 msgid "Custom-3"
 msgstr "自訂-3"
 
-#: src/exphtmldlg.c:459
+#: src/exphtmldlg.c:454
 msgid "Custom-4"
 msgstr "自訂-4"
 
-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:459
 msgid "Full Name Format"
 msgstr "完整姓名格式"
 
-#: src/exphtmldlg.c:474
+#: src/exphtmldlg.c:466
 msgid "First Name, Last Name"
 msgstr "名,姓"
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:467
 msgid "Last Name, First Name"
 msgstr "姓,名"
 
-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:472
 msgid "Color Banding"
 msgstr "指定區域顏色"
 
-#: src/exphtmldlg.c:488
+#: src/exphtmldlg.c:476
 msgid "Format Email Links"
 msgstr "格式化電子郵件超連結"
 
-#: src/exphtmldlg.c:494
+#: src/exphtmldlg.c:480
 msgid "Format User Attributes"
 msgstr "格式化使用者屬性"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
+#: src/exphtmldlg.c:522 src/expldifdlg.c:595 src/importldif.c:839
 msgid "Address Book:"
 msgstr "通訊錄"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
+#: src/exphtmldlg.c:531 src/expldifdlg.c:604 src/importldif.c:848
 msgid "File Name:"
 msgstr "檔案名稱"
 
-#: src/exphtmldlg.c:559
+#: src/exphtmldlg.c:540
 msgid "Open with Web Browser"
 msgstr "以瀏覽器開啟"
 
-#: src/exphtmldlg.c:591
+#: src/exphtmldlg.c:572
 msgid "Export Address Book to HTML File"
 msgstr "將通訊錄匯出為HTML格式檔案"
 
-#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
+#: 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
+msgid "_Previous"
+msgstr "上一個部份"
+
+#: src/exphtmldlg.c:607 src/expldifdlg.c:672 src/importldif.c:924
+#: src/message_search.c:233 src/summary_search.c:490 src/wizard.c:1831
+msgid "_Next"
+msgstr "下一封"
+
+#: src/exphtmldlg.c:638 src/expldifdlg.c:703 src/importldif.c:965
 msgid "File Info"
 msgstr "檔案資訊"
 
-#: src/exphtmldlg.c:658
+#: src/exphtmldlg.c:639
 msgid "Format"
 msgstr "格式"
 
@@ -3190,15 +3476,15 @@ msgstr "LDAP伺服器要求資料必需包含後綴,你確認不修改並繼
 msgid "Error creating LDIF file"
 msgstr "建立LDIF檔案錯誤"
 
-#: src/expldifdlg.c:336
+#: src/expldifdlg.c:338
 msgid "Select LDIF output file"
 msgstr "選擇LDIF的輸出檔案"
 
-#: src/expldifdlg.c:400
+#: src/expldifdlg.c:397
 msgid "LDIF Output File"
 msgstr "LDIF輸出檔案"
 
-#: src/expldifdlg.c:431
+#: src/expldifdlg.c:427
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
@@ -3207,7 +3493,7 @@ msgstr ""
 "此通訊錄的唯一識別ID是用來產生DN,此DN的格式近似於:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:433
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3216,7 +3502,7 @@ msgstr ""
 "此通訊錄的顯示名稱是用來產生DN,此DN的格式近似於:\n"
 "  cn=John Doe,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:443
+#: src/expldifdlg.c:439
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3225,11 +3511,11 @@ msgstr ""
 "第一個屬於個人的郵件地址用來產生DN,此DN的格式近似於:\n"
 "  mail=john.doe at domain.com,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:489
+#: src/expldifdlg.c:483
 msgid "Suffix"
 msgstr "後綴"
 
-#: src/expldifdlg.c:499
+#: src/expldifdlg.c:493
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3242,15 +3528,15 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/expldifdlg.c:507
+#: src/expldifdlg.c:500
 msgid "Relative DN"
 msgstr "Relative DN"
 
-#: src/expldifdlg.c:515
+#: src/expldifdlg.c:507
 msgid "Unique ID"
 msgstr "唯一的 ID"
 
-#: src/expldifdlg.c:523
+#: src/expldifdlg.c:514
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3263,11 +3549,11 @@ msgstr ""
 "RDN(\"Relative Distinguished Name\")加上後綴請選擇其中一個有效的 RDN 選項,以"
 "新建一個 DN"
 
-#: src/expldifdlg.c:543
+#: src/expldifdlg.c:531
 msgid "Use DN attribute if present in data"
 msgstr "若資訊中出現,則使用 DN 屬性"
 
-#: src/expldifdlg.c:548
+#: src/expldifdlg.c:535
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3278,86 +3564,86 @@ msgstr ""
 "性,則可能被用來匯出至 LDIF 檔。如果 DN 使用者屬性不存在,則上面所選擇的 RDN "
 "將會被使用。"
 
-#: src/expldifdlg.c:558
+#: src/expldifdlg.c:544
 msgid "Exclude record if no Email Address"
 msgstr "若沒有郵件地址,將被不被記錄"
 
-#: src/expldifdlg.c:563
+#: src/expldifdlg.c:548
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
 msgstr "通訊錄沒有包含郵件地址,請檢查這個選項以忽略這些記錄"
 
-#: src/expldifdlg.c:655
+#: src/expldifdlg.c:637
 msgid "Export Address Book to LDIF File"
 msgstr "匯出通訊錄至 LDIF 檔"
 
-#: src/expldifdlg.c:722
+#: src/expldifdlg.c:704
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8486
+#: src/export.c:112 src/summaryview.c:8489
 msgid "Export to mbox file"
 msgstr "匯出至 mbox 檔案"
 
-#: src/export.c:132
+#: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
 msgstr "指定匯出資料夾和 mbox 檔案名稱"
 
-#: src/export.c:143
+#: src/export.c:142
 msgid "Source folder:"
 msgstr "來源資料夾"
 
-#: src/export.c:149 src/import.c:143
+#: src/export.c:146 src/import.c:142
 msgid "Mbox file:"
 msgstr "Mbox 檔案:"
 
-#: src/export.c:205
+#: src/export.c:198
 msgid "Target mbox filename can't be left empty."
 msgstr "未指定目的 mbox 名稱"
 
-#: src/export.c:210
+#: src/export.c:203
 msgid "Source folder can't be left empty."
 msgstr "未指定來源資料夾"
 
-#: src/export.c:223
+#: src/export.c:216
 msgid "Couldn't find the source folder."
 msgstr "找不到來源資料夾"
 
-#: src/export.c:247
+#: src/export.c:240
 msgid "Select exporting file"
 msgstr "選擇匯出檔案"
 
-#: src/export.c:270
+#: src/export.c:263
 msgid "Select folder to export"
 msgstr "選擇匯出資料夾"
 
-#: src/exporthtml.c:768
+#: src/exporthtml.c:764
 msgid "Full Name"
 msgstr "全名"
 
-#: src/exporthtml.c:772 src/importldif.c:981
+#: src/exporthtml.c:768 src/importldif.c:966
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "屬性"
 
-#: src/exporthtml.c:975
+#: src/exporthtml.c:971
 msgid "Claws Mail Address Book"
 msgstr "Claws Mail 通訊錄"
 
-#: src/exporthtml.c:1070 src/exportldif.c:607
+#: src/exporthtml.c:1066 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "名稱已存在,但是它不是一個目錄"
 
-#: src/exporthtml.c:1073 src/exportldif.c:610
+#: src/exporthtml.c:1069 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "沒有建立目錄的權限"
 
-#: src/exporthtml.c:1076 src/exportldif.c:613
+#: src/exporthtml.c:1072 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "名稱太長"
 
-#: src/exporthtml.c:1079 src/exportldif.c:616
+#: src/exporthtml.c:1075 src/exportldif.c:616
 msgid "Not specified."
 msgstr "未指定"
 
@@ -3378,11 +3664,17 @@ msgid ""
 "%s?"
 msgstr "檔案 %s 是空白的或已經損毀!確認要用使用來自%s的備份檔案嗎?"
 
-#: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr "這不是一個以帳號為基準的規則\n"
 
-#: src/filtering.c:607
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr "這是一個以帳號為基準的規則,但是不符合用來作為取回郵件的帳號\n"
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
@@ -3391,19 +3683,19 @@ msgstr ""
 "這是一個以帳號為基準的規則 [id=%d, name='%s'],且符合用來作為目前取回郵件的帳"
 "號\n"
 
-#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
-#: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
-#: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr "不存在(_E)"
 
-#: src/filtering.c:617
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr "這是一個以帳號為基準的規則,但是不符合用來作為取回郵件的帳號\n"
 
-#: src/filtering.c:624
+#: src/filtering.c:639
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
@@ -3412,110 +3704,117 @@ msgstr ""
 "這是一個以帳號為基準的規則 [id=%d, name='%s'],但是不符合目前用來作為取回郵件"
 "的帳號 [id=%d, name='%s']\n"
 
-#: src/filtering.c:643
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr "這不是一個以帳號為基準的規則,所有的規則將被使用在使用者需求上\n"
 
-#: src/filtering.c:649
-#, c-format
+#: src/filtering.c:665
+msgid ""
+"rule is account-based, but all rules are applied on user request anyway\n"
+msgstr "這不是一個以帳號為基準的規則,所有的規則將被使用在使用者需求上\n"
+
+#: src/filtering.c:673
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
 msgstr ""
 "這是一個以帳號為基準的規則 [id=%d, name='%s'],但所有的規則將被使用在使用者請"
 "求上\n"
 
-#: src/filtering.c:667
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "這是一個以帳號為基準的規則,將跳過使用者請求\n"
+
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr "這是一個以帳號為基準的規則 [id=%d, name='%s'],將跳過使用者請求\n"
 
-#: src/filtering.c:672
-msgid "rule is account-based, skipped on user request\n"
-msgstr "這是一個以帳號為基準的規則,將跳過使用者請求\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
+msgstr "這是一個以帳號為基準的規則,但是不符合目前帳號\n"
 
-#: src/filtering.c:694
-#, c-format
+#: src/filtering.c:736
 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
 "這是一個以帳號為基準的規則 [id=%d, name='%s'],但是不符合目前郵件帳號 [id="
 "%d, name='%s']\n"
 
-#: src/filtering.c:700
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr "這是一個以帳號為基準的規則,但是不符合目前帳號\n"
 
-#: src/filtering.c:712
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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"
+"這是一個以帳號為基準的規則 [id=%d, name='%s'],但是不符合目前郵件帳號 [id="
+"%d, name='%s']\n"
 
-#: src/filtering.c:752
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr "套用動作 [ %s ]\n"
 
-#: src/filtering.c:757
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr "無法套用此動作\n"
 
-#: src/filtering.c:759
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr "此動作 [ %s ] 套用後沒有其它的處理程序\n"
 
-#: src/filtering.c:820
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "套用規則 '%s' [ %s ]\n"
 
-#: src/filtering.c:824
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "套用規則 <unnamed> [ %s ]\n"
 
-#: src/filtering.c:842
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "關閉規則 '%s' [ %s ]\n"
 
-#: src/filtering.c:846
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "關閉規則 <unnamed> [ %s ]\n"
 
-#: src/filtering.c:884
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr "未確定的"
 
-#: src/filtering.c:888
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr "結合"
 
-#: src/filtering.c:892
+#: src/filtering.c:935
 msgid "manually"
 msgstr "手動地"
 
-#: src/filtering.c:896
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr "資料夾處理中"
 
-#: src/filtering.c:900
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr "前處理"
 
-#: src/filtering.c:904
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr "後處理"
 
-#: src/filtering.c:919
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3532,11 +3831,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:921 src/filtering.c:930
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:928
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3545,279 +3844,279 @@ msgstr ""
 "郵件過濾中 (%s%s%s)\n"
 "%s郵件檔案: %s\n"
 
-#: src/folder.c:1595 src/prefs_folder_item.c:319
+#: src/folder.c:1596 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/folder.c:1599
+#: src/folder.c:1600
 msgid "Sent"
 msgstr "已傳送"
 
-#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:322
+#: 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 "暫存"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:323
+#: src/folder.c:1608 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "回收桶"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:321
+#: src/folder.c:1612 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/folder.c:2042
+#: src/folder.c:2043
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "處理 (%s)...\n"
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "正在複製 %s 到 %s...\n"
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "正在移動 %s 到 %s...\n"
 
-#: src/folder.c:3604
+#: src/folder.c:3613
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在為 %s 更新緩衝..."
 
-#: src/folder.c:4466
+#: src/folder.c:4478
 msgid "Processing messages..."
 msgstr "郵件處理..."
 
-#: src/folder.c:4601
+#: src/folder.c:4613
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "離線同步化 %s ...\n"
 
-#: src/folder.c:4860
+#: src/folder.c:4872
 msgid "A folder name cannot begin or end with a dot."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
-#: src/folder.c:4864
+#: src/folder.c:4876
 msgid "A folder name can not end with a space."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
-#: src/foldersel.c:251
+#: src/foldersel.c:252
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:575 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: 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
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:576 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
 msgstr "從上層資料夾繼承屬性並處理"
 
-#: src/foldersel.c:586 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
-#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2068
+#: 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
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' 不能被包含在資料夾名稱內"
 
-#: src/foldersel.c:601 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
-#: src/plugins/vcalendar/vcal_folder.c:2075
+#: 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
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "資料夾 '%s' 已經存在"
 
-#: src/foldersel.c:608 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:125
+#: 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
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "無法建立資料夾 '%s'"
 
-#: src/folderview.c:247
+#: src/folderview.c:248
 msgid "Mark all re_ad"
 msgstr "標示所有為已讀(_a)"
 
-#: src/folderview.c:248
+#: src/folderview.c:249
 msgid "Mark all u_nread"
 msgstr "標記所有為未讀(_n)"
 
-#: src/folderview.c:249
+#: src/folderview.c:250
 msgid "Mark all read recursi_vely"
 msgstr "遞迴地標示所有為已讀(_v)"
 
-#: src/folderview.c:250
+#: src/folderview.c:251
 msgid "Mark all unread recursi_vely"
 msgstr "遞迴地標示所有為未讀(_v)"
 
-#: src/folderview.c:252
+#: src/folderview.c:253
 msgid "R_un processing rules"
 msgstr "立即執行規則(u)"
 
-#: src/folderview.c:253 src/mainwindow.c:562
+#: src/folderview.c:254 src/mainwindow.c:555
 msgid "_Search folder..."
 msgstr "搜尋資料夾(_S)..."
 
-#: src/folderview.c:255
+#: src/folderview.c:256
 msgid "Process_ing..."
 msgstr "處理(_i)..."
 
-#: src/folderview.c:256
+#: src/folderview.c:257
 msgid "Empty _trash..."
 msgstr "清空回收桶(_t)..."
 
-#: src/folderview.c:257
+#: src/folderview.c:258
 msgid "Send _queue..."
 msgstr "傳送暫存郵件(_q)..."
 
-#: src/folderview.c:264
+#: src/folderview.c:265
 msgid "Set Displayed columns"
 msgstr "設定已顯示行數"
 
-#: src/folderview.c:403 src/folderview.c:450
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
 msgid "New"
 msgstr "新郵件"
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:405 src/folderview.c:452
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
-#: src/toolbar.c:512
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/toolbar.c:522
 msgid "Unread"
 msgstr "未讀郵件"
 
-#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:406 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:453 src/summaryview.c:473
+#: src/folderview.c:454 src/summaryview.c:469
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:783
+#: src/folderview.c:785
 msgid "Setting folder info..."
 msgstr "設定資料夾訊息..."
 
-#: src/folderview.c:868 src/summaryview.c:4291
+#: src/folderview.c:870 src/summaryview.c:4272
 msgid "Mark all as read"
 msgstr "將所有的郵件標示為已讀"
 
-#: src/folderview.c:869
+#: src/folderview.c:871
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:871 src/summaryview.c:4292
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "確定要將此資料內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:874 src/summaryview.c:4337
+#: src/folderview.c:876 src/summaryview.c:4318
 msgid "Mark all as unread"
 msgstr "將所有的郵件標示為未讀"
 
-#: src/folderview.c:875
+#: src/folderview.c:877
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:877 src/summaryview.c:4338
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "確定要將此資料內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:1067 src/imap.c:4686
+#: src/folderview.c:1075 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "掃描資料夾 %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4707 src/mainwindow.c:5268 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "掃描資料夾 %s..."
 
-#: src/folderview.c:1101
+#: src/folderview.c:1109
 msgid "Rebuild folder tree"
 msgstr "重建資料夾串列"
 
-#: src/folderview.c:1102
+#: src/folderview.c:1110
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "重建資料夾串列將移除本地的暫存資料,確定要繼續嗎?"
 
-#: src/folderview.c:1112
+#: src/folderview.c:1120
 msgid "Rebuilding folder tree..."
 msgstr "資料夾串列重建..."
 
-#: src/folderview.c:1114
+#: src/folderview.c:1122
 msgid "Scanning folder tree..."
 msgstr "資料夾串列掃描..."
 
-#: src/folderview.c:1205
+#: src/folderview.c:1212
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "無法掃描資料夾 %s\n"
 
-#: src/folderview.c:1259
+#: src/folderview.c:1266
 msgid "Checking for new messages in all folders..."
 msgstr "在所有資料夾內檢查新郵件..."
 
-#: src/folderview.c:2233
+#: src/folderview.c:2235
 #, c-format
 msgid "Closing folder %s..."
 msgstr "關閉資料夾 %s..."
 
-#: src/folderview.c:2328
+#: src/folderview.c:2337
 #, c-format
 msgid "Opening folder %s..."
 msgstr "開啟 %s..."
 
-#: src/folderview.c:2346
+#: src/folderview.c:2355
 msgid "Folder could not be opened."
 msgstr "資料夾無法開啟"
 
-#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
+#: src/folderview.c:2495 src/mainwindow.c:2868 src/mainwindow.c:2873
 msgid "Empty trash"
 msgstr "清空回收桶"
 
-#: src/folderview.c:2487
+#: src/folderview.c:2496
 msgid "Delete all messages in trash?"
 msgstr "刪除所以回收桶內的郵件"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2497
 msgid "_Empty trash"
 msgstr "清空回收桶(_E)"
 
-#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
+#: src/folderview.c:2541 src/inc.c:1674 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr "離線警告"
 
-#: src/folderview.c:2533 src/toolbar.c:3033
+#: src/folderview.c:2542 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr "目前為離線模式,要覆寫嗎?"
 
-#: src/folderview.c:2544 src/toolbar.c:3052
+#: src/folderview.c:2553 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr "傳送暫存郵件"
 
-#: src/folderview.c:2545 src/toolbar.c:3053
+#: src/folderview.c:2554 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr "傳送所有暫存郵件?"
 
-#: src/folderview.c:2554 src/toolbar.c:3072
+#: src/folderview.c:2563 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr "傳送暫存郵件時發生一些錯誤"
 
-#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
+#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3826,136 +4125,140 @@ msgstr ""
 "傳送暫存郵件時發生一些錯誤:\n"
 "%s"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2647
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "確認要複製資料夾 '%s' 嗎?(從'%s'內)"
 
-#: src/folderview.c:2633
+#: src/folderview.c:2648
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "確認要將資料夾 '%s' 變為 '%s' 的子資料夾嗎?"
 
-#: src/folderview.c:2635
+#: src/folderview.c:2650
 msgid "Copy folder"
 msgstr "複製資料夾"
 
-#: src/folderview.c:2635
+#: src/folderview.c:2650
 msgid "Move folder"
 msgstr "移動資料夾"
 
-#: src/folderview.c:2646
+#: src/folderview.c:2661
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "從 %s 複製到 %s ..."
 
-#: src/folderview.c:2646
+#: src/folderview.c:2661
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "從 %s 移動到 %s ..."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2695
 msgid "Source and destination are the same."
 msgstr "來源和目的相同"
 
-#: src/folderview.c:2683
+#: src/folderview.c:2698
 msgid "Can't copy a folder to one of its children."
 msgstr "不能將資料夾複製到它的子目錄內"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2699
 msgid "Can't move a folder to one of its children."
 msgstr "不能將資料夾移動到它的子目錄內"
 
-#: src/folderview.c:2687
+#: src/folderview.c:2702
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "資料夾無法在兩個不同的郵件資料夾間移動"
 
-#: src/folderview.c:2690
+#: src/folderview.c:2705
 msgid "Copy failed!"
 msgstr "複製失敗"
 
-#: src/folderview.c:2690
+#: src/folderview.c:2705
 msgid "Move failed!"
 msgstr "移動失敗"
 
-#: src/folderview.c:2740
+#: src/folderview.c:2755
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "進行資料夾 %s 配置"
 
-#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
+#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
 msgid "The destination folder can only be used to store subfolders."
 msgstr "目的資料夾只能被用來儲存子資料夾"
 
-#: src/grouplistdialog.c:161
+#: src/grouplistdialog.c:158
 msgid "Newsgroup subscription"
 msgstr "訂閱新聞群組"
 
-#: src/grouplistdialog.c:178
+#: src/grouplistdialog.c:175
 msgid "Select newsgroups for subscription:"
 msgstr "選擇要訂閱的新聞群組"
 
-#: src/grouplistdialog.c:184
+#: src/grouplistdialog.c:189
 msgid "Find groups:"
 msgstr "尋找群組:"
 
-#: src/grouplistdialog.c:192
+#: src/grouplistdialog.c:198
 msgid " Search "
 msgstr " 搜尋 "
 
-#: src/grouplistdialog.c:204
+#: src/grouplistdialog.c:212
 msgid "Newsgroup name"
 msgstr "新聞群組名稱"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:188
+#: src/grouplistdialog.c:213 src/prefs_send.c:188
 msgid "Messages"
 msgstr "郵件"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:304
 msgid "Type"
 msgstr "型式"
 
-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:236
+msgid "_Refresh"
+msgstr "更新"
+
+#: src/grouplistdialog.c:354
 msgid "moderated"
 msgstr "合適的"
 
-#: src/grouplistdialog.c:348
-msgid "readonly"
+#: src/grouplistdialog.c:356
+msgid "read-only"
 msgstr "唯讀的"
 
-#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: 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
 msgid "unknown"
 msgstr "未知的"
 
-#: src/grouplistdialog.c:424
+#: src/grouplistdialog.c:433
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得新聞群組清單"
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr "完成"
 
-#: src/grouplistdialog.c:494
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "新聞群組 %d 接收完成 (%s 讀取)"
 
-#: src/gtk/about.c:133
+#: src/gtk/about.c:134
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr "Claws Mail 是輕量化、快速且高度自由配置的電子郵件客戶端軟體"
 
-#: src/gtk/about.c:136
+#: src/gtk/about.c:137
 msgid "For further information visit the Claws Mail website:"
 msgstr "參閱 Claws Mail 官網以取得更詳細的資訊"
 
-#: src/gtk/about.c:141
+#: src/gtk/about.c:142
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr "更多的支援和討論,請訂閱 Claws Mail 使用者 mail list:"
 
-#: src/gtk/about.c:147
+#: src/gtk/about.c:148
 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:"
@@ -3963,9 +4266,9 @@ msgstr ""
 "Claws Mail 是自由軟體並遵循GPL規範釋出。若希望贊助 Claws Mail 專案,可以如"
 "下:"
 
-#: src/gtk/about.c:163 src/gtk/about.c:852
+#: src/gtk/about.c:164 src/gtk/about.c:871
 msgid ""
-"Copyright (C) 1999-2021\n"
+"Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -3973,11 +4276,11 @@ msgstr ""
 "Claws Mail 團隊及\n"
 "Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:169
 msgid "System Information\n"
 msgstr "系統資訊\n"
 
-#: src/gtk/about.c:174
+#: src/gtk/about.c:175
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -3986,7 +4289,7 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: %s %s (%s)"
 
-#: src/gtk/about.c:183
+#: src/gtk/about.c:185
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -3995,7 +4298,7 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: %s"
 
-#: src/gtk/about.c:192
+#: src/gtk/about.c:195
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -4004,94 +4307,99 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: 不明"
 
-#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
+#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Claws Mail 團隊"
 
-#: src/gtk/about.c:267
+#: src/gtk/about.c:273
 msgid "Previous team members"
 msgstr "早期團隊成員"
 
-#: src/gtk/about.c:286
+#: src/gtk/about.c:292
 msgid "The translation team"
 msgstr "翻譯團隊"
 
-#: src/gtk/about.c:305
+#: src/gtk/about.c:311
 msgid "Documentation team"
 msgstr "文件團隊"
 
-#: src/gtk/about.c:323
+#: src/gtk/about.c:329
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:342
+#: src/gtk/about.c:348
 msgid "Icons"
 msgstr "Icons"
 
-#: src/gtk/about.c:361
+#: src/gtk/about.c:367
 msgid "Contributors"
 msgstr "捐助者"
 
-#: src/gtk/about.c:409
+#: src/gtk/about.c:416
 msgid "Compiled-in Features"
 msgstr "內鍵功能"
 
-#: src/gtk/about.c:426
+#: src/gtk/about.c:433
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "為 X-Face header 加入支援\n"
 
-#: src/gtk/about.c:436
+#: src/gtk/about.c:443
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "為拼字檢查加入支援\n"
 
-#: src/gtk/about.c:446
+#: src/gtk/about.c:453
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "新增加密連線至伺服器的支援\n"
 
-#: src/gtk/about.c:456
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "新增支援 IPv6 位址,這是新的網際網路位址協定\n"
-
-#: src/gtk/about.c:467
+#: src/gtk/about.c:463
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "允許在不同的字元編碼間相互轉換\n"
 
-#: src/gtk/about.c:477
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "新增對 PalmOS 通訊錄的支援\n"
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "新增對 PalmOS 通訊錄的支援\n"
 
-#: src/gtk/about.c:487
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "新增對 LDAP 分享式通訊錄的支援\n"
 
-#: src/gtk/about.c:497
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "新增對 IMAP 及 NNTP 伺服器的支援\n"
 
-#: src/gtk/about.c:507
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "新增支援 SVG 主題功能\n"
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "新增對通訊處理(session handling)的支援\n"
 
-#: src/gtk/about.c:517
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "新增對網路連線改變的偵測支援\n"
 
-#: src/gtk/about.c:527
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "新增支援 SVG 主題功能\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "為拼字檢查加入支援\n"
 
-#: src/gtk/about.c:559
+#: src/gtk/about.c:576
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4100,7 +4408,7 @@ msgstr ""
 "此程式是自由軟體,你可以在遵循 GNU General Public License 的規範下重製、修改"
 "並自由的發佈,包括第3版或任何更新的版本。"
 
-#: src/gtk/about.c:566
+#: src/gtk/about.c:583
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4110,7 +4418,7 @@ msgstr ""
 "此程式的發佈希望是有用的,但是沒有任何的保固,對於銷售或特定的目的也一樣沒有"
 "任何的保固詳細參閱 GNU General Public License"
 
-#: src/gtk/about.c:585
+#: src/gtk/about.c:601
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4118,148 +4426,156 @@ msgstr ""
 "你將會伴隨此程式收到一份 GNU General Public License 的複本,如果沒有收到,請"
 "參閱"
 
-#: src/gtk/about.c:718 src/main.c:2710
+#: src/gtk/about.c:736 src/main.c:2746
 msgid "Session statistics\n"
 msgstr "通信統計\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr "開始於: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2729
+#: src/gtk/about.c:756 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr "收件傳輸量\n"
 
-#: src/gtk/about.c:741 src/main.c:2732
+#: src/gtk/about.c:759 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "已接收郵件: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2738
+#: src/gtk/about.c:766 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr "外寄傳輸量\n"
 
-#: src/gtk/about.c:751 src/main.c:2741
+#: src/gtk/about.c:769 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "新/改寄的郵件: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2745
+#: src/gtk/about.c:774 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "回覆的郵件: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2749
+#: src/gtk/about.c:779 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "轉寄的郵件: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2753
+#: src/gtk/about.c:784 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "所有寄出的郵件: %d\n"
 
-#: src/gtk/about.c:793
+#: src/gtk/about.c:811
 msgid "About Claws Mail"
 msgstr "關於 Claws Mail"
 
-#: src/gtk/about.c:866
+#: src/gtk/about.c:886
 msgid "_Info"
 msgstr "資訊(_I)"
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:892
 msgid "_Authors"
 msgstr "作者群(_A)"
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:898
 msgid "_Features"
 msgstr "功能(_F)"
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:904
 msgid "_License"
 msgstr "許可(_L)"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:912
 msgid "_Release Notes"
 msgstr "釋出記錄(_R)"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:918
 msgid "_Statistics"
 msgstr "統計(_S)"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
 msgid "Orange"
 msgstr "橙"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
 msgid "Red"
 msgstr "紅"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
 msgid "Pink"
 msgstr "粉紅"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
 msgid "Sky blue"
 msgstr "天空藍"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
 msgid "Blue"
 msgstr "藍"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
 msgid "Green"
 msgstr "綠"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
 msgid "Brown"
 msgstr "棕"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
 msgid "Grey"
 msgstr "灰"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
 msgid "Light brown"
 msgstr "淡藍"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
 msgid "Dark red"
 msgstr "深紅"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
 msgid "Dark pink"
 msgstr "深粉紅"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
 msgid "Steel blue"
 msgstr "金屬藍"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
 msgid "Gold"
 msgstr "金"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
 msgid "Bright green"
 msgstr "亮綠"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
 msgid "Magenta"
 msgstr "洋紅"
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:230
 msgid "Set mailbox order"
 msgstr "設定郵件箱順序"
 
-#: src/gtk/foldersort.c:277
+#: src/gtk/foldersort.c:266
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr "往上或往下改變郵件箱在資料夾清單內的順序"
 
-#: src/gtk/foldersort.c:311
+#: src/gtk/foldersort.c:300
 msgid "Mailboxes"
 msgstr "郵件箱"
 
+#: src/gtk/foldersort.c:316
+msgid "Move the selected mailbox up"
+msgstr "將選擇的動作上移"
+
+#: src/gtk/foldersort.c:322
+msgid "Move the selected mailbox down"
+msgstr "向下移動選擇的規則"
+
 #: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr "尚未選擇字典"
@@ -4278,74 +4594,74 @@ msgstr "無法初始化魔法經紀人(Enchant broker)"
 msgid "Couldn't initialize %s dictionary:"
 msgstr "無法初始化 %s 字典:"
 
-#: src/gtk/gtkaspell.c:1070
+#: src/gtk/gtkaspell.c:1067
 msgid "No misspelled word found."
 msgstr "沒有拼錯的字"
 
-#: src/gtk/gtkaspell.c:1451
+#: src/gtk/gtkaspell.c:1443
 msgid "Replace unknown word"
 msgstr "取代未知的單字"
 
-#: src/gtk/gtkaspell.c:1467
+#: src/gtk/gtkaspell.c:1459
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "以...取代\"%s\""
 
-#: src/gtk/gtkaspell.c:1510
+#: src/gtk/gtkaspell.c:1504
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr "按下 Enter 鍵時保持控制鍵將會從錯誤的地方進行學習\n"
 
-#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1801 src/gtk/gtkaspell.c:1938
 msgid "More..."
 msgstr "更多..."
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1857
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" 在字典中找不到 '%s'"
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1872
 msgid "Accept in this session"
 msgstr "此次接受"
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1882
 msgid "Add to personal dictionary"
 msgstr "新增至個人字典"
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1892
 msgid "Replace with..."
 msgstr "以...取代"
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1905
 #, c-format
 msgid "Check with %s"
 msgstr "用 %s 檢查"
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1927
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2001
 #, c-format
 msgid "Dictionary: %s"
 msgstr "字典: %s"
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2015
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "使用替換 (%s)"
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2026
 msgid "Use both dictionaries"
 msgstr "使用兩個字典"
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2042 src/prefs_spelling.c:130
 msgid "Check while typing"
 msgstr "輸⼊時檢查"
 
-#: src/gtk/gtkaspell.c:2154
+#: src/gtk/gtkaspell.c:2124
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4354,7 +4670,7 @@ msgstr ""
 "這個拼字檢查器無法改變字典\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2210
+#: src/gtk/gtkaspell.c:2180
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4363,26 +4679,26 @@ msgstr ""
 "這個拼字檢查器無法改變替換的字典\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1743
 msgid "Failed: no service record found."
 msgstr "失敗: 找不到服務記錄"
 
-#: src/gtk/gtkutils.c:1871
+#: src/gtk/gtkutils.c:1746
 msgid "Failed: network error."
 msgstr "失敗: 網路錯誤"
 
-#: src/gtk/gtkutils.c:1874
+#: src/gtk/gtkutils.c:1749
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "未知的錯誤(%d)"
 
-#: src/gtk/gtkutils.c:1944
+#: src/gtk/gtkutils.c:1819
 msgid "Configuring..."
 msgstr "配置..."
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr "日期"
 
@@ -4390,13 +4706,14 @@ msgstr "日期"
 msgid "Date:"
 msgstr "日期:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
-#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: 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/summaryview.c:465
 msgid "From"
 msgstr "寄件者"
 
-#: src/gtk/headers.h:10 src/summary_search.c:415
+#: src/gtk/headers.h:10 src/summary_search.c:423
 msgid "From:"
 msgstr "寄件者:"
 
@@ -4412,14 +4729,15 @@ msgstr "寄件者:"
 msgid "Reply-To"
 msgstr "回覆給"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
-#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: 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/summaryview.c:466
 msgid "To"
 msgstr "收件者"
 
 #: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
-#: src/prefs_matcher.c:2216 src/quote_fmt.c:58
+#: src/prefs_matcher.c:2217 src/quote_fmt.c:57
 msgid "Cc"
 msgstr "副本"
 
@@ -4428,7 +4746,7 @@ msgid "Bcc"
 msgstr "密件副本"
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
-#: src/prefs_matcher.c:2218 src/quote_fmt.c:61
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:60
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4441,7 +4759,7 @@ msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
 #: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
-#: src/prefs_matcher.c:2220 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2221 src/quote_fmt.c:59
 msgid "References"
 msgstr "索引"
 
@@ -4449,18 +4767,19 @@ msgstr "索引"
 msgid "References:"
 msgstr "索引:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
-#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: 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/summaryview.c:464
 msgid "Subject"
 msgstr "主旨"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
-#: src/summary_search.c:429
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/summary_search.c:435
 msgid "Subject:"
 msgstr "主旨:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
 msgid "Comments"
 msgstr "註解"
 
@@ -4472,7 +4791,7 @@ msgstr "註解:"
 msgid "Keywords"
 msgstr "關鍵字"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:711
 msgid "Keywords:"
 msgstr "關鍵字:"
 
@@ -4549,7 +4868,7 @@ msgid "Received:"
 msgstr "已接收:"
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
-#: src/prefs_matcher.c:2219 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr "新聞群組"
 
@@ -4573,10 +4892,10 @@ msgstr "已見"
 msgid "Seen:"
 msgstr "已見:"
 
-#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:642
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
-#: src/summaryview.c:2898
+#: 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/summaryview.c:2894
 msgid "Status"
 msgstr "狀態"
 
@@ -4620,7 +4939,7 @@ msgstr "代理人:"
 msgid "Content-Type"
 msgstr "內容種類"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:346
+#: src/gtk/headers.h:42 src/image_viewer.c:338
 msgid "Content-Type:"
 msgstr "內容種類:"
 
@@ -4648,7 +4967,7 @@ msgstr "優先權"
 msgid "Precedence:"
 msgstr "優先權:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1265
 msgid "Organization"
 msgstr "組織"
 
@@ -4776,148 +5095,148 @@ msgstr "寄件者,收件者或主旨"
 msgid "From, To or Subject:"
 msgstr "寄件者,收件者或主旨"
 
-#: src/gtk/icon_legend.c:67
+#: src/gtk/icon_legend.c:66
 msgid "New message"
 msgstr "新郵件"
 
-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:67
 msgid "Unread message"
 msgstr "未讀郵件"
 
-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:68
 msgid "Message has been replied to"
 msgstr "郵件已經回覆"
 
-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:69
 msgid "Message has been forwarded"
 msgstr "郵件已經轉發"
 
-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded and replied to"
 msgstr "郵件已經轉發或回覆"
 
-#: src/gtk/icon_legend.c:72
+#: src/gtk/icon_legend.c:71
 msgid "Message is in an ignored thread"
 msgstr "郵件正在被忽略的串列中"
 
-#: src/gtk/icon_legend.c:73
+#: src/gtk/icon_legend.c:72
 msgid "Message is in a watched thread"
 msgstr "郵件正在被關注的串列中"
 
-#: src/gtk/icon_legend.c:74
+#: src/gtk/icon_legend.c:73
 msgid "Message is spam"
 msgstr "此為垃圾郵件"
 
-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:75
 msgid "Message has attachment(s)"
 msgstr "郵件已成為附加檔"
 
-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:76
 msgid "Digitally signed message"
 msgstr "數位簽署郵件"
 
-#: src/gtk/icon_legend.c:78
+#: src/gtk/icon_legend.c:77
 msgid "Encrypted message"
 msgstr "加密郵件"
 
-#: src/gtk/icon_legend.c:79
+#: src/gtk/icon_legend.c:78
 msgid "Message is signed and has attachment(s)"
 msgstr "郵件已簽署同時加入附加檔案中"
 
-#: src/gtk/icon_legend.c:80
+#: src/gtk/icon_legend.c:79
 msgid "Message is encrypted and has attachment(s)"
 msgstr "郵件已加密同時加入附加檔案中"
 
-#: src/gtk/icon_legend.c:82
+#: src/gtk/icon_legend.c:81
 msgid "Marked message"
 msgstr "郵件已標示"
 
-#: src/gtk/icon_legend.c:83
+#: src/gtk/icon_legend.c:82
 msgid "Message is marked for deletion"
 msgstr "郵件已標示為將刪除"
 
-#: src/gtk/icon_legend.c:84
+#: src/gtk/icon_legend.c:83
 msgid "Message is marked for moving"
 msgstr "郵件已標示為將移動"
 
-#: src/gtk/icon_legend.c:85
+#: src/gtk/icon_legend.c:84
 msgid "Message is marked for copying"
 msgstr "郵件已標示為將複製"
 
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:86
 msgid "Locked message"
 msgstr "郵件已上鎖"
 
-#: src/gtk/icon_legend.c:89
+#: src/gtk/icon_legend.c:88
 msgid "Folder (normal, opened)"
 msgstr "資料夾 (一般,開啟)"
 
-#: src/gtk/icon_legend.c:90
+#: src/gtk/icon_legend.c:89
 msgid "Folder with read messages hidden"
 msgstr "此資料夾內已讀郵件隱藏"
 
-#: src/gtk/icon_legend.c:91
+#: src/gtk/icon_legend.c:90
 msgid "Folder contains marked messages"
 msgstr "此資料夾內郵件已郵示"
 
-#: src/gtk/icon_legend.c:92
-msgid "IMAP folder which contains sub-folders only"
+#: src/gtk/icon_legend.c:91
+msgid "IMAP folder which contains subfolders only"
 msgstr "只包含子資料夾的 IMAP 資料夾"
 
-#: src/gtk/icon_legend.c:93
+#: src/gtk/icon_legend.c:92
 msgid "IMAP mailbox showing only subscribed folders"
 msgstr "IMAP 郵箱只顯示已訂閱資料夾"
 
-#: src/gtk/icon_legend.c:127
+#: src/gtk/icon_legend.c:126
 msgid "Icon Legend"
 msgstr "圖例"
 
-#: src/gtk/icon_legend.c:146
+#: src/gtk/icon_legend.c:145
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr "以下圖示用來顯示郵件和資料夾狀態:"
 
-#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
+#: src/gtk/inputdialog.c:227 src/gtk/inputdialog.c:249
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "為 %s 輸入密碼於 %s:"
 
-#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
-#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
+#: src/gtk/inputdialog.c:230 src/gtk/inputdialog.c:233
+#: src/gtk/inputdialog.c:252 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s:"
 msgstr "為 %s 輸入密碼:"
 
-#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:258
 msgid "Input password:"
 msgstr "輸入密碼:"
 
-#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
-#: src/gtk/inputdialog.c:278
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:265
+#: src/gtk/inputdialog.c:277
 msgid "Input password"
 msgstr "輸入密碼"
 
-#: src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:267
 msgid "Remember password for this session"
 msgstr "為此記住密碼"
 
-#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:406
 msgid "Remember this"
 msgstr "記住這個"
 
-#: src/gtk/logwindow.c:450
+#: src/gtk/logwindow.c:419
 msgid "_Go to last error"
 msgstr "前往最後一個錯誤(_G)"
 
-#: src/gtk/logwindow.c:457
+#: src/gtk/logwindow.c:426
 msgid "Clear _Log"
 msgstr "清除歷程(_L)"
 
-#: src/gtk/menu.c:139
+#: src/gtk/menu.c:138
 msgid "Warning:"
 msgstr "警告:"
 
-#: src/gtk/menu.c:140
+#: src/gtk/menu.c:139
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4960,289 +5279,296 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
-#: src/plugins/address_keeper/address_keeper_prefs.c:273
-#: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:229
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:775
+#: src/plugins/address_keeper/address_keeper_prefs.c:280
+#: src/plugins/archive/archiver_prefs.c:105
+#: src/plugins/attachwarner/attachwarner_prefs.c:234
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
-#: src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:137
+#: src/plugins/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:398
-#: src/plugins/notification/notification_prefs.c:413
-#: src/plugins/notification/notification_prefs.c:432
-#: src/plugins/notification/notification_prefs.c:450
-#: src/plugins/notification/notification_prefs.c:468
-#: src/plugins/notification/notification_prefs.c:486
-#: src/plugins/notification/notification_prefs.c:504
-#: src/plugins/notification/notification_prefs.c:522
+#: 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/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:673
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
+#: src/plugins/spamassassin/spamassassin_gtk.c:665
+#: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "外掛程式"
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Load..."
 msgstr "載入(_L)..."
 
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:339
 msgid "_Unload"
 msgstr "卸載(_U)"
 
-#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
 msgid "Description"
 msgstr "說明"
 
-#: src/gtk/pluginwindow.c:376
+#: src/gtk/pluginwindow.c:378
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr "參閱 %sClaws Mail website%s 以取得更詳細的資訊"
 
-#: src/gtk/pluginwindow.c:417
+#: src/gtk/pluginwindow.c:419
 msgid "Click here to load one or more plugins"
 msgstr "點選此處以載入一個或多個外掛程式"
 
-#: src/gtk/pluginwindow.c:420
+#: src/gtk/pluginwindow.c:422
 msgid "Unload the selected plugin"
 msgstr "移除選擇的外掛程式"
 
-#: src/gtk/pluginwindow.c:485
+#: src/gtk/pluginwindow.c:488
 msgid "Loaded plugins"
 msgstr "已載入的外掛程式"
 
-#: src/gtk/prefswindow.c:640
+#: 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
+msgid "_Apply"
+msgstr "指定"
+
+#: src/gtk/prefswindow.c:647
 msgid "Page Index"
 msgstr "頁索引"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:848
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4085 src/prefs_account.c:4103 src/prefs_account.c:4121
-#: src/prefs_account.c:4139 src/prefs_account.c:4157 src/prefs_account.c:4175
-#: src/prefs_account.c:4193 src/prefs_account.c:4212 src/prefs_account.c:4305
-#: src/prefs_account.c:4323 src/prefs_filtering_action.c:1380
-#: src/prefs_filtering.c:398 src/prefs_filtering.c:1884
+#: 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_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr "帳號"
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:407
 msgid "all messages"
 msgstr "所有郵件"
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:408
 msgid "messages whose age is greater than # days"
 msgstr "郵件已接收超過 # 天"
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:409
 msgid "messages whose age is less than # days"
 msgstr "郵件接收過後未超過 # 天"
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:410
 msgid "messages whose age is greater than # hours"
 msgstr "郵件已接收超過 # 小時"
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:411
 msgid "messages whose age is less than # hours"
 msgstr "郵件接收過後未超過 # 小時"
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:412
 msgid "messages which contain S in the message body"
 msgstr "郵件內容包含了 S"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:413
 msgid "messages which contain S in the whole message"
 msgstr "郵件內包含了 S"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:414
 msgid "messages carbon-copied to S"
 msgstr "郵件已回覆至 S"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:415
 msgid "message is either To: or Cc: to S"
 msgstr "郵件已回覆寄件者或密件副本至S"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:416
 msgid "deleted messages"
 msgstr "刪除郵件"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:417
 msgid "messages whose date is after requested date (time is optional)"
 msgstr "郵件的日期在求要的日期之後(時間是選項)"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:419
 msgid "messages whose date is before requested date (time is optional)"
 msgstr "郵件的日期在求要的日期之前(時間是選項)"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:421
 msgid "messages which contain S in the Sender field"
 msgstr "郵件在寄件者區塊中包含了 S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:422
 msgid "true if execute \"S\" succeeds"
 msgstr "若執行 \"S\" 成功則為真"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:423
 msgid "messages originating from user S"
 msgstr "郵件起源於使用者 S"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:424
 msgid "forwarded messages"
 msgstr "郵件已轉寄"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:425
 msgid "messages which have attachments"
 msgstr "郵件包含附件"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr "任何標頭名稱或數據包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:427
 msgid "messages which contain S in the value of any header"
 msgstr "任何標頭內數據內包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr "任何 Message-ID 標頭包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:429
 msgid "messages which contain S in In-Reply-To header"
 msgstr "任何 In-Reply-To 標頭包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:430
 msgid "messages which are marked with color #"
 msgstr "標示為 # 顏色的郵件"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:431
 msgid "locked messages"
 msgstr "鎖定郵件"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:432
 msgid "messages which are in newsgroup S"
 msgstr "在新聞群組S內的郵件"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:433
 msgid "new messages"
 msgstr "新郵件"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:434
 msgid "old messages"
 msgstr "舊郵件"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:435
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的郵件 (沒有完整的下載)"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:436
 msgid "messages which you have replied to"
 msgstr "回覆的郵件"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:437
 msgid "read messages"
 msgstr "讀取郵件"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:438
 msgid "messages which contain S in subject"
 msgstr "主旨內包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:439
 msgid "messages whose score is equal to # points"
 msgstr "評分等於 # 點的郵件"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:440
 msgid "messages whose score is greater than # points"
 msgstr "評分高於 # 點的郵件"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:441
 msgid "messages whose score is lower than # points"
 msgstr "評分低於 # 點的郵件"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:442
 msgid "messages whose size is equal to # bytes"
 msgstr "等於 # 位元的郵件"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:443
 msgid "messages whose size is greater than # bytes"
 msgstr "大於 # 位元的郵件"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:444
 msgid "messages whose size is smaller than # bytes"
 msgstr "小於 # 位元的郵件"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:445
 msgid "messages which have been sent to S"
 msgstr "寄給S的郵件"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:446
 msgid "messages which tags contain S"
 msgstr "標籤包含S的郵件"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:447
 msgid "messages which have tag(s)"
 msgstr "有標籤的郵件"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:448
 msgid "marked messages"
 msgstr "已標示的郵件"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:449
 msgid "unread messages"
 msgstr "未讀的郵件"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:450
 msgid "messages which contain S in References header"
 msgstr "參考標頭內包含S的郵件"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:451
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "傳入命令的返回值為0 - %F 為郵件檔案"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in X-Label header"
 msgstr "X-Label 標頭內包含S的郵件"
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr "'而且'的操作邏輯"
 
-#: src/gtk/quicksearch.c:520
+#: src/gtk/quicksearch.c:455
 msgid "logical OR operator"
 msgstr "'或'的操作邏輯"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:456
 msgid "logical NOT operator"
 msgstr "'非'的操作邏輯"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:457
 msgid "case sensitive search"
 msgstr "大小寫視為不同的搜尋"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:458
 msgid "match using regular expressions instead of substring search"
 msgstr "用常態表示式取代子字串搜尋進行比對"
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:460
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
 msgstr "所有的過濾表達式都是被允許的,但是不能夠將上述的語法混用"
 
-#: src/gtk/quicksearch.c:535 src/summary_search.c:462
+#: src/gtk/quicksearch.c:470 src/summary_search.c:465
 msgid "Extended Search"
 msgstr "擴展性的搜尋"
 
-#: src/gtk/quicksearch.c:536
+#: src/gtk/quicksearch.c:471
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5251,107 +5577,113 @@ msgstr ""
 "擴展性的搜尋允許使用者自定標準法則,郵件必需排序而且顯示在郵件清單內\n"
 "下列符號是允許被使用的:"
 
-#: src/gtk/quicksearch.c:637
+#: src/gtk/quicksearch.c:588
 msgid "Something went wrong during search. Please check your logs."
 msgstr "搜尋過程出現一些錯誤,請檢視你的歷程"
 
-#: src/gtk/quicksearch.c:699
+#: src/gtk/quicksearch.c:872
 msgid "From/To/Cc/Subject/Tag"
 msgstr "寄件者/收件者/密件/主旨/標籤"
 
-#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "循環"
 
-#: src/gtk/quicksearch.c:719
+#: src/gtk/quicksearch.c:896
 msgid "Sticky"
 msgstr "黏貼"
 
-#: src/gtk/quicksearch.c:729
+#: src/gtk/quicksearch.c:902
 msgid "Type-ahead"
 msgstr "預先輸入"
 
-#: src/gtk/quicksearch.c:741
+#: src/gtk/quicksearch.c:908
 msgid "Run on select"
 msgstr "執行所選擇的"
 
-#: src/gtk/quicksearch.c:777
+#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
+#: src/gtk/quicksearch.c:1023 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
 msgid "Clear the current search"
 msgstr "清除目前的搜尋"
 
-#: src/gtk/quicksearch.c:787 src/summary_search.c:413
+#: src/gtk/quicksearch.c:945 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr "編輯搜尋規則"
 
-#: src/gtk/quicksearch.c:796
-msgid "Information about extended symbols"
-msgstr "關於擴展符號的資訊"
-
-#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
+#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
+#: src/gtk/quicksearch.c:1021 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/ssl_manager.c:216
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
+#: src/gtk/quicksearch.c:954
+msgid "Information about extended symbols"
+msgstr "關於擴展符號的資訊"
+
+#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
+#: src/gtk/quicksearch.c:1028
 msgid "E_dit"
 msgstr "編輯(_d)"
 
-#: src/gtk/quicksearch.c:836 src/gtk/quicksearch.c:860 src/prefs_actions.c:349
-#: src/prefs_filtering.c:496 src/prefs_template.c:330
-msgid "C_lear"
-msgstr "清除(_l)"
-
-#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:304
 #, c-format
 msgid "Correct%s"
 msgstr "正確%s"
 
-#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
-#: src/ssl_manager.c:301 src/ssl_manager.c:305
+#: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
+#: src/ssl_manager.c:304 src/ssl_manager.c:308
 msgid " (expired)"
 msgstr "(已逾時)"
 
-#: src/gtk/sslcertwindow.c:188
+#: src/gtk/sslcertwindow.c:186
 msgid "Owner"
 msgstr "擁有者"
 
-#: src/gtk/sslcertwindow.c:189
+#: src/gtk/sslcertwindow.c:187
 msgid "Signer"
 msgstr "簽核者"
 
-#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
+#: src/gtk/sslcertwindow.c:194 src/gtk/sslcertwindow.c:233
 msgid "Name: "
 msgstr "名稱: "
 
-#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:207 src/gtk/sslcertwindow.c:246
 msgid "Organization: "
 msgstr "組識: "
 
-#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
+#: src/gtk/sslcertwindow.c:220 src/gtk/sslcertwindow.c:259
 msgid "Location: "
 msgstr "地區: "
 
-#: src/gtk/sslcertwindow.c:244
+#: src/gtk/sslcertwindow.c:272
 msgid "Fingerprint: \n"
 msgstr "指紋: \n"
 
-#: src/gtk/sslcertwindow.c:254
+#: src/gtk/sslcertwindow.c:288
 msgid "Signature status: "
 msgstr "簽名狀態: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expired on: "
 msgstr "已過期日: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expires on: "
 msgstr "過期日: "
 
-#: src/gtk/sslcertwindow.c:328
-#, c-format
-msgid "SSL/TLS certificate for %s"
+#: src/gtk/sslcertwindow.c:373
+msgid "TLS certificate for %s"
 msgstr "%s 的 SSL/TLS 簽證"
 
-#: src/gtk/sslcertwindow.c:344
+#: src/gtk/sslcertwindow.c:389
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5362,7 +5694,7 @@ msgstr ""
 "可能是連接到一個惡意的伺服器\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:409
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5371,39 +5703,39 @@ msgstr ""
 "%s 的簽證是無效的\n"
 "%s 確認要接受嗎?"
 
-#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
-#: src/gtk/sslcertwindow.c:488
+#: src/gtk/sslcertwindow.c:419 src/gtk/sslcertwindow.c:469
+#: src/gtk/sslcertwindow.c:533
 msgid "Correct"
 msgstr "正確"
 
-#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
-#: src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:421 src/gtk/sslcertwindow.c:471
+#: src/gtk/sslcertwindow.c:535
 #, c-format
 msgid "Signature status: %s"
 msgstr "簽名狀態: %s"
 
-#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:429 src/gtk/sslcertwindow.c:479
 msgid "_View certificate"
 msgstr "查看簽證(_V)"
 
-#: src/gtk/sslcertwindow.c:390
-msgid "SSL/TLS certificate is invalid"
+#: src/gtk/sslcertwindow.c:435
+msgid "TLS certificate is invalid"
 msgstr "SSL/TLS認證是無效的"
 
-#: src/gtk/sslcertwindow.c:392
-msgid "SSL/TLS certificate is unknown"
+#: src/gtk/sslcertwindow.c:437
+msgid "TLS certificate is unknown"
 msgstr "SSL/TLS認證是未知的"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
-#: src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:552
 msgid "_Cancel connection"
 msgstr "取消連線(_C)"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:552
 msgid "_Accept and save"
 msgstr "接受並儲存(_A)"
 
-#: src/gtk/sslcertwindow.c:413
+#: src/gtk/sslcertwindow.c:458
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5412,27 +5744,27 @@ msgstr ""
 "%s 的簽證已過期\n"
 "%s 確認要繼續嗎?"
 
-#: src/gtk/sslcertwindow.c:440
-msgid "SSL/TLS certificate is invalid and expired"
+#: src/gtk/sslcertwindow.c:485
+msgid "TLS certificate is invalid and expired"
 msgstr "SSL/TLS 簽證是無效且過期的"
 
-#: src/gtk/sslcertwindow.c:442
-msgid "SSL/TLS certificate is expired"
+#: src/gtk/sslcertwindow.c:487
+msgid "TLS certificate is expired"
 msgstr "SSL/TLS 簽證是過期的"
 
-#: src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:490
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: src/gtk/sslcertwindow.c:465
+#: src/gtk/sslcertwindow.c:510
 msgid "New certificate:"
 msgstr "新的簽證"
 
-#: src/gtk/sslcertwindow.c:470
+#: src/gtk/sslcertwindow.c:515
 msgid "Known certificate:"
 msgstr "已知的簽證"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:522
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5441,241 +5773,240 @@ msgstr ""
 "%s 的簽證已經改變\n"
 "%s 確認要接受嗎?"
 
-#: src/gtk/sslcertwindow.c:498
+#: src/gtk/sslcertwindow.c:543
 msgid "_View certificates"
 msgstr "查看簽證(_V)"
 
-#: src/gtk/sslcertwindow.c:503
-msgid "SSL/TLS certificate changed and is invalid"
+#: src/gtk/sslcertwindow.c:548
+msgid "TLS certificate changed and is invalid"
 msgstr "SSL/TLS 簽證變更而且是無效的"
 
-#: src/gtk/sslcertwindow.c:505
-msgid "SSL/TLS certificate changed"
+#: src/gtk/sslcertwindow.c:550
+msgid "TLS certificate changed"
 msgstr "SSL/TLS 簽證變更"
 
-#: src/headerview.c:94
+#: src/headerview.c:95
 msgid "Tags:"
 msgstr "標簽:"
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
+#: src/headerview.c:193 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
-#: src/summaryview.c:3517 src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3494
+#: src/summaryview.c:3512 src/summaryview.c:3551
 msgid "(No From)"
 msgstr "(無寄件者)"
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
+#: src/headerview.c:208 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
-#: src/summaryview.c:3571
+#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3563
+#: src/summaryview.c:3566
 msgid "(No Subject)"
 msgstr "(無主旨)"
 
-#: src/image_viewer.c:128
+#: src/image_viewer.c:100
 msgid "Error:"
 msgstr "錯誤:"
 
-#: src/image_viewer.c:318 src/mimeview.c:2666
-#: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/image_viewer.c:314 src/mimeview.c:2598
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr "檔案名稱"
 
-#: src/image_viewer.c:325
+#: src/image_viewer.c:319
 msgid "Filesize:"
 msgstr "檔案大小:"
 
-#: src/image_viewer.c:374
+#: src/image_viewer.c:364
 msgid "Load Image"
 msgstr "載入圖片"
 
-#: src/imap.c:583
+#: src/imap.c:585
 msgid "IMAP connection broken\n"
 msgstr "IMAP4 連線中斷\n"
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:630 src/imap.c:633 src/imap.c:636 src/imap.c:639 src/imap.c:642
+#: src/imap.c:646 src/imap.c:649 src/imap.c:652 src/imap.c:655 src/imap.c:659
+#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
+#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
+#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
+#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
+#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
+#: src/imap.c:737 src/imap.c:740 src/imap.c:743 src/imap.c:746 src/imap.c:749
+#: src/imap.c:753 src/imap.c:757
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP 發生%s錯誤:"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "authenticated"
 msgstr " 已認證"
 
-#: src/imap.c:631
+#: src/imap.c:633
 msgid "not authenticated"
 msgstr "沒有認證"
 
-#: src/imap.c:634
+#: src/imap.c:636
 msgid "bad state"
 msgstr " 錯誤狀態"
 
-#: src/imap.c:637
+#: src/imap.c:639
 msgid "stream error"
 msgstr " stream 錯誤"
 
-#: src/imap.c:640
+#: src/imap.c:642
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr " 解析錯誤(很可能是因為不符合伺服器的RFC規範)"
 
-#: src/imap.c:644
+#: src/imap.c:646
 msgid "connection refused"
 msgstr "連線被拒絕"
 
-#: src/imap.c:647
+#: src/imap.c:649
 msgid "memory error"
 msgstr "記憶體錯誤"
 
-#: src/imap.c:650
+#: src/imap.c:652
 msgid "fatal error"
 msgstr " 內部錯誤"
 
-#: src/imap.c:653
+#: src/imap.c:655
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr " 協定錯誤(很可能是因為不符合伺服器的RFC規範)"
 
-#: src/imap.c:657
+#: src/imap.c:659
 msgid "connection not accepted"
 msgstr " 連線沒有被接受"
 
-#: src/imap.c:660
+#: src/imap.c:662
 msgid "APPEND error"
 msgstr " APPEND 錯誤"
 
-#: src/imap.c:663
+#: src/imap.c:665
 msgid "NOOP error"
 msgstr " NOOP 錯誤"
 
-#: src/imap.c:666
+#: src/imap.c:668
 msgid "LOGOUT error"
 msgstr " 登出錯誤"
 
-#: src/imap.c:669
+#: src/imap.c:671
 msgid "CAPABILITY error"
 msgstr " 容量錯誤"
 
-#: src/imap.c:672
+#: src/imap.c:674
 msgid "CHECK error"
 msgstr " 檢查錯誤"
 
-#: src/imap.c:675
+#: src/imap.c:677
 msgid "CLOSE error"
 msgstr " 關閉錯誤"
 
-#: src/imap.c:678
+#: src/imap.c:680
 msgid "EXPUNGE error"
 msgstr " 刪除錯誤"
 
-#: src/imap.c:681
+#: src/imap.c:683
 msgid "COPY error"
 msgstr " 複製錯誤"
 
-#: src/imap.c:684
+#: src/imap.c:686
 msgid "UID COPY error"
 msgstr " UID 複制錯誤"
 
-#: src/imap.c:687
+#: src/imap.c:689
 msgid "CREATE error"
 msgstr " 建立錯誤"
 
-#: src/imap.c:690
+#: src/imap.c:692
 msgid "DELETE error"
 msgstr " 刪除錯誤"
 
-#: src/imap.c:693
+#: src/imap.c:695
 msgid "EXAMINE error"
 msgstr " 檢驗錯誤"
 
-#: src/imap.c:696
+#: src/imap.c:698
 msgid "FETCH error"
 msgstr " 擷取錯誤"
 
-#: src/imap.c:699
+#: src/imap.c:701
 msgid "UID FETCH error"
 msgstr " UID取得錯誤"
 
-#: src/imap.c:702
+#: src/imap.c:704
 msgid "LIST error"
 msgstr " LIST 錯誤"
 
-#: src/imap.c:705
+#: src/imap.c:707
 msgid "LOGIN error"
 msgstr " 登入錯誤"
 
-#: src/imap.c:708
+#: src/imap.c:710
 msgid "LSUB error"
 msgstr " LSUB 錯誤"
 
-#: src/imap.c:711
+#: src/imap.c:713
 msgid "RENAME error"
 msgstr " 重新命名錯誤"
 
-#: src/imap.c:714
+#: src/imap.c:716
 msgid "SEARCH error"
 msgstr " 搜尋錯誤"
 
-#: src/imap.c:717
+#: src/imap.c:719
 msgid "UID SEARCH error"
 msgstr " UID搜尋錯誤"
 
-#: src/imap.c:720
+#: src/imap.c:722
 msgid "SELECT error"
 msgstr " 選擇錯誤"
 
-#: src/imap.c:723
+#: src/imap.c:725
 msgid "STATUS error"
 msgstr " 狀態錯誤"
 
-#: src/imap.c:726
+#: src/imap.c:728
 msgid "STORE error"
 msgstr " 儲存錯誤"
 
-#: src/imap.c:729
+#: src/imap.c:731
 msgid "UID STORE error"
 msgstr " UID儲存錯誤"
 
-#: src/imap.c:732
+#: src/imap.c:734
 msgid "SUBSCRIBE error"
 msgstr " 訂閱錯誤"
 
-#: src/imap.c:735
+#: src/imap.c:737
 msgid "UNSUBSCRIBE error"
 msgstr " 取消定閱錯誤"
 
-#: src/imap.c:738
+#: src/imap.c:740
 msgid "STARTTLS error"
 msgstr " STARTLS錯誤"
 
-#: src/imap.c:741
+#: src/imap.c:743
 msgid "INVAL error"
 msgstr " INVAL錯誤"
 
-#: src/imap.c:744
+#: src/imap.c:746
 msgid "EXTENSION error"
 msgstr " 擴展錯誤"
 
-#: src/imap.c:747
+#: src/imap.c:749
 msgid "SASL error"
 msgstr " SASL 錯誤"
 
-#: src/imap.c:751
-msgid "SSL/TLS error"
-msgstr " SSL 錯誤"
+#: src/imap.c:753
+msgid "TLS error"
+msgstr " LIST 錯誤"
 
-#: src/imap.c:755
+#: src/imap.c:757
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "未知的錯誤 [%d]"
 
-#: src/imap.c:968
+#: src/imap.c:978
 msgid ""
 "\n"
 "\n"
@@ -5687,7 +6018,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -5699,7 +6030,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -5711,7 +6042,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-1登入才能"
 "正常運作"
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -5723,7 +6054,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -5735,39 +6066,49 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:999
+#: src/imap.c:1008
+msgid ""
+"\n"
+"\n"
+"OAuth2 error. Check and correct your OAuth2 account preferences."
+msgstr ""
+"\n"
+"\n"
+"OAuth2錯:檢查並修正你的OAuth2帳號設定"
+
+#: src/imap.c:1014
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "連線到 %s 失敗:登入被拒絕 %s"
 
-#: src/imap.c:1003
+#: src/imap.c:1018
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "連線到 %s 失敗:登入被拒絕 %s\n"
 
-#: src/imap.c:1021
+#: src/imap.c:1036
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "連線到 %s 失敗"
 
-#: src/imap.c:1028 src/imap.c:1031
+#: src/imap.c:1043 src/imap.c:1046
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 連線到 %s 已經被中斷,正在重新連線...\n"
 
-#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
-#: src/imap.c:4667 src/imap.c:5478
+#: src/imap.c:1076 src/imap.c:3753 src/imap.c:4412 src/imap.c:4506
+#: src/imap.c:4684 src/imap.c:5495
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail 需要有網路的存取能力,才能夠存取 IMAP 伺服器"
 
-#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:886 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:887 src/news.c:403 src/send_message.c:294
 msgid ""
-"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
-"not available in this build of Claws Mail. \n"
+"This connection is configured to be secured using TLS, but TLS is not "
+"available in this build of Claws Mail. \n"
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
@@ -5777,108 +6118,108 @@ msgstr ""
 "\n"
 "確認要繼續連線到這個伺服器嗎?此通訊將不安全"
 
-#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:893 src/news.c:409 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr "繼續保持連線"
 
-#: src/imap.c:1187
+#: src/imap.c:1202
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "帳號 '%s':連線到 IMAP4 伺服器:  %s:%d..."
 
-#: src/imap.c:1252
+#: src/imap.c:1267
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d"
 
-#: src/imap.c:1255
+#: src/imap.c:1270
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d\n"
 
-#: src/imap.c:1287 src/imap.c:4157
+#: src/imap.c:1302 src/imap.c:4174
 msgid "Can't start STARTTLS session.\n"
 msgstr "無法啟始 STARTTLS 通信\n"
 
-#: src/imap.c:1359
+#: src/imap.c:1374
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "無法登入到 IMAP 伺服器 %s \n"
 
-#: src/imap.c:1362
+#: src/imap.c:1377
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "無法登入到 IMAP 伺服器 %s"
 
-#: src/imap.c:1790
+#: src/imap.c:1805
 msgid "Adding messages..."
 msgstr "加入郵件..."
 
-#: src/imap.c:1995 src/mh.c:530
+#: src/imap.c:2010 src/mh.c:530
 msgid "Copying messages..."
 msgstr "複製郵件..."
 
-#: src/imap.c:2521
+#: src/imap.c:2536
 msgid "Search failed due to server error."
 msgstr "因伺服器錯誤造成搜尋失敗"
 
-#: src/imap.c:2605
+#: src/imap.c:2620
 msgid "can't set deleted flags\n"
 msgstr "無法設定已刪除旗標\n"
 
-#: src/imap.c:2612 src/imap.c:5108
+#: src/imap.c:2627 src/imap.c:5125
 msgid "can't expunge\n"
 msgstr "無法刪掉\n"
 
-#: src/imap.c:2987
+#: src/imap.c:3002
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "在沒有訂閱的資料夾 %s 內尋找..."
 
-#: src/imap.c:2990
+#: src/imap.c:3005
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "在%s尋找子資料夾..."
 
-#: src/imap.c:3278
+#: src/imap.c:3296
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法建立郵件箱:LIST錯誤\n"
 
-#: src/imap.c:3291
+#: src/imap.c:3309
 msgid "can't create mailbox\n"
 msgstr "無法建立郵件箱\n"
 
-#: src/imap.c:3422
+#: src/imap.c:3439
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "無法將郵件箱口稱從 %s 變更為 %s\n"
 
-#: src/imap.c:3535
+#: src/imap.c:3552
 msgid "can't delete mailbox\n"
 msgstr "無法刪除郵件箱\n"
 
-#: src/imap.c:3814
+#: src/imap.c:3831
 msgid "LIST failed\n"
 msgstr "LIST 失敗\n"
 
-#: src/imap.c:3899
+#: src/imap.c:3916
 msgid "Flagging messages..."
 msgstr "標示郵件..."
 
-#: src/imap.c:4002
+#: src/imap.c:4019
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾: %s\n"
 
-#: src/imap.c:4154
+#: src/imap.c:4171
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "伺服器需要以 STARTTLS 進行登入\n"
 
-#: src/imap.c:4164
+#: src/imap.c:4181
 msgid "Can't refresh capabilities.\n"
 msgstr "不能刷新功能\n"
 
-#: src/imap.c:4169
+#: src/imap.c:4186
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5887,20 +6228,20 @@ msgstr ""
 "連線到 %s 失敗:伺服器需要 STARTTLS,但是目前的 Claws Mail 被編譯成不支援 "
 "STARTTLS 的版本\n"
 
-#: src/imap.c:4177
+#: src/imap.c:4194
 msgid "Server logins are disabled.\n"
 msgstr "伺服器登入被關閉\n"
 
-#: src/imap.c:4400
+#: src/imap.c:4417
 msgid "Fetching message..."
 msgstr "取得郵件..."
 
-#: src/imap.c:5101
+#: src/imap.c:5118
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "無法設定被刪除的旗標: %d\n"
 
-#: src/imap.c:6136
+#: src/imap.c:6153
 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"
@@ -5912,24 +6253,24 @@ msgstr ""
 "\n"
 "你很可能需要安裝 libetpan 並重新編譯 Claws Mail"
 
-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
+#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:60
 msgid "Create _new folder..."
 msgstr "建立新資料夾(_n)..."
 
 #: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
-#: src/plugins/mailmbox/plugin_gtk.c:60
+#: src/plugins/mailmbox/plugin_gtk.c:61
 msgid "_Rename folder..."
 msgstr "重新命名資料夾(_R)..."
 
-#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
+#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "M_ove folder..."
 msgstr "移動資料夾(_o)..."
 
-#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
+#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:63
 msgid "Cop_y folder..."
 msgstr "複製資料夾(_y)..."
 
-#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
+#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
 #: src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr "刪除資料夾(_D)..."
@@ -5950,20 +6291,20 @@ msgstr "訂閱內容"
 msgid "_Subscribe..."
 msgstr "訂閱(_S)..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Unsubscribe..."
 msgstr "取消訂閱(_U)..."
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
-#: src/plugins/mailmbox/plugin_gtk.c:64
+#: src/plugins/mailmbox/plugin_gtk.c:65
 msgid "_Check for new messages"
 msgstr "檢查新郵件(_C)"
 
-#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:65
+#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:66
 msgid "C_heck for new folders"
 msgstr "檢查新資料夾(_h)"
 
-#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:66
+#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "R_ebuild folder tree"
 msgstr "重新建立資料夾樹(_e)"
 
@@ -5981,22 +6322,22 @@ msgstr ""
 "(如果要建立一個資料夾而只用來保存子資料夾且沒有郵件,\n"
 "請在資料夾後加上 '/'"
 
-#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
-#: src/plugins/vcalendar/vcal_folder.c:2060
+#: 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
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "為 %s 輸入新名稱"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
-#: src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2061
+#: 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
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
-#: src/plugins/vcalendar/vcal_folder.c:2081
+#: 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
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6004,21 +6345,21 @@ msgstr ""
 "此資料夾不能被重新命名\n"
 "這個資料夾名稱是不允許的"
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr "將資料夾 %s 移至選擇的路徑"
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 msgid "Select folder to copy folder '%s' to"
 msgstr "將資料夾 %s 複製到選擇的資料夾"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
-#, c-format
+#: 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
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
@@ -6026,44 +6367,44 @@ msgstr ""
 "\n"
 "確認要刪除嗎?"
 
-#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:172
-#: src/plugins/vcalendar/vcal_folder.c:2014
+#: 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
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "不能移除資料夾 '%s'"
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:507
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr "確認要在 '%s' 取消訂閱的子資料夾中搜尋嗎?"
 
-#: src/imap_gtk.c:509
+#: src/imap_gtk.c:510
 msgid "Search recursively"
 msgstr "遞回搜尋"
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:515 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr "訂閱內容"
 
-#: src/imap_gtk.c:515
+#: src/imap_gtk.c:516
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "選擇 %s 的一個子資料夾以訂閱:"
 
-#: src/imap_gtk.c:536 src/mainwindow.c:689
+#: src/imap_gtk.c:538 src/mainwindow.c:682
 msgid "Subscribe"
 msgstr "訂閱"
 
-#: src/imap_gtk.c:538 src/imap_gtk.c:540
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr "全部"
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6075,49 +6416,49 @@ msgstr ""
 "如果在其它的客戶端有新資料夾已建立而且已訂閱,在\"檢查新資料夾\" 使用郵件箱的"
 "主目錄"
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr "確認要 %s 這個 '%s' 資料夾嗎?"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr "訂閱"
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr "取消訂閱"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
-#: src/prefs_folder_item.c:1593
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1590 src/prefs_folder_item.c:1618
+#: src/prefs_folder_item.c:1646
 msgid "Apply to subfolders"
 msgstr "套用至子資料夾"
 
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: src/imap_gtk.c:574 src/news_gtk.c:252
+#: src/imap_gtk.c:576 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: src/import.c:113 src/import.c:209
+#: src/import.c:112 src/import.c:206
 msgid "Import mbox file"
 msgstr "匯入 mbox 檔案"
 
-#: src/import.c:132
+#: src/import.c:131
 msgid "Locate the mbox file and specify the destination folder."
 msgstr "指定 mbox 檔案和目的資料夾"
 
-#: src/import.c:149
+#: src/import.c:146
 msgid "Destination folder:"
 msgstr "目的資料夾"
 
-#: src/import.c:204
+#: src/import.c:201
 msgid "Source mbox filename can't be left empty."
 msgstr "未指定有效的 mbox 檔案"
 
-#: src/import.c:209
+#: src/import.c:207
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6125,19 +6466,19 @@ msgstr ""
 "目的資料夾尚未設定\n"
 "確定要匯入 mbox 到收件夾嗎?"
 
-#: src/import.c:231
+#: src/import.c:228
 msgid "Can't find the destination folder."
 msgstr "找不到目的資料夾"
 
-#: src/import.c:236
+#: src/import.c:233
 msgid "Importing mbox file..."
 msgstr "匯入mbox檔案..."
 
-#: src/import.c:258
+#: src/import.c:255
 msgid "Select importing file"
 msgstr "選擇匯戶檔案"
 
-#: src/import.c:276
+#: src/import.c:273
 msgid "Select folder to import to"
 msgstr "選擇要匯入的路徑"
 
@@ -6165,7 +6506,7 @@ msgstr "請提供通訊錄名稱"
 msgid "LDIF file imported successfully."
 msgstr "LDIF 檔案匯入成功"
 
-#: src/importldif.c:465
+#: src/importldif.c:467
 msgid "Select LDIF File"
 msgstr "選擇 LDIF 檔案"
 
@@ -6175,43 +6516,43 @@ msgid ""
 "file data."
 msgstr "指定通訊錄的名稱,以利在 LDIF 上建立檔案資料"
 
-#: src/importldif.c:556
+#: src/importldif.c:555
 msgid "File Name"
 msgstr "檔案名稱"
 
-#: src/importldif.c:566
+#: src/importldif.c:565
 msgid "The full file specification of the LDIF file to import."
 msgstr "用來匯入的 LDIF 檔案之完整規格"
 
-#: src/importldif.c:573
+#: src/importldif.c:571
 msgid "Select the LDIF file to import."
 msgstr "選擇要匯入的 LDIF 檔案"
 
-#: src/importldif.c:705
+#: src/importldif.c:702
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:466
+#: src/importldif.c:707 src/summaryview.c:462
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:716
+#: src/importldif.c:713
 msgid "LDIF Field Name"
 msgstr "LDIF 檔案名稱"
 
-#: src/importldif.c:721
+#: src/importldif.c:718
 msgid "Attribute Name"
 msgstr "屬性名稱"
 
-#: src/importldif.c:740
+#: src/importldif.c:736
 msgid "LDIF Field"
 msgstr "LDIF 範籌"
 
-#: src/importldif.c:752
+#: src/importldif.c:747
 msgid "Attribute"
 msgstr "屬性"
 
-#: src/importldif.c:764
+#: src/importldif.c:758
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6226,35 +6567,35 @@ msgstr ""
 "選擇想要匯入的欄位。而點選其它列的任何地方將可以在下方的清單輸入區域選擇想要"
 "修改名稱的欄位。若在其它列的任何地方雙擊,也可以選擇要匯入的欄位"
 
-#: src/importldif.c:779
+#: src/importldif.c:774
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "LDIF區塊可以將名稱變更為使用者自定的屬性名稱"
 
-#: src/importldif.c:784
+#: src/importldif.c:777
 msgid "Select for Import"
 msgstr "匯入選擇"
 
-#: src/importldif.c:789
+#: src/importldif.c:781
 msgid "Select the LDIF field for import into the address book."
 msgstr "選擇 LDIF 區塊,用以匯入至通訊錄"
 
-#: src/importldif.c:791
+#: src/importldif.c:783
 msgid " Modify "
 msgstr "修改"
 
-#: src/importldif.c:796
+#: src/importldif.c:787
 msgid "This button will update the list above with the data supplied."
 msgstr "這個按鍵將會用支援的資料更新上方的清單"
 
-#: src/importldif.c:870
+#: src/importldif.c:857
 msgid "Records Imported:"
 msgstr "記錄已匯入的"
 
-#: src/importldif.c:902
+#: src/importldif.c:889
 msgid "Import LDIF file into Address Book"
 msgstr "匯入 LDIF 檔案至通訊錄"
 
-#: src/importldif.c:940
+#: src/importldif.c:927
 msgid "Proceed"
 msgstr "已進行"
 
@@ -6266,11 +6607,11 @@ msgstr "匯入 MUTT 檔案發生錯誤"
 msgid "Select MUTT File"
 msgstr "選擇 MUTT 檔案"
 
-#: src/importmutt.c:203
+#: src/importmutt.c:202
 msgid "Import MUTT file into Address Book"
 msgstr "匯入 MUTT 檔案至通訊錄"
 
-#: src/importmutt.c:289 src/importpine.c:289
+#: src/importmutt.c:290 src/importpine.c:290
 msgid "Please select a file to import."
 msgstr "請選擇要匯入的檔案"
 
@@ -6282,146 +6623,146 @@ msgstr "匯入 Pine 檔案發生錯誤"
 msgid "Select Pine File"
 msgstr "選擇 Pine 檔案"
 
-#: src/importpine.c:202
+#: src/importpine.c:201
 msgid "Import Pine file into Address Book"
 msgstr "匯入 Pine 檔至通訊錄"
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail 需要網路才能取得郵件"
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr "%s 失敗\n"
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr "取回新郵件"
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr "待命"
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr "正在取回"
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "完成 (%d 郵件 (%s) 已取回)"
 msgstr[1] "完成 (%d 郵件 (%s) 已取回"
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:724 src/prefs_matcher.c:407 src/prefs_summaries.c:645
-#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6573
+#: 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
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: src/inc.c:737
 msgid "Timeout"
 msgstr "超時"
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "已完成 (%d 新郵件)"
 msgstr[1] "已完成 (%d 新郵件)"
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
-#: src/inc.c:865
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 正在取回新郵件"
 
-#: src/inc.c:894
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "帳號 '%s': POP3 伺服器連線中: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "無法連線至 POP3 伺服器: %s:%d"
 
-#: src/inc.c:932
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線至 POP3 伺服器: %s:%d\n"
 
-#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/inc.c:1014
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "正在從 %s (%s) 取回郵件..."
 
-#: src/inc.c:1020
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在取得新郵件 (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在取得新郵件 (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在取得新郵件 (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在取得郵件大小 (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr "離開中"
 
-#: src/inc.c:1064
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在取得郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "正在取回 (%d 郵件 (%s) 已接收)"
 msgstr[1] "正在取回 (%d 郵件 (%s) 已接收)"
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "連線至 %s:%d 失敗"
 
-#: src/inc.c:1237
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤"
 
-#: src/inc.c:1243
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6430,37 +6771,37 @@ msgstr ""
 "處理郵件時發生錯誤\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr "沒有足夠的磁碟空間"
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr "無法寫入檔案"
 
-#: src/inc.c:1259
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr "通訊錯誤"
 
-#: src/inc.c:1262
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "連線至 %s:%d 時通訊錯誤"
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr "遠端伺服器關閉連線"
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "連線至 %s:%d 時被遠端伺服器關閉連線"
 
-#: src/inc.c:1275
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr "郵件箱已鎖定"
 
-#: src/inc.c:1279
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6469,11 +6810,11 @@ msgstr ""
 "郵件箱已鎖定:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6482,52 +6823,52 @@ msgstr ""
 "認證失敗:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr "連線已超時。可以在選項/其它/雜項中增加超時設定值,或許可以回復"
 
-#: src/inc.c:1301
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "連線至 %s:%d 超時"
 
-#: src/inc.c:1339
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr "已取消合併\n"
 
-#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1869
-#: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
+#: 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
 msgid "seconds"
 msgstr "秒"
 
-#: src/inc.c:1641 src/inc.c:1651
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/inc.c:1644
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/inc.c:1656
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%s 目前處於離線模式,要回復 %d %s 嗎?"
 
-#: src/inc.c:1662
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%s 目前處於離線模式,要回復嗎?"
 
-#: src/inc.c:1669
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr "僅一次有效(_l)"
 
@@ -6536,8 +6877,8 @@ msgstr "僅一次有效(_l)"
 msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
 msgstr "LDAP 錯誤(搜尋):屬性'%s': %d (%s)\n"
 
-#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
-#: src/ldapupdate.c:1330
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1290
+#: src/ldapupdate.c:1331
 #, c-format
 msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
 msgstr "LDAP 錯誤 (異動): for DN '%s': %d (%s)\n"
@@ -6560,11 +6901,11 @@ msgstr "LDAP (搜尋): 成功\n"
 msgid "LDAP error (search): %d (%s)\n"
 msgstr "LDAP 錯誤 (搜尋): %d (%s)\n"
 
-#: src/ldif.c:759
+#: src/ldif.c:763
 msgid "Nick Name"
 msgstr "暱稱"
 
-#: src/main.c:250
+#: src/main.c:253
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6573,7 +6914,7 @@ msgstr ""
 "檔案 '%s' 已經存在\n"
 "無法建立資料夾"
 
-#: src/main.c:380
+#: src/main.c:383
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6582,7 +6923,7 @@ msgstr ""
 "發現 %s 的配置設定\n"
 "確認要合併配置設定內容嗎?"
 
-#: src/main.c:382
+#: src/main.c:387
 #, c-format
 msgid ""
 "\n"
@@ -6595,11 +6936,11 @@ msgstr ""
 "你的 Sylpheed 過濾條件可以使用一個在 %s 的有效 script 進行轉換\n"
 " "
 
-#: src/main.c:394
+#: src/main.c:400
 msgid "Keep old configuration"
 msgstr "保留舊有的配置設定內容"
 
-#: src/main.c:397
+#: src/main.c:403
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6608,31 +6949,27 @@ msgstr ""
 "保留備份可以允許你未來回復至舊的版本,但是,如果你有 IMAP 或是新聞資料時,將"
 "會花費一些時間,同時,也會占去磁碟上的部份空間"
 
-#: src/main.c:405
+#: src/main.c:411
 msgid "Migration of configuration"
 msgstr "配置設定的合併內容"
 
-#: src/main.c:416
+#: src/main.c:422
 msgid "Copying configuration... This may take a while..."
 msgstr "正在複製配置內容... 這將會花費一些時間..."
 
-#: src/main.c:425
+#: src/main.c:431
 msgid "Migration failed!"
 msgstr "合併失敗"
 
-#: src/main.c:434
+#: src/main.c:440
 msgid "Migrating configuration..."
 msgstr "正在合併配置內容..."
 
-#: src/main.c:1146
-msgid "g_thread is not supported by glib.\n"
-msgstr "glib 沒有支援 gthread(_t)\n"
-
-#: src/main.c:1166 src/main.c:1170 src/main.c:1174
+#: src/main.c:1194 src/main.c:1198 src/main.c:1202
 msgid "(or older)"
 msgstr "(或較舊的)"
 
-#: src/main.c:1515
+#: src/main.c:1540
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6649,7 +6986,7 @@ msgstr[1] ""
 "以下這些外掛程式載入失敗,請檢查外掛程式配置以獲取更多的資訊:\n"
 "%s"
 
-#: src/main.c:1557
+#: src/main.c:1582
 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 "
@@ -6658,7 +6995,7 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它並不完整。這可能是源自於一個無效的 IMAP 帳"
 "號。請嘗試使用郵件箱的最上層資料夾內的\"重建資料夾\"功能進行修復"
 
-#: src/main.c:1563
+#: src/main.c:1588
 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 "
@@ -6667,71 +7004,75 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它無法載入。這可能是源自於一個過時的延伸外掛"
 "程式,請重新安裝外掛程式後,再試一次。"
 
-#: src/main.c:1804
+#: src/main.c:1828
 msgid "Missing filename\n"
 msgstr "找不到案名稱\n"
 
-#: src/main.c:1811
+#: src/main.c:1835
 msgid "Cannot open filename for reading\n"
 msgstr "無法開啟要讀取的檔案名稱\n"
 
-#: src/main.c:1822
+#: src/main.c:1846
 msgid "Malformed header\n"
 msgstr "變形的標頭\n"
 
-#: src/main.c:1829
+#: src/main.c:1853
 msgid "Duplicated 'To:' header\n"
 msgstr "重複的'收件者:'標頭\n"
 
-#: src/main.c:1840
+#: src/main.c:1864
 msgid "Missing required 'To:' header\n"
 msgstr "遺失必要的'收件者:'標頭\n"
 
-#: src/main.c:1866
+#: src/main.c:1888
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "嘗試使用 -h 或 -help 取得用法\n"
 
-#: src/main.c:1893 src/main.c:1956
+#: src/main.c:1917 src/main.c:1980
+#, c-format
 msgid "Missing file argument for option %s"
 msgstr "缺少選項 %s 的參數"
 
-#: src/main.c:1915
+#: src/main.c:1939
+#, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr "缺少選項 %s 的uri參數或該參數是空值"
 
-#: src/main.c:1918
+#: src/main.c:1942
+#, c-format
 msgid "Missing uri argument for option %s"
 msgstr "缺少選項 %s 的uri參數"
 
-#: src/main.c:1951
+#: src/main.c:1975
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr "選項 %s 至少缺了一個有效的參數檔"
 
-#: src/main.c:2020
+#: src/main.c:2044
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr "選項 %s 缺少目錄、型別和需要的參數"
 
-#: src/main.c:2023
+#: src/main.c:2047
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "選項 %s 缺少型別和需要的參數"
 
-#: src/main.c:2026
+#: src/main.c:2050
+#, c-format
 msgid "Missing request argument for option %s"
 msgstr "缺少選項%s要求的參數"
 
-#: src/main.c:2042
+#: src/main.c:2066
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用方式: %s [選項]...\n"
 
-#: src/main.c:2044
+#: src/main.c:2068
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]    開啟新郵件視窗"
 
-#: src/main.c:2045
+#: src/main.c:2069
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6748,11 +7089,11 @@ msgstr ""
 "行,接著是\n"
 "                         郵件的內容,直到檔案結束"
 
-#: src/main.c:2050
+#: src/main.c:2074
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      如果可能的話加入訂閱的 URI"
 
-#: src/main.c:2051
+#: src/main.c:2075
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6762,7 +7103,7 @@ msgstr ""
 "                         以指定的附加檔案開啟新郵件視窗\n"
 "                         "
 
-#: src/main.c:2054
+#: src/main.c:2078
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6772,23 +7113,23 @@ msgstr ""
 "                         以指定的附加檔案夾在新開啟的郵件視窗\n"
 "                         "
 
-#: src/main.c:2057
+#: src/main.c:2081
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新郵件"
 
-#: src/main.c:2058
+#: src/main.c:2082
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帳號的新郵件"
 
-#: src/main.c:2059
+#: src/main.c:2083
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     取消接收郵件"
 
-#: src/main.c:2060
+#: src/main.c:2084
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       取消傳送郵件"
 
-#: src/main.c:2061
+#: src/main.c:2085
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6806,15 +7147,15 @@ msgstr ""
 "                         需求: 尋找字串\n"
 "                         遞迴: 若字串的開頭為 0, n, N, f or F,將會失敗"
 
-#: src/main.c:2068
+#: src/main.c:2092
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 傳送所有暫存的郵件"
 
-#: src/main.c:2069
+#: src/main.c:2093
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示所有郵件的數量"
 
-#: src/main.c:2070
+#: src/main.c:2094
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6822,15 +7163,15 @@ msgstr ""
 "  --status-full [資料夾]...\n"
 "                         顯示每一個資料夾的狀態"
 
-#: src/main.c:2072
+#: src/main.c:2096
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           顯示統計資訊"
 
-#: src/main.c:2073
+#: src/main.c:2097
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     重置統計資訊"
 
-#: src/main.c:2074
+#: src/main.c:2098
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -6840,44 +7181,44 @@ msgstr ""
 "                         資料夾是一個資料夾 id 像是'資料夾/子資料夾',一個"
 "file:// uri或是絕對路徑"
 
-#: src/main.c:2076
+#: src/main.c:2100
 msgid "  --online               switch to online mode"
 msgstr "  --online               切換至上線模式"
 
-#: src/main.c:2077
+#: src/main.c:2101
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切換至離線模式"
 
-#: src/main.c:2078
+#: src/main.c:2102
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       離開 Claws Mail"
 
-#: src/main.c:2079
+#: src/main.c:2103
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d               除錯模式"
 
-#: src/main.c:2080
+#: src/main.c:2104
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         釘住除錯模式"
 
-#: src/main.c:2081
+#: src/main.c:2105
 msgid "  --help -h              display this help"
 msgstr "  --help -h              顯示這個說明"
 
-#: src/main.c:2082
+#: src/main.c:2106
 msgid "  --version -v           output version information"
 msgstr "  --version -v           顯示版本資訊"
 
-#: src/main.c:2083
+#: src/main.c:2107
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr "  --version-full -V      顯示版本資訊及內鍵的功能資訊 "
 
-#: src/main.c:2084
+#: src/main.c:2108
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           顯示配置路徑"
 
-#: src/main.c:2085
+#: src/main.c:2109
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -6885,876 +7226,882 @@ msgstr ""
 "  --alternate-config-dir [路徑]\n"
 "                         使用指定的配置路徑"
 
-#: src/main.c:2087
+#: src/main.c:2111
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
-"							設定主視窗的大小"
+"\t\t\t\t\t\t\t設定主視窗的大小"
 
-#: src/main.c:2104
+#: src/main.c:2128
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "缺少選項 %s 的路徑參數"
 
-#: src/main.c:2112
+#: src/main.c:2136
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "缺少選項 %s 的幾何參數"
 
-#: src/main.c:2123
+#: src/main.c:2147
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "缺少選項 %s 的目錄參數"
 
-#: src/main.c:2156 src/main.c:2159
+#: src/main.c:2180 src/main.c:2183
+#, c-format
 msgid "Unknown option %s"
 msgstr "未知的選項 %s"
 
-#: src/main.c:2175
+#: src/main.c:2199
 #, c-format
 msgid "Processing (%s)..."
 msgstr "處理 (%s)..."
 
-#: src/main.c:2178
+#: src/main.c:2202
 msgid "top level folder"
 msgstr "最上層資料夾"
 
-#: src/main.c:2260
+#: src/main.c:2284
 msgid "Queued messages"
 msgstr "已暫存郵件"
 
-#: src/main.c:2261
+#: src/main.c:2285
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "尚有未傳送郵件在暫存區,確定要離開嗎?"
 
-#: src/main.c:3014
+#: src/main.c:3052
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager(網路管理員):網路是上線的\n"
 
-#: src/main.c:3020
+#: src/main.c:3058
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager(網路管理員):網路是離線的\n"
 
-#: src/mainwindow.c:522 src/messageview.c:211
+#: src/mainwindow.c:515 src/messageview.c:212
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
+#: src/mainwindow.c:517 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:520
 msgid "_Configuration"
 msgstr "設定(_C)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:524
 msgid "_Add mailbox"
 msgstr "新增郵件夾(_A)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:525
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:528
 msgid "Change mailbox order..."
 msgstr "改變郵件夾順序"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:531
 msgid "_Import mbox file..."
 msgstr "匯入mbox檔案"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:532
 msgid "_Export to mbox file..."
 msgstr "匯出mbox檔案"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:533
 msgid "_Export selected to mbox file..."
 msgstr "匯出選擇的項目至mbox檔案"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:535
 msgid "Empty all _Trash folders"
 msgstr "清空所有的垃圾桶"
 
-#: src/mainwindow.c:545 src/messageview.c:220
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "另存電子郵件..."
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:539 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "另存部份郵件"
 
-#: src/mainwindow.c:549 src/messageview.c:222
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "Page setup..."
 msgstr "頁面設定..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:543 src/messageview.c:224
 msgid "_Print..."
 msgstr "列印..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:545
 msgid "Synchronise folders"
 msgstr "同步資料夾"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:547
 msgid "E_xit"
 msgstr "離開"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:552
 msgid "Select _thread"
 msgstr "選擇串列"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:554
 msgid "_Find in current message..."
 msgstr "在目前訊息中尋找(_F)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:556
 msgid "_Quick search"
 msgstr "快速搜尋(_Q)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:559
 msgid "Show or hi_de"
 msgstr "顯示或隱藏(_d)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:560
 msgid "_Toolbar"
 msgstr "工具列(_T)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:562
 msgid "Set displayed _columns"
 msgstr "設定顯示行數(_c)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:563
 msgid "In _folder list..."
 msgstr "在資料夾清單內(_f)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:564
 msgid "In _message list..."
 msgstr "在郵件清單內(_m)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:569
 msgid "La_yout"
 msgstr "佈局(_y)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:571
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:573
 msgid "_Attract by subject"
 msgstr "藉由主旨(_A)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:575
 msgid "E_xpand all threads"
 msgstr "展開所有串列(_x)"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:576
 msgid "Co_llapse all threads"
 msgstr "關閉所有串列(_l)"
 
-#: src/mainwindow.c:585 src/messageview.c:234
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Go to"
 msgstr "前往(_G)"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Previous message"
 msgstr "上一封郵件(_P)"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:580 src/messageview.c:237
 msgid "_Next message"
 msgstr "下一封郵件(_N)"
 
-#: src/mainwindow.c:589 src/messageview.c:238
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "上一封未讀郵件(_r)"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:583 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "下一封未讀郵件(_e)"
 
-#: src/mainwindow.c:592 src/messageview.c:241
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "上一封新郵件(_w)"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:586 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "下一封新郵件(_x)"
 
-#: src/mainwindow.c:595 src/messageview.c:244
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "上一封已標記郵件(_m)"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:589 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "下一封已標記郵件(_a)"
 
-#: src/mainwindow.c:598 src/messageview.c:247
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "上一封已標記郵件(_l)"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:592 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "下一封已標記郵件(_b)"
 
-#: src/mainwindow.c:601 src/messageview.c:250
-msgid "Previous opened message"
+#: src/mainwindow.c:594
+msgid "Previously opened message"
 msgstr "上一封已開啟郵件"
 
-#: src/mainwindow.c:602 src/messageview.c:251
+#: src/mainwindow.c:595 src/messageview.c:252
 msgid "Next opened message"
 msgstr "下一封已開啟郵件"
 
-#: src/mainwindow.c:604 src/messageview.c:253
+#: src/mainwindow.c:597 src/messageview.c:254
 msgid "Parent message"
 msgstr "父郵件"
 
-#: src/mainwindow.c:606 src/messageview.c:255
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "下一個未讀資料夾(_f)"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:600 src/messageview.c:257
 msgid "F_older..."
 msgstr "資料夾"
 
-#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "下一個部份"
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:603 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "上一個部份"
 
-#: src/mainwindow.c:613 src/messageview.c:260
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Message scroll"
 msgstr "郵件捲動"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Previous line"
 msgstr "上一行"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:608 src/messageview.c:263
 msgid "Next line"
 msgstr "下一行"
 
-#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr "上一頁"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:610 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr "下一頁"
 
-#: src/mainwindow.c:635 src/messageview.c:282
+#: src/mainwindow.c:628 src/messageview.c:283
 msgid "Decode"
 msgstr "解碼"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:635
 msgid "Open in new _window"
 msgstr "在新視窗開啟(_w)"
 
-#: src/mainwindow.c:643 src/messageview.c:289
+#: src/mainwindow.c:636 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "信件來源(_a)"
 
-#: src/mainwindow.c:645 src/messageview.c:290
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "Message part"
 msgstr "部份信件"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:639 src/messageview.c:292
 msgid "View as text"
 msgstr "以文字模式檢視"
 
-#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:640 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "開啟"
 
-#: src/mainwindow.c:649 src/messageview.c:294
+#: src/mainwindow.c:642 src/messageview.c:295
 msgid "Open with..."
 msgstr "以...開啟"
 
-#: src/mainwindow.c:653 src/messageview.c:297
+#: src/mainwindow.c:646 src/messageview.c:298
 msgid "Quotes"
 msgstr "引言"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:648
 msgid "_Update summary"
 msgstr "更新結果(_U)"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:651
 msgid "Recei_ve"
 msgstr "接收(_V)"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:652
 msgid "Get from _current account"
 msgstr "從目前的帳號取得(_c)"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:653
 msgid "Get from _all accounts"
 msgstr "從所有的帳號取得(_a)"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:654
 msgid "Cancel receivin_g"
 msgstr "終止接收(_g)"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:657
 msgid "_Send queued messages"
 msgstr "傳送暫存郵件(_S)"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:662
 msgid "Compose a_n email message"
 msgstr "新增郵件(_n)"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:663
 msgid "Compose a news message"
 msgstr "新增郵件"
 
-#: src/mainwindow.c:672 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
+#: src/mainwindow.c:665 src/messageview.c:304
+#: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
+#: src/mainwindow.c:666 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr "回覆給(_y)"
 
-#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
+#: src/mainwindow.c:669 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr "郵件清單(_l)"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:670
 msgid "Follow-up and reply to"
 msgstr "轉送及回覆"
 
-#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
-#: src/toolbar.c:2449
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:433
+#: src/toolbar.c:2491
 msgid "_Forward"
 msgstr "轉送(_F)"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
-#: src/toolbar.c:2450
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:434
+#: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr "以夾檔方式轉送(_w)"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
-#: src/toolbar.c:2451
+#: src/mainwindow.c:675 src/messageview.c:313 src/summaryview.c:435
+#: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr "重新導向(_t)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:677
 msgid "Mailing-_List"
 msgstr "郵件清單(_L)"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:678
 msgid "Post"
 msgstr "傳送"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:680
 msgid "Help"
 msgstr "協助"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:684
 msgid "Unsubscribe"
 msgstr "退訂"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:686
 msgid "View archive"
 msgstr "檢視封存"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:688
 msgid "Contact owner"
 msgstr "連絡人擁有者"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:692
 msgid "M_ove..."
 msgstr "移動(_o)..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:693
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:694
 msgid "Move to _trash"
 msgstr "移至垃圾桶(_t)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:695
 msgid "_Delete..."
 msgstr "刪除(_D)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:696
 msgid "Move thread to tr_ash"
 msgstr "移至垃圾桶(_a)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:697
 msgid "Delete t_hread"
 msgstr "刪除串列(_h)"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:698
 msgid "Cancel a news message"
 msgstr "取消新郵件"
 
-#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
+#: src/mainwindow.c:701 src/mainwindow.c:702 src/summaryview.c:436
 msgid "_Mark"
 msgstr "標記(_M)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr "移除標記(_U)"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr "標記為已讀(_d)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr "標記為未讀(_e)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr "標記所有為已讀"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr "標記所有為未讀"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
-#: src/toolbar.c:503
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "忽略串列"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr "不忽略串列"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
-#: src/toolbar.c:504
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "以串列檢視"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr "不以串列檢視"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr "標記為垃圾郵件(_s)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr "標記為非垃圾郵件(_h)"
 
-#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr "上鎖"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr "解鎖"
 
-#: src/mainwindow.c:732 src/summaryview.c:441
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "顏色標記(_b)"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr "標籤(_g)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr "重新編輯(_e)"
 
-#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr "檢查簽名"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "新增寄件者至通訊錄(_k)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr "郵件地址分類(_o)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr "從目前的資料夾(_f)..."
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr "從選擇的郵件(_m)..."
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr "過濾資料夾中所有的郵件(_F)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr "過濾所有選擇的郵件(_s)"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr "執行資料夾規則(_o)"
 
-#: src/mainwindow.c:755 src/messageview.c:320
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "建立過濾器規則(_C)"
 
-#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
+#: src/messageview.c:329
 msgid "_Automatically"
 msgstr "自動地(_A)"
 
-#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
+#: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "根據寄件者(_F)"
 
-#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
-#: src/messageview.c:323 src/messageview.c:329
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
+#: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "根據收件者(_T)"
 
-#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
-#: src/messageview.c:330
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
+#: src/messageview.c:332
 msgid "By _Subject"
 msgstr "根據主旨(_S)"
 
-#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/messageview.c:326
+#: src/messageview.c:333
+msgid "By S_ender"
+msgstr "寄件者"
+
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr "建立執行規則"
 
-#: src/mainwindow.c:768 src/messageview.c:333
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "列出URLs(_U)..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr "檢查所有資料夾內的新郵件(_e)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr "刪除重覆的郵件(_p)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr "在選擇的資料夾內"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr "在所有的資料夾內"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr "執行(_x)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr "刪除(_u)"
 
-#: src/mainwindow.c:785
-msgid "SSL/TLS cer_tificates"
+#: src/mainwindow.c:780
+msgid "TLS cer_tificates"
 msgstr "SSL/TLS 認證(_t)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr "過濾日誌(_g)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr "網路日誌(_L)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr "偵錯 log(_L)"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr "消除所有(_F)"
 
-#: src/mainwindow.c:796
-msgid "Forget _master passphrase"
+#: src/mainwindow.c:791
+msgid "Forget _primary passphrase"
 msgstr "消除所有(_F)"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr "更改目前帳號(_h)"
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr "目前帳號設定(_P)..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr "新增帳號(_n)"
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr "編輯帳號(_E)"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr "選項(_r)..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr "前處理(_o)..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr "後處理(_c)..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr "過濾器(_F)..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr "樣板(_T)..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr "動作(_A)..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr "標籤(_s)..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr "外掛(_g)..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr "手冊(_M)"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr "線上協助 FAQ(_O)"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr "圖示說明(_L)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr "設置為預設客戶端"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr "離線模式(_m)"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr "選單列(_u)"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr "郵件檢視(_M)"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr "狀態列(_b)"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr "標頭列"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr "串列檢視(_r)"
 
-#: src/mainwindow.c:837 src/prefs_summaries.c:667
+#: src/mainwindow.c:832 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "隱藏讀取串列"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr "隱藏讀取郵件(_H)"
 
-#: src/mainwindow.c:839 src/prefs_summaries.c:673
+#: src/mainwindow.c:834 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "隱藏刪除郵件"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: src/mainwindow.c:841 src/messageview.c:345
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "顯示所有標頭(_h)"
 
-#: src/mainwindow.c:842 src/messageview.c:346
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "全部折疊(_C)"
 
-#: src/mainwindow.c:843 src/messageview.c:347
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "從第二層開始折疊(_2)"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "從第三層開始折疊(_3)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr "圖示下方顯示字串(_b)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr "圖示旁顯示字串(_s)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr "只顯示圖示(_I)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr "只顯示字串(_T)"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr "標準(_S)"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr "三欄(_T)"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr "寬郵件(_W)"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr "寬郵件清單(_i)"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr "小螢幕(_m)"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr "根據數值(_n)"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr "根據大小(_i)"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr "根據日期(_d)"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr "根據串列日期"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr "根據主旨(_u)"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "根據標籤顏色(_c)"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr "根據標籤"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr "根據標記(_m)"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr "根據狀態(_s)"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr "根據附加檔案(_t)"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr "根據分數"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr "根據鎖定"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr "不排序(_o)"
 
-#: src/mainwindow.c:884 src/prefs_summaries.c:654
+#: src/mainwindow.c:879 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "升冪"
 
-#: src/mainwindow.c:885 src/prefs_summaries.c:655
+#: src/mainwindow.c:880 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "降冪"
 
-#: src/mainwindow.c:927 src/messageview.c:390
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "自動偵測(_A)"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6499
-msgid "Apply tags..."
+#: src/mainwindow.c:1297 src/summaryview.c:6489
+msgid "Modify tags..."
 msgstr "指定標籤"
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr "發生一些錯誤,點選這裡以檢視日誌"
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr "目前是上線狀態,按下圖示進入離線狀態"
 
-#: src/mainwindow.c:1979
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr "目前是離線狀態,按下圖示進入上線狀態"
 
-#: src/mainwindow.c:1993
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr "選擇帳號"
 
-#: src/mainwindow.c:2020 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "網路日誌"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr "過濾器/執行除錯日誌"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "開啟過濾器日誌\n"
 
-#: src/mainwindow.c:2045 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "關閉過濾器日誌\n"
 
-#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
-#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
+#: src/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:1087
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr "無標題的"
 
-#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:2897 src/mainwindow.c:2902
+#: src/mainwindow.c:2869 src/mainwindow.c:2874
 msgid "Delete all messages in trash folders?"
 msgstr "刪除回收桶中所有的郵件"
 
-#: src/mainwindow.c:2898
+#: src/mainwindow.c:2870
 msgid "Don't quit"
 msgstr "不要離開"
 
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2901 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr "新增郵件夾"
 
-#: src/mainwindow.c:2930
+#: src/mainwindow.c:2902
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7766,18 +8113,18 @@ msgstr ""
 "如果指定的郵件箱已經存在,它將會被自動地發現\n"
 " "
 
-#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2910 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "郵件夾 '%s' 已經存在"
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:742
+#: src/mainwindow.c:2915 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/wizard.c:741
 msgid "Mailbox"
 msgstr "郵件夾"
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7786,167 +8133,171 @@ msgstr ""
 "郵件箱建立失敗\n"
 "可能有部份檔案已經存在,或是沒有足夠的存取權限"
 
-#: src/mainwindow.c:3415
+#: src/mainwindow.c:3387
 msgid "No posting allowed"
 msgstr "不允許發郵件"
 
-#: src/mainwindow.c:3997
+#: src/mainwindow.c:3947
 msgid "Mbox import has failed."
 msgstr "Mbox 匯入失敗"
 
-#: src/mainwindow.c:4006 src/mainwindow.c:4015
+#: src/mainwindow.c:3956 src/mainwindow.c:3965
 msgid "Export to mbox has failed."
 msgstr "匯出至 mbox 失敗"
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4006 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr "離開 Clasw Mail?"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4007
+msgid "_Quit"
+msgstr "離開中"
+
+#: src/mainwindow.c:4208
 msgid "Folder synchronisation"
 msgstr "資料夾同步"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4209
 msgid "Do you want to synchronise your folders now?"
 msgstr "同步資料夾?"
 
-#: src/mainwindow.c:4259
+#: src/mainwindow.c:4210
 msgid "_Synchronise"
 msgstr "同步(_S)"
 
-#: src/mainwindow.c:4737
+#: src/mainwindow.c:4693
 msgid "Deleting duplicated messages..."
 msgstr "正在刪除重複的郵件..."
 
-#: src/mainwindow.c:4747
+#: src/mainwindow.c:4703
 msgid "No duplicate message found in selected folder.\n"
 msgstr "選擇的路徑中沒有重複的郵件\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4709
 #, 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:4757
+#: src/mainwindow.c:4713
 #, 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:4795
+#: src/mainwindow.c:4751
 msgid "Deleting duplicated messages in all folders..."
 msgstr "正在所有的路徑中刪除重複的郵件..."
 
-#: src/mainwindow.c:4801
+#: src/mainwindow.c:4757
 #, 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:4806
+#: src/mainwindow.c:4762
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "資料夾 %d 內沒有重複的郵件\n"
 
-#: src/mainwindow.c:4968 src/messageview.c:2634
+#: src/mainwindow.c:4924 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr "選擇要前往的資料夾"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5942
+#: src/mainwindow.c:5027 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr "在資料夾的規則進行前套用"
 
-#: src/mainwindow.c:5077
+#: src/mainwindow.c:5035
 msgid "Processing rules to apply after folder rules"
 msgstr "在資料夾的規則進行後套用"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5953
+#: src/mainwindow.c:5043 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr "過濾配置"
 
-#: src/mainwindow.c:5200
+#: src/mainwindow.c:5156
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入取得可執行的路徑"
 
-#: src/mainwindow.c:5259
+#: src/mainwindow.c:5247
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail 已註冊為預設客戶端郵件程式"
 
-#: src/mainwindow.c:5261
+#: src/mainwindow.c:5249
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入 registry"
 
-#: src/mainwindow.c:5275 src/setup.c:91
+#: src/mainwindow.c:5263 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "掃描資料夾 %s%c%s..."
 
-#: src/mainwindow.c:5419
+#: src/mainwindow.c:5407
 #, 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:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
-#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
+#: 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
 #, c-format
 msgid "%s header"
 msgstr "%s 標頭"
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header"
 msgstr "標頭"
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "header line"
 msgstr "標頭線"
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "body line"
 msgstr "內容線"
 
-#: src/matcher.c:228
+#: src/matcher.c:227
 msgid "tag"
 msgstr "標籤"
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
-#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 msgid "Case insensitive"
 msgstr "不區分大小寫"
 
-#: src/matcher.c:1903
+#: src/matcher.c:1902
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "檢查郵件是否相符 [ %s ]\n"
 
-#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
+#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
 msgid "message matches\n"
 msgstr "郵件相符\n"
 
-#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
+#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
 msgid "message does not match\n"
 msgstr "郵件不相符\n"
 
-#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
-#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
+#: 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
 msgid "(none)"
 msgstr "(空)"
 
-#: src/mbox.c:98
+#: src/mbox.c:94
 #, c-format
 msgid ""
 "Could not stat mbox file:\n"
@@ -7955,7 +8306,7 @@ msgstr ""
 "無法建立 mbox 檔案\n"
 "%s\n"
 
-#: src/mbox.c:104
+#: src/mbox.c:100
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -7964,26 +8315,26 @@ msgstr ""
 "無法開啟 mbox 檔案:\n"
 "%s\n"
 
-#: src/mbox.c:142
+#: src/mbox.c:138
 #, c-format
 msgid "Importing from mbox... (%ld MB imported)"
 msgid_plural "Importing from mbox... (%ld MB imported)"
 msgstr[0] "從 mbox 匯入... (%ld 郵件已匯入)"
 msgstr[1] "從 mbox 匯入... (%ld 郵件已匯入)"
 
-#: src/mbox.c:550
+#: src/mbox.c:547
 msgid "Overwrite mbox file"
 msgstr "覆寫 mbox 檔案"
 
-#: src/mbox.c:551
+#: src/mbox.c:548
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "此檔案已經鄉在,要覆寫嗎?"
 
-#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
+#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: src/mbox.c:561
+#: src/mbox.c:558
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7992,7 +8343,7 @@ msgstr ""
 "無法建立 mbox 檔案\n"
 "%s\n"
 
-#: src/mbox.c:565
+#: src/mbox.c:562
 msgid "Exporting to mbox..."
 msgstr "匯出 mobx..."
 
@@ -8004,11 +8355,11 @@ msgstr "在目前郵件中搜尋"
 msgid "Find text:"
 msgstr "尋找字串:"
 
-#: src/message_search.c:318 src/summary_search.c:779
+#: src/message_search.c:318 src/summary_search.c:783
 msgid "Search failed"
 msgstr "搜尋失敗"
 
-#: src/message_search.c:319 src/summary_search.c:780
+#: src/message_search.c:319 src/summary_search.c:784
 msgid "Search string not found."
 msgstr "找不到字串"
 
@@ -8020,23 +8371,27 @@ msgstr "已到達郵件的開始處,從最後面開始搜尋嗎?"
 msgid "End of message reached; continue from beginning?"
 msgstr "已到達郵件的尾端,從最前面開始搜尋嗎?"
 
-#: src/message_search.c:334 src/summary_search.c:791
+#: src/message_search.c:334 src/summary_search.c:796
 msgid "Search finished"
 msgstr "搜尋完畢"
 
-#: src/messageview.c:300 src/textview.c:249
+#: src/messageview.c:251
+msgid "Previous opened message"
+msgstr "上一封已開啟郵件"
+
+#: src/messageview.c:301 src/textview.c:248
 msgid "Compose _new message"
 msgstr "寫新郵件(_n)"
 
-#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
+#: src/messageview.c:717 src/messageview.c:1442 src/messageview.c:1593
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - 郵件視窗"
 
-#: src/messageview.c:845
+#: src/messageview.c:848
 msgid "<No Return-Path found>"
 msgstr "<找不到回覆路徑>"
 
-#: src/messageview.c:852
+#: src/messageview.c:855
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8051,52 +8406,52 @@ msgstr ""
 "回覆路徑: %s\n"
 "建議你不要傳送回條"
 
-#: src/messageview.c:859
+#: src/messageview.c:862
 msgid "_Don't Send"
 msgstr "不傳送(_D)"
 
-#: src/messageview.c:1366
+#: src/messageview.c:1372
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "取得郵件 (%s)..."
 
-#: src/messageview.c:1402 src/procmime.c:957
+#: src/messageview.c:1408 src/procmime.c:1026
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "無法解碼: %s"
 
-#: src/messageview.c:1483 src/messageview.c:1491
+#: src/messageview.c:1489 src/messageview.c:1497
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "郵件不符合 MIME 標準,可能解讀錯誤"
 
-#: src/messageview.c:1868
+#: src/messageview.c:1881
 #, c-format
 msgid "Show all %s."
 msgstr "顯示全部 %s"
 
-#: src/messageview.c:1870
+#: src/messageview.c:1883
 msgid "Only the first megabyte of text is shown."
 msgstr "只有文字中第一個 megabyte 會顯示"
 
-#: src/messageview.c:1901
+#: src/messageview.c:1914
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "你已收到此郵件的回條:接收者將會看到"
 
-#: src/messageview.c:1904
+#: src/messageview.c:1917
 msgid "You asked for a return receipt in this message."
 msgstr "你在此郵件中要求回覆回條"
 
-#: src/messageview.c:1910
+#: src/messageview.c:1923
 msgid "This message asks for a return receipt."
 msgstr "此郵件要求回覆回條"
 
-#: src/messageview.c:1911
+#: src/messageview.c:1924
 msgid "Send receipt"
 msgstr "傳送回條"
 
-#: src/messageview.c:1954
+#: src/messageview.c:1967
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8104,7 +8459,7 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "而且已經待伺服器被刪除"
 
-#: src/messageview.c:1960
+#: src/messageview.c:1973
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8113,15 +8468,15 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s"
 
-#: src/messageview.c:1964 src/messageview.c:1986
+#: src/messageview.c:1977 src/messageview.c:1999
 msgid "Mark for download"
 msgstr "標示欲下載項目"
 
-#: src/messageview.c:1965 src/messageview.c:1977
+#: src/messageview.c:1978 src/messageview.c:1990
 msgid "Mark for deletion"
 msgstr "標示欲刪除項目"
 
-#: src/messageview.c:1970
+#: src/messageview.c:1983
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8130,12 +8485,12 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被下載"
 
-#: src/messageview.c:1975 src/messageview.c:1988
-#: src/prefs_filtering_action.c:176 src/toolbar.c:506
+#: src/messageview.c:1988 src/messageview.c:2001
+#: src/prefs_filtering_action.c:174 src/toolbar.c:516
 msgid "Unmark"
 msgstr "未標示"
 
-#: src/messageview.c:1981
+#: src/messageview.c:1994
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8144,7 +8499,7 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被刪除"
 
-#: src/messageview.c:2058
+#: src/messageview.c:2071
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8158,20 +8513,15 @@ msgstr ""
 "並沒有給你官方郵件地址\n"
 "建議你不要傳送回條"
 
-#: src/messageview.c:2066 src/messageview.c:2074
+#: src/messageview.c:2079 src/messageview.c:2086
 msgid "Return Receipt Notification"
 msgstr "回覆回條通知"
 
-#: src/messageview.c:2068 src/messageview.c:2079
-#: src/plugins/rssyl/rssyl_feed_props.c:496
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2080 src/messageview.c:2091
 msgid "_Send Notification"
 msgstr "傳送通知(_S)"
 
-#: src/messageview.c:2075
+#: src/messageview.c:2087
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8181,11 +8531,11 @@ msgstr ""
 "超過一個帳號使用了此郵件的收件者地址\n"
 "請選擇一個帳號用來傳送回條通知"
 
-#: src/messageview.c:2171 src/messageview.c:2190
+#: src/messageview.c:2183 src/messageview.c:2202
 msgid "Cannot print: the message doesn't contain text."
 msgstr "無法列印:此郵件不包含文字"
 
-#: src/messageview.c:2944
+#: src/messageview.c:2958
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8193,7 +8543,7 @@ msgstr ""
 "\n"
 "  此資料夾內沒有郵件"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2966
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8201,7 +8551,7 @@ msgstr ""
 "\n"
 "  郵件已被刪除"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8209,8 +8559,8 @@ msgstr ""
 "\n"
 "  郵件已被刪除或移至其它資料夾"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
-#: src/summaryview.c:7302
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
+#: src/summaryview.c:7294
 msgid "An error happened while learning.\n"
 msgstr "學習過程中發生錯誤\n"
 
@@ -8218,15 +8568,15 @@ msgstr "學習過程中發生錯誤\n"
 msgid "Moving messages..."
 msgstr "移動郵件..."
 
-#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:836
 msgid "Deleting messages..."
 msgstr "刪除郵件..."
 
-#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
+#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:68
 msgid "Remove _mailbox..."
 msgstr "移除郵件箱(_m)..."
 
-#: src/mh_gtk.c:222
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8237,7 +8587,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:373 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
@@ -8246,11 +8596,11 @@ msgstr ""
 "確定要移除郵件箱 '%s'嗎?\n"
 "(這些郵件將不會從碟磁中被移除)"
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr "移除郵件箱"
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -8258,7 +8608,7 @@ msgstr "開啟(_O)"
 msgid "Open _with..."
 msgstr "以...開啟(_w)"
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:172
+#: src/mimeview.c:225 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr "複制"
 
@@ -8282,114 +8632,122 @@ msgstr "全部儲存(_a)"
 msgid "MIME Type"
 msgstr "MINI格式"
 
-#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
-#: src/mimeview.c:1068
+#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
+#: src/mimeview.c:1072
 msgid "View full information"
 msgstr "顯示完整資訊"
 
-#: src/mimeview.c:1074
+#: src/mimeview.c:1079
 msgid "Check again"
 msgstr "再檢查一次"
 
-#: src/mimeview.c:1086
+#: src/mimeview.c:1092
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s 點選圖示去檢查它"
 
-#: src/mimeview.c:1088
+#: src/mimeview.c:1094
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s 點選圖示或點擊'%s'去檢查它 "
 
-#: src/mimeview.c:1098
+#: src/mimeview.c:1101
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "檢查簽章超時,點選圖示再試一次"
 
-#: src/mimeview.c:1100
+#: src/mimeview.c:1103
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr "檢查簽章超時,點選圖示或點擊'%s'再試一次"
 
-#: src/mimeview.c:1345
+#: src/mimeview.c:1110
+msgid "Error checking the signature. Click the icon to try again."
+msgstr "檢查簽章超時,點選圖示再試一次"
+
+#: src/mimeview.c:1112
+msgid "Error checking the signature. Click the icon or hit '%s' to try again."
+msgstr "檢查簽章超時,點選圖示或點擊'%s'再試一次"
+
+#: src/mimeview.c:1231
 msgid "Checking signature..."
 msgstr "檢查簽章..."
 
-#: src/mimeview.c:1386
+#: src/mimeview.c:1286
 msgid "Go back to email"
 msgstr "回到電子郵件"
 
-#: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
-#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
+#: 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
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "無法儲存多重郵件的一個部份:%s"
 
-#: src/mimeview.c:1894
+#: src/mimeview.c:1815
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆寫已存在的檔案 '%s' 嗎?"
 
-#: src/mimeview.c:1918
-#, c-format
+#: src/mimeview.c:1840
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"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:1921
-msgid "Error saving all message parts"
+#: src/mimeview.c:1843
+msgid "Error saving message part"
 msgstr "儲存所有郵件發生錯誤"
 
-#: src/mimeview.c:1922
-msgid "Skip"
-msgstr "跳過"
+#: src/mimeview.c:1844
+msgid "Ignore"
+msgstr "忽略:"
 
-#: src/mimeview.c:1922
-msgid "Skip all"
-msgstr "跳過全部"
+#: src/mimeview.c:1844
+msgid "Ignore all"
+msgstr "忽略串列"
 
-#: src/mimeview.c:1932
+#: src/mimeview.c:1856
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
-#: src/mimeview.c:1940
+#: src/mimeview.c:1868
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
-#: src/mimeview.c:1945
+#: src/mimeview.c:1873
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s,%d 檔案失敗"
 msgstr[1] "%s,%d 檔案失敗"
 
-#: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1910 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "選擇目的資料夾"
 
-#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1917 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s'並不是一個路徑"
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
-#: src/summaryview.c:5035
+#: src/mimeview.c:2035 src/plugins/fancy/fancy_viewer.c:813
+#: src/summaryview.c:5017
 msgid "Save as"
 msgstr "另存新檔"
 
-#: src/mimeview.c:2232 src/mimeview.c:2239
+#: src/mimeview.c:2165 src/mimeview.c:2172
 msgid "Open with"
 msgstr "以...開啟"
 
-#: src/mimeview.c:2233 src/mimeview.c:2240
+#: src/mimeview.c:2166 src/mimeview.c:2173
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8398,7 +8756,7 @@ msgstr ""
 "輸入命令列以開啟檔案:\n"
 "('%s' 將被用檔名覆蓋)"
 
-#: src/mimeview.c:2335
+#: src/mimeview.c:2268
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8409,11 +8767,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2276
 msgid "Execute untrusted binary?"
 msgstr "要執行不信任的二進制檔案嗎?"
 
-#: src/mimeview.c:2344
+#: src/mimeview.c:2277
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8425,22 +8783,22 @@ msgstr ""
 "\n"
 "你仍希望執行這個檔案嗎?"
 
-#: src/mimeview.c:2348
+#: src/mimeview.c:2281
 msgid "Run binary"
 msgstr "執行二進制檔"
 
-#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2583
 msgid "Type:"
 msgstr "型式:"
 
-#: src/mimeview.c:2652 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2788
+#: src/mimeview.c:2584 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr "大小:"
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1242
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
+#: src/mimeview.c:2598 src/plugins/vcalendar/vcalendar.c:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
 msgstr "描述:"
 
@@ -8487,34 +8845,34 @@ msgstr "Claws Mail 需要網路才能存取新聞伺服器"
 msgid "couldn't select group: %s\n"
 msgstr "無法選擇群組: %s\n"
 
-#: src/news.c:1067 src/news.c:1253
+#: src/news.c:1068 src/news.c:1254
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "無法設定群組: %s\n"
 
-#: src/news.c:1076
+#: src/news.c:1077
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無效的文章範圍 %d - %d\n"
 
-#: src/news.c:1154 src/news.c:1181 src/news.c:1208
+#: src/news.c:1155 src/news.c:1182 src/news.c:1209
 msgid "couldn't get xhdr\n"
 msgstr "無法取得 xhdr\n"
 
-#: src/news.c:1246
+#: src/news.c:1247
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "取得 xover %d - %d 於 %s 內...\n"
 
-#: src/news.c:1261
+#: src/news.c:1262
 msgid "couldn't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: src/news.c:1278
+#: src/news.c:1279
 msgid "invalid xover line\n"
 msgstr "無效的 xover 線\n"
 
-#: src/news.c:1480
+#: src/news.c:1481
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8543,71 +8901,81 @@ msgstr "真的要取消訂閱新聞群組 '%s' 嗎?"
 msgid "Unsubscribe newsgroup"
 msgstr "取消訂閱新聞群組"
 
-#: src/news_gtk.c:291
+#: src/news_gtk.c:294
 msgid "Rename newsgroup folder"
 msgstr "新聞群組資料夾重新命名"
 
-#: src/oauth2.c:238
-msgid "OAuth2 missing authentication code\n"
+#: src/oauth2.c:241
+msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 缺少認證碼\n"
 
-#: src/oauth2.c:244 src/oauth2.c:359
+#: src/oauth2.c:247 src/oauth2.c:388
 msgid "OAuth2 connection error\n"
 msgstr "OAuth2 連線錯誤\n"
 
-#: src/oauth2.c:253 src/oauth2.c:367
-msgid "OAuth2 SSL connection error\n"
+#: src/oauth2.c:257 src/oauth2.c:397
+msgid "OAuth2 TLS connection error\n"
 msgstr "OAuth2 SSL 連線錯誤\n"
 
-#: src/oauth2.c:311 src/oauth2.c:418
+#: src/oauth2.c:336 src/oauth2.c:470
 msgid "OAuth2 access token obtained\n"
 msgstr "已取得OAuth2 的取存token\n"
 
-#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+#: src/oauth2.c:338 src/oauth2.c:472 src/oauth2.c:648
 msgid "OAuth2 access token not obtained\n"
 msgstr "未取得OAuth2 的取存token\n"
 
-#: src/oauth2.c:320
+#: src/oauth2.c:345
 msgid "OAuth2 refresh token obtained\n"
 msgstr "已取得OAuth2 的更新token\n"
 
-#: src/oauth2.c:322
+#: src/oauth2.c:347
 msgid "OAuth2 refresh token not obtained\n"
 msgstr "未取得OAuth2 的更新token\n"
 
-#: src/oauth2.c:452
+#: src/oauth2.c:479
+msgid "OAuth2 replacement refresh token provided\n"
+msgstr "已取得OAuth2 的更新token\n"
+
+#: src/oauth2.c:481
+msgid "OAuth2 replacement refresh token not provided\n"
+msgstr "未取得OAuth2 的更新token\n"
+
+#: src/oauth2.c:512
 msgid "OAuth2 socket write error\n"
 msgstr "OAuth2 Socket寫入錯誤\n"
 
-#: src/oauth2.c:472
-msgid "OAuth2 socket timeout error \n"
+#: src/oauth2.c:534
+msgid "OAuth2 socket timeout error\n"
 msgstr "OAuth2 socket 逾時錯誤\n"
 
-#: src/oauth2.c:528
+#: src/oauth2.c:628
 msgid "OAuth2 access token still fresh\n"
 msgstr "OAuth2 存取token仍有效\n"
 
-#: src/oauth2.c:534
+#: src/oauth2.c:635
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr "OAuth2 正以更新token取得存取token\n"
 
-#: src/oauth2.c:538
-msgid "OAuth2 trying for fresh access token with auth code\n"
+#: src/oauth2.c:639
+msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 正以認證碼嘗試更新存取token\n"
 
-#: src/oauth2.c:552
-msgid "OAuth2 access token updated\n"
+#: src/oauth2.c:656
+msgid "OAuth2 access and refresh token updated\n"
 msgstr "OAuth2 存取token已更新\n"
 
-#: src/oauth2.c:583
+#: src/oauth2.c:688
+#, c-format
 msgid "OAuth2 original: %s\n"
 msgstr "OAuth2 原始的:%s\n"
 
-#: src/oauth2.c:584
+#: src/oauth2.c:689
+#, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr "OAuth2 已加密: %s\n"
 
-#: src/oauth2.c:585
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -8617,50 +8985,50 @@ msgstr ""
 "\n"
 
 #: src/password.c:128 src/password.c:129
-msgid "Input master passphrase"
+msgid "Input primary passphrase"
 msgstr "在鍵入密碼時擷取輸入內容"
 
 #: src/password.c:141
-msgid "Incorrect master passphrase."
+msgid "Incorrect primary passphrase."
 msgstr "不正確的區塊"
 
-#: src/password_gtk.c:67
+#: src/password_gtk.c:66
 msgid "New passphrases do not match, try again."
 msgstr "密碼不同"
 
-#: src/password_gtk.c:80
-msgid "Incorrect old master passphrase entered, try again."
+#: src/password_gtk.c:79
+msgid "Incorrect old primary passphrase entered, try again."
 msgstr "不正確的舊有慣用詞,請重新輸入"
 
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
+#: src/password_gtk.c:143
+msgid "Changing primary passphrase"
 msgstr "修改慣用詞"
 
-#: src/password_gtk.c:165
+#: src/password_gtk.c:164
 msgid ""
-"If a master passphrase is currently active, it\n"
+"If a primary passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
 "如果目前已經啟用慣用詞功能,\n"
 "那需要輸入它"
 
-#: src/password_gtk.c:175
+#: src/password_gtk.c:174
 msgid "Old passphrase:"
 msgstr "錯誤的密碼"
 
-#: src/password_gtk.c:191
+#: src/password_gtk.c:188
 msgid "New passphrase:"
 msgstr "密碼"
 
-#: src/password_gtk.c:202
+#: src/password_gtk.c:199
 msgid "Confirm passphrase:"
 msgstr "錯誤的密碼"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:53
+#: src/plugins/acpi_notifier/acpi_notifier.c:54
 msgid "Acpi Notifier"
 msgstr "Acpi 提示器"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:70
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8668,7 +9036,7 @@ msgstr ""
 "請確認核心模組 'acerhk' 是否已載入\n"
 "可以從 http://www.cakey.de/acerhk/ 取得"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:72
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8676,19 +9044,19 @@ msgstr ""
 "請確認核心模組 'acer_acpi' 是否已載入\n"
 "可以從 http://code.google.com/p/aceracpi/ 取得"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "請確認核心模組 'asus_laptop' 是否已載入"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "請確認核心模組 'asus_acpi' 是否已載入"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "ibm_acpi' 是否已載入"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:77
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8696,78 +9064,79 @@ msgstr ""
 "請確認是否已安裝apanelc\n"
 "可以從 http://apanel.sourceforge.net/ 取得"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:209
-#: src/plugins/acpi_notifier/acpi_notifier.c:215
-#: src/plugins/acpi_notifier/acpi_notifier.c:427
+#: 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 "控制檔案不存在"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:299
 msgid " : no new or unread mail"
 msgstr " : 沒有新聞或未讀郵件"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:300
 msgid " : unread mail"
 msgstr " : 沒有未讀郵件"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:301
 msgid " : new mail"
 msgstr " : 新郵件"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:311
-#: src/plugins/acpi_notifier/acpi_notifier.c:317
-#: src/plugins/acpi_notifier/acpi_notifier.c:323
+#: src/plugins/acpi_notifier/acpi_notifier.c:303
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
 msgid "off"
 msgstr "關閉"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:313
-#: src/plugins/acpi_notifier/acpi_notifier.c:319
-#: src/plugins/acpi_notifier/acpi_notifier.c:325
+#: 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 "閃爍"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-#: src/plugins/acpi_notifier/acpi_notifier.c:327
+#: 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 "開啟"
 
+#: src/plugins/acpi_notifier/acpi_notifier.c:340
 #: src/plugins/acpi_notifier/acpi_notifier.c:349
-#: src/plugins/acpi_notifier/acpi_notifier.c:358
-#: src/plugins/acpi_notifier/acpi_notifier.c:373
+#: src/plugins/acpi_notifier/acpi_notifier.c:364
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:388
+#: src/plugins/acpi_notifier/acpi_notifier.c:379
 msgid "ACPI type: "
 msgstr "ACPI 型式: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:397
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI file: "
 msgstr "ACPI 檔案:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:408
+#: src/plugins/acpi_notifier/acpi_notifier.c:399
 msgid "values - On: "
 msgstr "數值 - 開啟: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:413
+#: src/plugins/acpi_notifier/acpi_notifier.c:404
 msgid " - Off: "
 msgstr " - 關閉: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:435
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
 msgid "Blink when user interaction is required"
 msgstr "當使用者內部需求時閃爍"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:869
+#: src/plugins/acpi_notifier/acpi_notifier.c:852
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "此外掛程式控制 ACPI 郵件 LEDs 的改變"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:890
+#: src/plugins/acpi_notifier/acpi_notifier.c:873
 msgid "Laptop LED"
 msgstr "桌上型由腦 LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
 #: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/keyword_warner/keyword_warner.c:230
 msgid "Failed to register check before send hook"
 msgstr "在傳送的 hook 前註冊檢查失敗"
 
@@ -8777,49 +9146,49 @@ msgstr "保留所有的回條地址在一個通訊錄資料夾內"
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:274
+#: src/plugins/address_keeper/address_keeper_prefs.c:281
 msgid "Address Keeper"
 msgstr "地址保留器"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:108
+#: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Address book location"
 msgstr "通訊錄位置"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:113
+#: src/plugins/address_keeper/address_keeper_prefs.c:116
 msgid "Keep to folder"
 msgstr "保留至資料夾"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:124
 msgid "Address book path where addresses are kept"
 msgstr "已保留地址的通訊錄路徑"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:123
+#: src/plugins/address_keeper/address_keeper_prefs.c:126
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
-#: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:466
-#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
-#: src/prefs_matcher.c:690
+#: src/plugins/bsfilter/bsfilter_gtk.c:200
+#: src/plugins/spamassassin/spamassassin_gtk.c:458
+#: src/prefs_filtering_action.c:548 src/prefs_filtering_action.c:555
+#: src/prefs_matcher.c:688
 msgid "Select..."
 msgstr "選擇..."
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:139
+#: src/plugins/address_keeper/address_keeper_prefs.c:142
 msgid "Fields to keep addresses from"
 msgstr "保留寄件者地址的區塊"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:147
-#: src/plugins/address_keeper/address_keeper_prefs.c:161
-#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#: src/plugins/address_keeper/address_keeper_prefs.c:150
+#: src/plugins/address_keeper/address_keeper_prefs.c:164
+#: src/plugins/address_keeper/address_keeper_prefs.c:178
 #, c-format
 msgctxt "address keeper: %s stands for a header name"
 msgid "Keep addresses which appear in '%s' headers"
 msgstr "保留出現在 '%s' 標頭內的地址"
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:185
+#: src/plugins/address_keeper/address_keeper_prefs.c:188
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr "不包含符合下列正規表達式(1行1個)的地址"
 
-#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:106
 msgid "Mail Archiver"
 msgstr "郵件封存器"
 
@@ -9022,17 +9391,17 @@ msgstr "壓縮等級"
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
-#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
+#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:534
+#: src/prefs_folder_item.c:1242 src/prefs_folder_item.c:1273
 msgid "Yes"
 msgstr "是"
 
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
-#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
-#: src/prefs_summaries.c:409
+#: 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
 msgid "No"
 msgstr "否"
 
@@ -9049,7 +9418,7 @@ msgid "Delete selected files"
 msgstr "刪除選擇的檔案"
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1330
+#: src/plugins/archive/archiver_gtk.c:1327
 msgid "Select mails before"
 msgstr "先選擇郵件"
 
@@ -9057,101 +9426,101 @@ msgstr "先選擇郵件"
 msgid "Select folder to archive"
 msgstr "選擇封存資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:942
+#: src/plugins/archive/archiver_gtk.c:941
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr "選擇封存檔案名稱 [後綴將類似 .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:990
+#: src/plugins/archive/archiver_gtk.c:987
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld of %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:1040
 msgid "Create Archive"
 msgstr "建立新的封存"
 
-#: src/plugins/archive/archiver_gtk.c:1058
+#: src/plugins/archive/archiver_gtk.c:1055
 msgid "Enter Archiver arguments"
 msgstr "輸入封存命令"
 
-#: src/plugins/archive/archiver_gtk.c:1072
+#: src/plugins/archive/archiver_gtk.c:1069
 msgid "Folder to archive"
 msgstr "封存資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:1079
+#: src/plugins/archive/archiver_gtk.c:1076
 msgid "Folder which is the root of the archive"
 msgstr "封存資料夾的根目錄"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1081
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "按下此鍵為封存資料夾選擇根目錄"
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1087
 msgid "Name for archive"
 msgstr "封存名稱"
 
-#: src/plugins/archive/archiver_gtk.c:1096
+#: src/plugins/archive/archiver_gtk.c:1093
 msgid "Archive location and name"
 msgstr "封存路徑和名稱"
 
-#: src/plugins/archive/archiver_gtk.c:1098
-#: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:494
+#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_prefs.c:224
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr "選擇(_S)"
 
-#: src/plugins/archive/archiver_gtk.c:1101
+#: src/plugins/archive/archiver_gtk.c:1098
 msgid "Click this button to select a name and location for the archive"
 msgstr "按下此鍵為封存選擇名稱和路徑"
 
-#: src/plugins/archive/archiver_gtk.c:1103
+#: src/plugins/archive/archiver_gtk.c:1100
 msgid "Choose compression"
 msgstr "選擇壓縮方式"
 
-#: src/plugins/archive/archiver_gtk.c:1115
-#: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1127
-#: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1140
-#: src/plugins/archive/archiver_gtk.c:1148
-#: src/plugins/archive/archiver_gtk.c:1156
-#: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1168
-#: src/plugins/archive/archiver_gtk.c:1176
-#: src/plugins/archive/archiver_gtk.c:1183
+#: 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
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 壓縮功能"
 
-#: src/plugins/archive/archiver_gtk.c:1232
+#: src/plugins/archive/archiver_gtk.c:1229
 msgid "Choose format"
 msgstr "選擇格式"
 
-#: src/plugins/archive/archiver_gtk.c:1244
-#: src/plugins/archive/archiver_gtk.c:1250
-#: src/plugins/archive/archiver_gtk.c:1256
-#: src/plugins/archive/archiver_gtk.c:1262
+#: 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
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 格式"
 
-#: src/plugins/archive/archiver_gtk.c:1282
+#: src/plugins/archive/archiver_gtk.c:1279
 msgid "Miscellaneous options"
 msgstr "雜項選項"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1288
 msgid "_Recursive"
 msgstr "遞迴(_R)"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1292
 msgid "Choose this option to include subfolders in the archive"
 msgstr "選擇這個選項,將在封存中包含子資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:1297
+#: src/plugins/archive/archiver_gtk.c:1294
 msgid "_MD5sum"
 msgstr "MD5檢查碼(_M)"
 
-#: src/plugins/archive/archiver_gtk.c:1301
+#: src/plugins/archive/archiver_gtk.c:1298
 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"
@@ -9161,12 +9530,12 @@ msgstr ""
 "必需要了解的是,這個功能將會在新建封存時,增加不少的時間\n"
 " "
 
-#: src/plugins/archive/archiver_gtk.c:1305
+#: src/plugins/archive/archiver_gtk.c:1302
 msgid "R_ename"
 msgstr "修改名稱(_e)"
 
-#: src/plugins/archive/archiver_gtk.c:1309
-#: src/plugins/archive/archiver_prefs.c:427
+#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
@@ -9176,7 +9545,7 @@ msgstr ""
 "名稱的設計為: 日期起源@至@主旨\n"
 "名稱長度將被限制為最長96個字元"
 
-#: src/plugins/archive/archiver_gtk.c:1317
+#: src/plugins/archive/archiver_gtk.c:1314
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -9184,11 +9553,11 @@ msgstr ""
 "選擇這個選項,將在封存後刪除郵件\n"
 "此功能只能套用在 IMAP4,本地郵件箱和 POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1321
+#: src/plugins/archive/archiver_gtk.c:1318
 msgid "Selection options"
 msgstr "選擇選項"
 
-#: src/plugins/archive/archiver_gtk.c:1337
+#: src/plugins/archive/archiver_gtk.c:1334
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9196,58 +9565,58 @@ msgstr ""
 "在確認日期前選擇郵件\n"
 "日期必需遵守 ISO-8601 [YYYY-MM-DD]的規定"
 
-#: src/plugins/archive/archiver_prefs.c:217
+#: src/plugins/archive/archiver_prefs.c:216
 msgid "Default save folder"
 msgstr "預設儲存資料夾"
 
-#: src/plugins/archive/archiver_prefs.c:229
+#: src/plugins/archive/archiver_prefs.c:228
 msgid "Click this button to select the default location for saving archives"
 msgstr "按下此鍵選擇儲存封存檔案的預設路徑"
 
-#: src/plugins/archive/archiver_prefs.c:238
+#: src/plugins/archive/archiver_prefs.c:237
 msgid "Default compression"
 msgstr "預設的壓縮"
 
-#: src/plugins/archive/archiver_prefs.c:249
-#: src/plugins/archive/archiver_prefs.c:255
-#: src/plugins/archive/archiver_prefs.c:261
-#: src/plugins/archive/archiver_prefs.c:268
-#: src/plugins/archive/archiver_prefs.c:274
-#: src/plugins/archive/archiver_prefs.c:282
-#: src/plugins/archive/archiver_prefs.c:290
-#: src/plugins/archive/archiver_prefs.c:296
-#: src/plugins/archive/archiver_prefs.c:302
-#: src/plugins/archive/archiver_prefs.c:310
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:248
+#: src/plugins/archive/archiver_prefs.c:254
+#: src/plugins/archive/archiver_prefs.c:260
+#: src/plugins/archive/archiver_prefs.c:267
+#: src/plugins/archive/archiver_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:281
+#: src/plugins/archive/archiver_prefs.c:289
+#: src/plugins/archive/archiver_prefs.c:295
+#: src/plugins/archive/archiver_prefs.c:301
+#: src/plugins/archive/archiver_prefs.c:309
+#: src/plugins/archive/archiver_prefs.c:316
 #, c-format
 msgid "Choose this option to use %s compression by default"
 msgstr "預設將選擇這個選項以使用 %s 進行壓縮"
 
-#: src/plugins/archive/archiver_prefs.c:363
+#: src/plugins/archive/archiver_prefs.c:362
 msgid "Default format"
 msgstr "預設格式"
 
-#: src/plugins/archive/archiver_prefs.c:374
-#: src/plugins/archive/archiver_prefs.c:380
-#: src/plugins/archive/archiver_prefs.c:386
-#: src/plugins/archive/archiver_prefs.c:392
+#: src/plugins/archive/archiver_prefs.c:373
+#: src/plugins/archive/archiver_prefs.c:379
+#: src/plugins/archive/archiver_prefs.c:385
+#: src/plugins/archive/archiver_prefs.c:391
 #, c-format
 msgid "Choose this option to use the %s as format by default"
 msgstr "預設將選擇這個選項以使用 %s 格式"
 
-#: src/plugins/archive/archiver_prefs.c:409
+#: src/plugins/archive/archiver_prefs.c:408
 msgid "Default miscellaneous options"
 msgstr "預設的雜項選擇"
 
-#: src/plugins/archive/archiver_prefs.c:418
+#: src/plugins/archive/archiver_prefs.c:417
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr "預設將選擇這個選項以包含封存的子資料夾"
 
-#: src/plugins/archive/archiver_prefs.c:419
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "MD5sum"
 msgstr "MD5和"
 
-#: src/plugins/archive/archiver_prefs.c:421
+#: src/plugins/archive/archiver_prefs.c:420
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9258,26 +9627,29 @@ msgstr ""
 "必需了解的是,建立封存將增加(讀取的)時間\n"
 " "
 
-#: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:771
+#: src/plugins/archive/archiver_prefs.c:424
 msgid "Rename"
 msgstr "重新命名"
 
-#: src/plugins/archive/archiver_prefs.c:433
+#: src/plugins/archive/archiver_prefs.c:432
 msgid "Choose this option to delete mails after archiving"
 msgstr "選擇這個選項,在封存後刪除郵件"
 
+#: src/plugins/att_remover/att_remover.c:306
+msgid "Filename"
+msgstr "檔案名稱"
+
 #: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr "移除附加檔"
 
 #: src/plugins/att_remover/att_remover.c:363
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr "移除"
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:643
-#: src/prefs_summary_column.c:79 src/summaryview.c:2882
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr "附加檔"
 
@@ -9337,7 +9709,7 @@ msgstr ""
 msgid "Attachment handling"
 msgstr "已掌握附加檔案"
 
-#: src/plugins/attachwarner/attachwarner.c:210
+#: src/plugins/attachwarner/attachwarner.c:211
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9350,15 +9722,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/attachwarner/attachwarner.c:217
 msgid "Attachment warning"
 msgstr "附加檔案警告"
 
-#: src/plugins/attachwarner/attachwarner.c:245
 #: src/plugins/attachwarner/attachwarner.c:282
 #: src/plugins/attachwarner/attachwarner.c:334
-msgid "Attach warner"
-msgstr "附加檔案警告器"
+#: src/plugins/attachwarner/attachwarner_prefs.c:235
+msgid "AttachWarner"
+msgstr "附件警告器"
 
 #: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
@@ -9373,22 +9745,28 @@ msgid "attach"
 msgstr "附加"
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-msgid "One of the following regular expressions is matched (one per line)"
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:83
+msgid ""
+"Warn when one of the following regular expressions is matched (one per line)"
 msgstr "以下規則表示式中至少有一項符合(每行一個)"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:87
+#: src/plugins/attachwarner/attachwarner_prefs.c:88
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:88
 msgid "Expressions are case sensitive"
 msgstr "表示式是區分大小寫的"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:93
+#: src/plugins/attachwarner/attachwarner_prefs.c:95
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:95
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr "比對清單中的規則表示式時,是區分大小寫的"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:115
+#: src/plugins/attachwarner/attachwarner_prefs.c:117
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:117
 msgid "Lines starting with quotation marks"
 msgstr "每行是以引號為開頭"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:122
+#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:125
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
@@ -9397,20 +9775,24 @@ msgstr ""
 "請注意!除了來自於上述正規表示式檢查的引言外,並無法藉由回覆產生引言的方式手"
 "動制作引言  "
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/attachwarner/attachwarner_prefs.c:130
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:130
 msgid "Forwarded or redirected messages"
 msgstr "轉發或改寄郵件"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:132
+#: src/plugins/attachwarner/attachwarner_prefs.c:138
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "轉發或改寄郵件時,不要檢查是否缺少附件"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:141
+#: src/prefs_msg_colors.c:305
 msgid "Signatures"
 msgstr "簽名"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:142
+#: src/plugins/attachwarner/attachwarner_prefs.c:148
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:148
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9418,49 +9800,42 @@ msgstr ""
 "除了來自於上述正規表示式的第一個簽名分隔符號的檢查之外 the regular "
 "expressions above"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:148
-msgid "Warn when"
-msgstr "發出警告,當"
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:152
-msgid "Excluding"
+#: src/plugins/attachwarner/attachwarner_prefs.c:157
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:157
+msgid "Exclude"
 msgstr "不包含"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
-msgid "Attach Warner"
-msgstr "附件警告器"
-
-#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter.c:80
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter.c:106
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 #: src/plugins/bogofilter/bogofilter_gtk.c:331
 #: src/plugins/bogofilter/bogofilter_gtk.c:408
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/bsfilter/bsfilter.c:104 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_gtk.c:462
-#: src/plugins/spamassassin/spamassassin_gtk.c:511
-#: src/plugins/spamassassin/spamassassin_gtk.c:638 src/prefs_matcher.c:686
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
-#: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
+#: src/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
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1658 src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1673 src/prefs_matcher.c:1675 src/prefs_matcher.c:2586
 #: src/prefs_matcher.c:2590
 msgid "Any"
 msgstr "任何"
 
-#: src/plugins/bogofilter/bogofilter.c:457
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: 正在取得內容..."
 
-#: src/plugins/bogofilter/bogofilter.c:470
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: 正在取得郵件..."
 
-#: src/plugins/bogofilter/bogofilter.c:586
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9472,7 +9847,7 @@ msgstr ""
 "使用 \"/Mark/Mark as spam\" 和 \"/Mark/Mark as ham\" 來對 Bogofilter 進行訓"
 "練,建議使用數百個垃圾郵件及一般郵件來進行。"
 
-#: src/plugins/bogofilter/bogofilter.c:593
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9484,7 +9859,7 @@ msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: 從郵件中學習..."
 
 #: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "學習失敗; `%s` 返回狀態為 %d."
@@ -9527,38 +9902,38 @@ msgstr ""
 "\n"
 "可以在/Configuration/Preferences/Plugins/Bogofilter中找到所有的選項"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:643
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
+#: src/plugins/spamassassin/spamassassin.c:647
 msgid "Spam detection"
 msgstr "垃圾郵件偵測"
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:644
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:648
 msgid "Spam learning"
 msgstr "垃圾郵件學習中"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
-#: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:419
+#: src/plugins/bsfilter/bsfilter_gtk.c:142
+#: src/plugins/spamassassin/spamassassin_gtk.c:411
 msgid "Process messages on receiving"
 msgstr "收信時處理郵件"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
-#: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/plugins/bsfilter/bsfilter_gtk.c:150
+#: src/plugins/spamassassin/spamassassin_gtk.c:369
 msgid "Maximum size"
 msgstr "最大容量"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
-#: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:386
+#: src/plugins/bsfilter/bsfilter_gtk.c:159
+#: src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Messages larger than this will not be checked"
 msgstr "郵件大小超過此將不被檢查"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
-#: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
-msgid "KB"
+#: src/plugins/bsfilter/bsfilter_gtk.c:162
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1714
+msgid "KiB"
 msgstr "KB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
@@ -9574,15 +9949,15 @@ msgid "Only mark as spam"
 msgstr "只標示為垃圾郵件"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
-#: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:435
+#: src/plugins/bsfilter/bsfilter_gtk.c:178
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr "這是用來儲存已被判定為垃圾郵件的資料夾。清空它用來作為回收桶。"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
-#: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/bsfilter/bsfilter_gtk.c:184
+#: src/plugins/spamassassin/spamassassin_gtk.c:433
 msgid "Click this button to select a folder for storing spam"
 msgstr "按下此鍵選擇一個資料夾作為儲存垃圾郵件使用"
 
@@ -9609,14 +9984,14 @@ msgid "Only done for messages in MH folders"
 msgstr "只執行在MH資料夾內的郵件"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:456
+#: src/plugins/bsfilter/bsfilter_gtk.c:190
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Whitelist senders found in address book/folder"
 msgstr "在通訊錄或資料夾中發現白名單的寄件者"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
-#: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:460
+#: src/plugins/bsfilter/bsfilter_gtk.c:194
+#: src/plugins/spamassassin/spamassassin_gtk.c:452
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9625,13 +10000,13 @@ msgstr ""
 "資料夾內"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:470
+#: src/plugins/bsfilter/bsfilter_gtk.c:204
+#: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr "按下此鍵在通訊錄中選擇一本書或資料夾"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
-#: src/plugins/bsfilter/bsfilter_gtk.c:207
+#: src/plugins/bsfilter/bsfilter_gtk.c:206
 msgid "Learn whitelisted emails as ham"
 msgstr "學習白名單中的郵件為正常郵件"
 
@@ -9652,24 +10027,24 @@ msgid "Path to bogofilter executable"
 msgstr "bogofilter執行檔案的路徑"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
-#: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:448
+#: src/plugins/bsfilter/bsfilter_gtk.c:231
+#: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid "Mark spam as read"
 msgstr "將垃圾郵件標記為已讀"
 
-#: src/plugins/bsfilter/bsfilter.c:82 src/plugins/bsfilter/bsfilter_gtk.c:401
+#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr "Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter.c:273
+#: src/plugins/bsfilter/bsfilter.c:271
 msgid "Bsfilter: fetching body..."
 msgstr "Bsfilter: 取得內容..."
 
-#: src/plugins/bsfilter/bsfilter.c:282
+#: src/plugins/bsfilter/bsfilter.c:280
 msgid "Bsfilter: filtering message..."
 msgstr "Bsfilter: 過濾郵件"
 
-#: src/plugins/bsfilter/bsfilter.c:367
+#: src/plugins/bsfilter/bsfilter.c:365
 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"
@@ -9681,18 +10056,18 @@ msgstr ""
 "使用 \"/Mark/Mark as spam\" 和 \"/Mark/Mark as ham\" 來對Bsfilter進行訓練,建"
 "議使用數百個垃圾郵件及一般郵件來進行。"
 
-#: src/plugins/bsfilter/bsfilter.c:374
+#: src/plugins/bsfilter/bsfilter.c:372
 #, 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:475
+#: src/plugins/bsfilter/bsfilter.c:474
 msgid "Bsfilter: learning from message..."
 msgstr "Bsfilter: 從郵件進進行學習..."
 
-#: src/plugins/bsfilter/bsfilter.c:616
+#: src/plugins/bsfilter/bsfilter.c:615
 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 "
@@ -9717,12 +10092,12 @@ msgstr ""
 "\n"
 "可以在/Configuration/Preferences/Plugins/Bsfilter中找到所有的選項"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:427
+#: src/plugins/bsfilter/bsfilter_gtk.c:170
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Save spam in"
 msgstr "儲存垃圾郵件在"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:209
+#: src/plugins/bsfilter/bsfilter_gtk.c:208
 msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
@@ -9730,11 +10105,11 @@ msgstr ""
 "如果Bsfilter把一封郵件當作為垃圾郵件或是未知,但是此郵件已經存在白名單中,則"
 "將會進行學習並把它當作是一般郵件"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:218
+#: src/plugins/bsfilter/bsfilter_gtk.c:217
 msgid "Bsfilter call"
 msgstr "Bsfilter 呼叫"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:226
+#: src/plugins/bsfilter/bsfilter_gtk.c:225
 msgid "Path to bsfilter executable"
 msgstr "Bsfilter的執行路徑"
 
@@ -9763,12 +10138,12 @@ msgstr ""
 "Clamd 沒有回應給 ping.\n"
 "Clamd 仍在執行嗎?"
 
-#: src/plugins/clamd/clamav_plugin.c:119
+#: src/plugins/clamd/clamav_plugin.c:120
 #, c-format
 msgid "Detected %s virus."
 msgstr "偵測到 %s 病毒"
 
-#: src/plugins/clamd/clamav_plugin.c:135
+#: src/plugins/clamd/clamav_plugin.c:137
 #, c-format
 msgid ""
 "Scanning error:\n"
@@ -9777,20 +10152,20 @@ msgstr ""
 "掃描發生錯誤:\n"
 "%s"
 
-#: src/plugins/clamd/clamav_plugin.c:146
+#: src/plugins/clamd/clamav_plugin.c:148
 #, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr "檔案: %s  大小 (%d) 大於限制 (%d)\n"
 
-#: src/plugins/clamd/clamav_plugin.c:174
+#: src/plugins/clamd/clamav_plugin.c:177
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: 掃描郵件..."
 
-#: src/plugins/clamd/clamav_plugin.c:280
+#: src/plugins/clamd/clamav_plugin.c:283
 msgid "Failed to register mail filtering hook"
 msgstr "註冊郵件過濾 hook 失敗"
 
-#: src/plugins/clamd/clamav_plugin.c:298
+#: src/plugins/clamd/clamav_plugin.c:301
 msgid ""
 "Init\n"
 "No socket information.\n"
@@ -9800,7 +10175,7 @@ msgstr ""
 "沒有 socket 資訊\n"
 "關閉防毒功能."
 
-#: src/plugins/clamd/clamav_plugin.c:302
+#: src/plugins/clamd/clamav_plugin.c:305
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
@@ -9810,7 +10185,7 @@ msgstr ""
 "Clamd 沒有回應給 ping\n"
 "clamd 仍在執行嗎?"
 
-#: src/plugins/clamd/clamav_plugin.c:333
+#: src/plugins/clamd/clamav_plugin.c:336
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -9847,7 +10222,7 @@ msgstr ""
 "\n"
 "選項配置可以在 /Configuration/Preferences/Plugins/Clam AntiVirus 找得到"
 
-#: src/plugins/clamd/clamav_plugin.c:372
+#: src/plugins/clamd/clamav_plugin.c:375
 msgid "Virus detection"
 msgstr "病毒偵測"
 
@@ -9920,6 +10295,10 @@ msgstr "按下此鍵選擇clamd.conf的完成路徑"
 msgid "Check permission for folders and adjust if necessary"
 msgstr "如果需要的話,檢查並調整資料夾的權限"
 
+#: src/plugins/clamd/clamav_plugin_gtk.c:348
+msgid "Find and _Replace"
+msgstr "覆蓋(_R)"
+
 #: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr "按下此鍵檢查並調整資料夾的權限"
@@ -9956,7 +10335,7 @@ msgstr ""
 "Clamd 沒有回應給 ping.\n"
 "clamd 仍在執行嗎?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:122
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9965,7 +10344,7 @@ msgstr ""
 "%s:無法開啟\n"
 "clamd 將被關閉"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:217
+#: src/plugins/clamd/libclamd/clamd-plugin.c:210
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9974,44 +10353,44 @@ msgstr ""
 "%s: 找不到需要的資訊\n"
 "clamd 將被關閉"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:251
+#: src/plugins/clamd/libclamd/clamd-plugin.c:244
 msgid "Could not create socket"
 msgstr "無誤建立socket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:442
+#: src/plugins/clamd/libclamd/clamd-plugin.c:435
 msgid ": File does not exist"
 msgstr ": 檔案不存在"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
+#: src/plugins/clamd/libclamd/clamd-plugin.c:448
 msgid ": Unable to open"
 msgstr ": 無法開啟"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
-#: src/plugins/clamd/libclamd/clamd-plugin.c:479
-#: src/plugins/clamd/libclamd/clamd-plugin.c:493
+#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:472
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 msgid "Socket write error"
 msgstr "Socket寫入錯誤"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:486
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: 讀取錯誤"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:500
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket read error"
 msgstr "Socket讀取錯誤"
 
-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
+#: src/plugins/demo/demo.c:33 src/plugins/demo/demo.c:102
 msgid "Demo"
 msgstr "展示"
 
-#: src/plugins/demo/demo.c:52
+#: src/plugins/demo/demo.c:54
 msgid "Failed to register log text hook"
 msgstr "註冊日誌文字 hook 失敗"
 
-#: src/plugins/demo/demo.c:76
+#: src/plugins/demo/demo.c:78
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It "
+"This plugin is only a demo of how to write plugins for Claws Mail. It "
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
@@ -10061,8 +10440,8 @@ msgstr "在顯示視窗中開啟 (使用遠端資源)"
 msgid "Do nothing (remote content is disabled)"
 msgstr "無效 (使用遠端資源)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
-#: src/prefs_proxy.c:241
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4310
+#: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr "代理伺服器"
 
@@ -10091,118 +10470,115 @@ msgstr ""
 "要求。\n"
 "對於郵件中有夾帶的圖片、scripts、外掛物件或Java applets,則依然可以進行處理"
 
-#: src/plugins/fancy/fancy_prefs.c:245
-#: src/plugins/litehtml_viewer/lh_prefs.c:121
+#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr "載入遠端資源"
 
-#: src/plugins/fancy/fancy_prefs.c:277
+#: src/plugins/fancy/fancy_prefs.c:278
 msgid "When clicking on a link, by default"
 msgstr "當按下超連結,預設將執行"
 
-#: src/plugins/fancy/fancy_prefs.c:285
+#: src/plugins/fancy/fancy_prefs.c:286
 msgid "Open in External Browser"
 msgstr "在外部瀏覽器開啟"
 
-#: src/plugins/fancy/fancy_prefs.c:299
+#: src/plugins/fancy/fancy_prefs.c:300
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "此檔案內的CSS將套用在所有的HTML上"
 
-#: src/plugins/fancy/fancy_prefs.c:309
-#: src/plugins/notification/notification_prefs.c:1346
+#: 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:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
-#: src/prefs_customheader.c:236
+#: src/prefs_account.c:1614 src/prefs_account.c:1736 src/prefs_account.c:2513
+#: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr "瀏覽(W)"
 
-#: src/plugins/fancy/fancy_prefs.c:351
+#: src/plugins/fancy/fancy_prefs.c:352
 msgid "Select stylesheet"
 msgstr "選擇風格"
 
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/plugins/fancy/fancy_viewer.c:478
 msgid "Remote content loading is disabled."
 msgstr "不載入遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:587
 msgid "Load images"
 msgstr "載入圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Enable remote content"
 msgstr "使用遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable Javascript"
 msgstr "啟用 Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: src/plugins/fancy/fancy_viewer.c:507
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Java"
 msgstr "啟用 Java"
 
-#: src/plugins/fancy/fancy_viewer.c:509
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Open links with external browser"
 msgstr "以外部瀏覽器開啟連結"
 
-#: src/plugins/fancy/fancy_viewer.c:684
+#: src/plugins/fancy/fancy_viewer.c:793
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "發生錯誤: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:853
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s 是一個畸形或不支援的輸入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:755
-msgid "Search the Web"
-msgstr "搜尋瀏覽器"
-
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:875
 msgid "Open in Viewer"
 msgstr "在檢視器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:775
+#: src/plugins/fancy/fancy_viewer.c:884
 msgid "Open in Browser"
 msgstr "在瀏覽器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:785
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Open Image"
 msgstr "開啟圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:903
 msgid "Copy Link"
 msgstr "複製連結"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:908
 msgid "Download Link"
 msgstr "下載連結"
 
-#: src/plugins/fancy/fancy_viewer.c:809
+#: src/plugins/fancy/fancy_viewer.c:919
 msgid "Save Image As"
 msgstr "另存圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:819
+#: src/plugins/fancy/fancy_viewer.c:929
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:859
+#: src/plugins/fancy/fancy_viewer.c:967
 msgid "Import feed"
 msgstr "匯入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:1141
+#: src/plugins/fancy/fancy_viewer.c:1260
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1169
+#. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
+#: src/plugins/fancy/fancy_viewer.c:1288
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML 檢視器"
 
-#: src/plugins/fancy/fancy_viewer.c:1174
+#: src/plugins/fancy/fancy_viewer.c:1293
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10213,17 +10589,22 @@ msgstr ""
 "所有的遠端內容預設都是禁止的,可以在 /Configuration/Preferences/Plugins/Fancy"
 "找到所有的選項"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:160
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:193
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr "Fetchinfo"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
+#. TRANSLATORS: Possible error message during plugin load
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:166
 msgid "Failed to register mail receive hook"
 msgstr "註冊郵件的接收Hook失敗"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
+#. TRANSLATORS: Description seen in plugins dialog.
+#. * Translation of "Plugins" part of preferences path should to be
+#. * the same as translation of "Plugins" string in Claws Mail message
+#. * catalog.
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:202
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -10236,10 +10617,12 @@ msgstr ""
 "\n"
 "可以在 /Configuration/Preferences/Plugins/Fetchinfo 找到所有的選項"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
+#. TRANSLATORS: Description of functionality added by this plugin
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:229
 msgid "Mail marking"
 msgstr "郵件標示中"
 
+#. TRANSLATORS: Heading of a preferences section determining which headers to add
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:92
 msgid "Add fetchinfo headers"
 msgstr "加入 fetchinfo 標頭"
@@ -10248,15 +10631,13 @@ msgstr "加入 fetchinfo 標頭"
 msgid "Headers to be added"
 msgstr "要加入的標頭資訊"
 
-#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
-msgid "UIDL"
-msgstr "UIDL"
-
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr "將郵件(POP3)唯一的ID清單加入 X-FETCH-UIDL 標頭"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
 msgstr "帳號名稱"
@@ -10265,6 +10646,7 @@ msgstr "帳號名稱"
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
 msgstr "將帳號名稱加入 X-FETCH-ACCOUNT 標頭"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
 msgstr "接收伺服器"
@@ -10273,6 +10655,7 @@ msgstr "接收伺服器"
 msgid "Adds the X-FETCH-SERVER header with the receive server"
 msgstr "將接收伺服器加入 X-FETCH-SERVER 標頭"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
 msgstr "使用者ID"
@@ -10281,6 +10664,7 @@ msgstr "使用者ID"
 msgid "Adds the X-FETCH-USERID header with the user ID"
 msgstr "將使用者ID加入 X-FETCH-USERID 標頭"
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
 msgstr "取得時間"
@@ -10326,13 +10710,13 @@ msgstr "步驟2:"
 msgid "Enter code:"
 msgstr "輸入認證碼:"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:329
+#: 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:345
+#: src/plugins/gdata/cm_gdata_contacts.c:347
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -10340,98 +10724,98 @@ msgstr[0] "新增 %d 至"
 msgstr[1] "新增 %d 至"
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
+#: 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:357
+#: 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:378
+#: 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:415
+#: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Groups received\n"
 msgstr "GData外掛程式: 群組已接收\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:422
+#: 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:447
+#: 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:454
+#: src/plugins/gdata/cm_gdata_contacts.c:456
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData外掛程式: 認證成功\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: 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:481
+#: 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:488
+#: 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:494
+#: 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:511
+#: 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:535
+#: 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:595
+#: 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:603
+#: 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:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
+#: 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:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
+#: 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:95
+#: src/plugins/gdata/cm_gdata_prefs.c:99
 msgid "Polling interval (seconds):"
 msgstr "輪詢間隔時間(秒)"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:106
 msgid "Maximum number of results:"
 msgstr "結果的最大數量"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:138 src/plugins/gdata/gdata_plugin.c:102
+#: 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"
@@ -10464,6 +10848,40 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData整合"
 
+#: src/plugins/keyword_warner/keyword_warner.c:189
+msgid ""
+"A keyword is used in the mail you are sending. The keyword appears on line "
+"%d, which begins with the text: %s\n"
+"\n"
+"%s"
+msgstr ""
+"一個在你所傳送的郵件中所提及的附加檔案,事實上並不存在,這個描述是出現在第%d"
+"行,這字串這個為開頭為: %s\n"
+"\n"
+"%s"
+
+#: src/plugins/keyword_warner/keyword_warner.c:195
+msgid "Keyword warning"
+msgstr "關鍵字"
+
+#: src/plugins/keyword_warner/keyword_warner.c:260
+#: src/plugins/keyword_warner/keyword_warner.c:313
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:235
+msgid "Keyword Warner"
+msgstr "關鍵字"
+
+#: src/plugins/keyword_warner/keyword_warner.c:270
+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"
+msgstr "轉發或改寄郵件時,不要檢查是否缺少附件"
+
 #: src/plugins/libravatar/libravatar.c:334
 #: src/plugins/libravatar/libravatar.c:399
 #: src/plugins/libravatar/libravatar.c:459
@@ -10589,8 +11007,8 @@ msgid "Cache refresh interval"
 msgstr "快取刷新的間隔時間"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1697
-#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
+#: 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
 msgid "hours"
 msgstr "小時"
 
@@ -10728,19 +11146,19 @@ msgstr ""
 "遠端資源載入功能關閉,將不會存在任何來\n"
 "自於網路的要求。"
 
-#: src/plugins/litehtml_viewer/lh_prefs.c:133
+#: src/plugins/litehtml_viewer/lh_prefs.c:134
 msgid "Size of image cache in megabytes"
 msgstr "影像快取大小 megabytes"
 
-#: src/plugins/litehtml_viewer/lh_prefs.c:148
+#: src/plugins/litehtml_viewer/lh_prefs.c:150
 msgid "Default font"
 msgstr "預設字型"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Open Link"
 msgstr "開啟連結"
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+#: src/plugins/litehtml_viewer/lh_widget.cpp:99
 msgid "Copy Link Location"
 msgstr "複製連結路徑"
 
@@ -10752,23 +11170,21 @@ msgstr "LiteHTML 檢視器"
 msgid ""
 "Viewer plugin for HTML emails, using the litehtml library (http://www."
 "litehtml.com/)."
-msgstr ""
-"HTML格式的郵件檢視器,使用litehtml library (http://www."
-"litehtml.com/)."
+msgstr "HTML格式的郵件檢視器,使用litehtml library (http://www.litehtml.com/)."
 
-#: src/plugins/mailmbox/plugin.c:58
+#: src/plugins/mailmbox/plugin.c:57
 msgid "mailmbox folder"
 msgstr "郵件箱資料夾"
 
-#: src/plugins/mailmbox/plugin.c:63
+#: src/plugins/mailmbox/plugin.c:62
 msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr "這個外掛程式以mbox格式掌控了郵件箱"
 
-#: src/plugins/mailmbox/plugin.c:84
+#: src/plugins/mailmbox/plugin.c:83
 msgid "MBOX"
 msgstr "MBOX"
 
-#: src/plugins/mailmbox/plugin_gtk.c:190
+#: src/plugins/mailmbox/plugin_gtk.c:191
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -10778,79 +11194,70 @@ msgstr ""
 "如果指定的郵件箱已經存在,它將會被自動地發現\n"
 " "
 
-#: src/plugins/mailmbox/plugin_gtk.c:330
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be deleted.\n"
-"Do you really want to delete?"
-msgstr ""
-"在 '%s' 下的所有資料夾和郵件將會被刪除\n"
-"你確定要刪除嗎?"
-
-#: src/plugins/managesieve/managesieve.c:436
+#: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr "找不到有效的Sieve認證方法\n"
 
-#: src/plugins/managesieve/managesieve.c:440
+#: src/plugins/managesieve/managesieve.c:442
 msgid "Selected Sieve auth method not available\n"
 msgstr "已經選擇的Sieve認證方法是無效的\n"
 
-#: src/plugins/managesieve/managesieve.c:673
+#: src/plugins/managesieve/managesieve.c:675
 msgid "Disconnected"
 msgstr "連線已終止"
 
-#: src/plugins/managesieve/managesieve.c:677
+#: src/plugins/managesieve/managesieve.c:679
 #, c-format
 msgid "Disconnected: %s"
 msgstr "連線已終止:  %s"
 
-#: src/plugins/managesieve/managesieve.c:726
-#: src/plugins/managesieve/managesieve.c:871
+#: src/plugins/managesieve/managesieve.c:728
+#: src/plugins/managesieve/managesieve.c:873
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "無法掌控在Sieve程序中的郵件: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:733
+#: src/plugins/managesieve/managesieve.c:735
 msgid "STARTTLS failed"
 msgstr "STARTTLS失效"
 
-#: src/plugins/managesieve/managesieve.c:798
-#: src/plugins/managesieve/managesieve.c:814
-#: src/plugins/managesieve/managesieve.c:841
-#: src/plugins/managesieve/managesieve.c:923
-#: src/plugins/managesieve/managesieve.c:941
+#: src/plugins/managesieve/managesieve.c:800
+#: src/plugins/managesieve/managesieve.c:816
+#: src/plugins/managesieve/managesieve.c:843
+#: src/plugins/managesieve/managesieve.c:925
+#: src/plugins/managesieve/managesieve.c:943
 msgid "error occurred on SIEVE session\n"
 msgstr "Sieve程序中發生錯誤\n"
 
-#: src/plugins/managesieve/managesieve.c:867
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "Sieve程序中發生錯誤: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:876
+#: src/plugins/managesieve/managesieve.c:878
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "無法掌控在Sieve程序中的郵件: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1153
+#: src/plugins/managesieve/managesieve.c:1160
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: 重試認證: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1155
+#: src/plugins/managesieve/managesieve.c:1162
 msgid "Auth method not available"
 msgstr "認證方法無效"
 
-#: src/plugins/managesieve/managesieve.c:1172
+#: src/plugins/managesieve/managesieve.c:1179
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "在Sieve程序中發生傳送錯誤: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
 msgid "_Filter"
 msgstr "過濾器(_F)"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "Chec_k Syntax"
 msgstr "檢查語法(_k)"
 
@@ -10859,7 +11266,7 @@ msgid "Re_vert"
 msgstr "回復(_v)"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_editor.c:725
 #: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "無法取得script內容"
@@ -10880,29 +11287,29 @@ msgstr "這個腳本已經被修改過。回復尚未儲存的異動嗎?"
 msgid "_Revert"
 msgstr "回復(_R)"
 
-#: src/plugins/managesieve/sieve_editor.c:353
+#: src/plugins/managesieve/sieve_editor.c:354
 msgid "Script saved successfully."
 msgstr "腳本已經成功的儲存"
 
-#: src/plugins/managesieve/sieve_editor.c:370
+#: src/plugins/managesieve/sieve_editor.c:371
 msgid "Saving..."
 msgstr "儲存..."
 
-#: src/plugins/managesieve/sieve_editor.c:399
+#: src/plugins/managesieve/sieve_editor.c:400
 msgid "Checking syntax..."
 msgstr "語法檢查..."
 
-#: src/plugins/managesieve/sieve_editor.c:433
+#: src/plugins/managesieve/sieve_editor.c:434
 msgid "This script has been modified. Save the latest changes?"
 msgstr "這個腳本已經被修改過。儲存最新的異動嗎?"
 
-#: src/plugins/managesieve/sieve_editor.c:695
+#: src/plugins/managesieve/sieve_editor.c:696
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - 過濾器%s"
 
-#: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1320
+#: src/plugins/managesieve/sieve_editor.c:745
+#: src/plugins/pdf_viewer/poppler_viewer.c:1331
 msgid "Loading..."
 msgstr "載入..."
 
@@ -10952,20 +11359,24 @@ msgstr "連線..."
 msgid "Manage Sieve Filters"
 msgstr "管理Sieve過濾器"
 
-#: src/plugins/managesieve/sieve_manager.c:806
+#: src/plugins/managesieve/sieve_manager.c:772
+msgid "_Rename"
+msgstr "重新命名"
+
+#: src/plugins/managesieve/sieve_manager.c:807
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "若要使用Sieve,要在帳號的選項中啟用它"
 
-#: src/plugins/managesieve/sieve_plugin.c:36
-#: src/plugins/managesieve/sieve_plugin.c:154
+#: src/plugins/managesieve/sieve_plugin.c:38
+#: src/plugins/managesieve/sieve_plugin.c:156
 msgid "ManageSieve"
 msgstr "ManageSieve"
 
-#: src/plugins/managesieve/sieve_plugin.c:46
+#: src/plugins/managesieve/sieve_plugin.c:48
 msgid "Manage Sieve Filters..."
 msgstr "管理Sieve過濾器"
 
-#: src/plugins/managesieve/sieve_plugin.c:114
+#: src/plugins/managesieve/sieve_plugin.c:116
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr "在伺服器上使用ManageSieve協定管理Sieve過濾器"
 
@@ -10973,7 +11384,7 @@ msgstr "在伺服器上使用ManageSieve協定管理Sieve過濾器"
 msgid "Enable Sieve"
 msgstr "啟用Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1288
 msgid "Server information"
 msgstr "伺服器資訊"
 
@@ -11010,7 +11421,7 @@ msgid "Require STARTTLS"
 msgstr "需要STARTTLS"
 
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr "沒有認證"
 
@@ -11023,30 +11434,29 @@ msgid "Specify authentication"
 msgstr "指定認證"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
-#: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1459
+#: src/prefs_account.c:2073
 msgid "User ID"
 msgstr "使用者名稱"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:383
-#: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1466
-#: src/prefs_account.c:2095 src/prefs_account.c:3037 src/prefs_account.c:3065
-#: src/prefs_account.c:3262 src/prefs_proxy.c:134 src/wizard.c:1216
-#: src/wizard.c:1636
+#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: 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
 msgid "Password"
 msgstr "密碼"
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1649
-#: src/prefs_account.c:1780 src/prefs_account.c:2043
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1642
+#: src/prefs_account.c:1775 src/prefs_account.c:2041
 msgid "Authentication method"
 msgstr "認證方式"
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1790
-#: src/prefs_account.c:2052 src/prefs_send.c:265 src/prefs_send.c:336
-#: src/prefs_themes.c:1114
+#: 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
 msgid "Automatic"
 msgstr "自動"
 
@@ -11095,7 +11505,7 @@ msgstr ""
 msgid "Log file"
 msgstr "日誌檔案"
 
-#: src/plugins/notification/notification_banner.c:357
+#: src/plugins/notification/notification_banner.c:360
 msgid "Folder:"
 msgstr "資料夾:"
 
@@ -11103,7 +11513,7 @@ msgstr "資料夾:"
 msgid "Select folder(s)"
 msgstr "選擇資料夾"
 
-#: src/plugins/notification/notification_foldercheck.c:583
+#: src/plugins/notification/notification_foldercheck.c:581
 msgid "select recursively"
 msgstr "遞迴性的選擇"
 
@@ -11112,55 +11522,51 @@ msgid "No new messages"
 msgstr "沒有新郵件"
 
 #: src/plugins/notification/notification_plugin.c:220
-#: src/plugins/notification/notification_plugin.c:424
-#: src/plugins/notification/notification_prefs.c:399
-#: src/plugins/notification/notification_prefs.c:414
-#: src/plugins/notification/notification_prefs.c:433
-#: src/plugins/notification/notification_prefs.c:451
-#: src/plugins/notification/notification_prefs.c:469
-#: src/plugins/notification/notification_prefs.c:487
-#: src/plugins/notification/notification_prefs.c:505
-#: src/plugins/notification/notification_prefs.c:523
+#: 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
 msgid "Notification"
 msgstr "通知"
 
-#: src/plugins/notification/notification_plugin.c:225
-msgid "The Notification plugin needs threading support."
-msgstr "這個通知外掛程式需要執行緒的支援"
-
-#: src/plugins/notification/notification_plugin.c:232
+#: src/plugins/notification/notification_plugin.c:226
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr "此通知外掛程式註冊資料夾項目更新hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:240
+#: src/plugins/notification/notification_plugin.c:234
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr "此通知外掛程式註冊資料夾更新hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:250
+#: src/plugins/notification/notification_plugin.c:244
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr "此通知外掛程式註冊msginfo更新hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:260
+#: src/plugins/notification/notification_plugin.c:254
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr "此通知外掛程式註冊離線切換hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:271
+#: src/plugins/notification/notification_plugin.c:265
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr "此通知外掛程式註冊主視窗關閉hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:284
+#: src/plugins/notification/notification_plugin.c:278
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr "此通知外掛程式註冊取得iconified hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:297
+#: src/plugins/notification/notification_plugin.c:291
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr "此通知外掛程式註冊帳號清單改變hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:310
+#: src/plugins/notification/notification_plugin.c:304
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr "此通知外掛程式註冊佈景主題改變hook失敗"
 
-#: src/plugins/notification/notification_plugin.c:429
+#: src/plugins/notification/notification_plugin.c:423
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -11174,7 +11580,7 @@ msgstr ""
 "\n"
 "歡迎回覆給 <berndth at gmx.de>"
 
-#: src/plugins/notification/notification_plugin.c:454
+#: src/plugins/notification/notification_plugin.c:448
 msgid "Various tools"
 msgstr "不同的工具"
 
@@ -11195,7 +11601,7 @@ msgid "New Calendar message"
 msgstr "新行事歷訊息"
 
 #: src/plugins/notification/notification_popup.c:337
-#: src/plugins/notification/notification_trayicon.c:907
+#: src/plugins/notification/notification_trayicon.c:906
 msgid "A new calendar message arrived"
 msgstr "1個新行事歷訊息到達"
 
@@ -11204,7 +11610,7 @@ msgid "New RSS feed article"
 msgstr "新RSS文章"
 
 #: src/plugins/notification/notification_popup.c:341
-#: src/plugins/notification/notification_trayicon.c:910
+#: src/plugins/notification/notification_trayicon.c:909
 msgid "A new article in a RSS feed arrived"
 msgstr "1個新的RSS文件到達"
 
@@ -11217,7 +11623,7 @@ msgid "Unknown message type arrived"
 msgstr "未知型式訊息到達"
 
 #: src/plugins/notification/notification_popup.c:378
-#: src/plugins/notification/notification_trayicon.c:679
+#: src/plugins/notification/notification_trayicon.c:678
 msgid "Present main window"
 msgstr "顯示主視窗"
 
@@ -11242,7 +11648,7 @@ msgid "Calendar message"
 msgstr "行事歷訊息"
 
 #: src/plugins/notification/notification_popup.c:501
-#: src/plugins/notification/notification_trayicon.c:944
+#: src/plugins/notification/notification_trayicon.c:943
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -11267,243 +11673,243 @@ msgid_plural "%d new messages"
 msgstr[0] "%d 新訊息"
 msgstr[1] "%d 新訊息"
 
-#: src/plugins/notification/notification_prefs.c:415
+#: src/plugins/notification/notification_prefs.c:419
 msgid "Hotkeys"
 msgstr "快捷鍵"
 
-#: src/plugins/notification/notification_prefs.c:434
+#: src/plugins/notification/notification_prefs.c:438
 msgid "Banner"
 msgstr "通知欄"
 
-#: src/plugins/notification/notification_prefs.c:452
+#: src/plugins/notification/notification_prefs.c:456
 msgid "Popup"
 msgstr "彈跳視窗"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/plugins/notification/notification_prefs.c:474 src/prefs_actions.c:264
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "命令"
 
-#: src/plugins/notification/notification_prefs.c:488
+#: src/plugins/notification/notification_prefs.c:492
 msgid "LCD"
 msgstr "LCD"
 
-#: src/plugins/notification/notification_prefs.c:506
+#: src/plugins/notification/notification_prefs.c:510
 msgid "SysTrayicon"
 msgstr "系統匣圖示"
 
-#: src/plugins/notification/notification_prefs.c:524
+#: src/plugins/notification/notification_prefs.c:528
 msgid "Indicator"
 msgstr "指示器"
 
-#: src/plugins/notification/notification_prefs.c:607
+#: src/plugins/notification/notification_prefs.c:611
 msgid "Include folder types"
 msgstr "包含的資料夾種類"
 
-#: src/plugins/notification/notification_prefs.c:616
+#: src/plugins/notification/notification_prefs.c:620
 msgid "Mail folders"
 msgstr "郵件資料夾"
 
-#: src/plugins/notification/notification_prefs.c:624
+#: src/plugins/notification/notification_prefs.c:628
 msgid "News folders"
 msgstr "新聞資料夾"
 
-#: src/plugins/notification/notification_prefs.c:632
+#: src/plugins/notification/notification_prefs.c:636
 msgid "RSSyl folders"
 msgstr "RSSyl資料夾"
 
-#: src/plugins/notification/notification_prefs.c:640
+#: src/plugins/notification/notification_prefs.c:644
 msgid "vCalendar folders"
 msgstr "vCalendar資料夾"
 
-#: src/plugins/notification/notification_prefs.c:648
+#: src/plugins/notification/notification_prefs.c:652
 msgid "These settings override folder-specific selections."
 msgstr "這些設定會覆蓋資料夾設定選項"
 
-#: src/plugins/notification/notification_prefs.c:659
+#: src/plugins/notification/notification_prefs.c:663
 msgid "Global notification settings"
 msgstr "全域的通知設定"
 
-#: src/plugins/notification/notification_prefs.c:668
+#: src/plugins/notification/notification_prefs.c:672
 msgid "Set window manager urgency hint when new messages exist"
 msgstr "設定「發現新郵件時」的視窗管理員緊急提示"
 
-#: src/plugins/notification/notification_prefs.c:677
+#: src/plugins/notification/notification_prefs.c:681
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr "設定「發現未讀郵件時」的視窗管理員緊急提示"
 
-#: src/plugins/notification/notification_prefs.c:687
+#: src/plugins/notification/notification_prefs.c:691
 msgid "Use sound theme"
 msgstr "使用聲音佈景主題"
 
-#: src/plugins/notification/notification_prefs.c:761
+#: src/plugins/notification/notification_prefs.c:763
 msgid "Show banner"
 msgstr "顯示通知欄"
 
-#: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/plugins/notification/notification_prefs.c:768
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr "從不"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
+#: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
+#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
 msgid "Always"
 msgstr "總是"
 
-#: src/plugins/notification/notification_prefs.c:770
+#: src/plugins/notification/notification_prefs.c:772
 msgid "Only when not empty"
 msgstr "只有在不是空白時"
 
-#: src/plugins/notification/notification_prefs.c:789
+#: src/plugins/notification/notification_prefs.c:791
 msgid "Banner speed"
 msgstr "通知欄的顯示速度"
 
-#: src/plugins/notification/notification_prefs.c:826
+#: src/plugins/notification/notification_prefs.c:828
 msgid "Maximum number of messages"
 msgstr "最大的郵件數量"
 
-#: src/plugins/notification/notification_prefs.c:832
+#: src/plugins/notification/notification_prefs.c:834
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr "顯示郵件數量的限制,選擇0表示沒有限制"
 
-#: src/plugins/notification/notification_prefs.c:841
+#: src/plugins/notification/notification_prefs.c:843
 msgid "Banner width"
 msgstr "通知欄寬度"
 
-#: src/plugins/notification/notification_prefs.c:847
+#: src/plugins/notification/notification_prefs.c:849
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr "通知欄的大小限制,繼擇0表示設定為螢幕寬度"
 
-#: src/plugins/notification/notification_prefs.c:849
+#: src/plugins/notification/notification_prefs.c:851
 msgid "pixel(s)"
 msgstr "畫素"
 
-#: src/plugins/notification/notification_prefs.c:858
+#: src/plugins/notification/notification_prefs.c:860
 msgid "Include unread mails in banner"
 msgstr "通知欄內包含未讀郵件"
 
-#: src/plugins/notification/notification_prefs.c:866
+#: src/plugins/notification/notification_prefs.c:868
 msgid "Make banner sticky"
 msgstr "讓通知欄黏貼"
 
-#: src/plugins/notification/notification_prefs.c:876
-#: src/plugins/notification/notification_prefs.c:1081
-#: src/plugins/notification/notification_prefs.c:1376
-#: src/plugins/notification/notification_prefs.c:1611
+#: 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
 msgid "Only include selected folders"
 msgstr "只包含選擇的資料夾"
 
-#: src/plugins/notification/notification_prefs.c:885
-#: src/plugins/notification/notification_prefs.c:1090
-#: src/plugins/notification/notification_prefs.c:1385
-#: src/plugins/notification/notification_prefs.c:1620
+#: 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
 msgid "Select folders..."
 msgstr "資料夾..."
 
-#: src/plugins/notification/notification_prefs.c:897
+#: src/plugins/notification/notification_prefs.c:899
 msgid "Banner colors"
 msgstr "通知欄顏色"
 
-#: src/plugins/notification/notification_prefs.c:901
-#: src/plugins/notification/notification_prefs.c:1122
+#: src/plugins/notification/notification_prefs.c:903
+#: src/plugins/notification/notification_prefs.c:1114
 msgid "Use custom colors"
 msgstr "自訂顏色"
 
-#: src/plugins/notification/notification_prefs.c:916
-#: src/plugins/notification/notification_prefs.c:1135
+#: src/plugins/notification/notification_prefs.c:918
+#: src/plugins/notification/notification_prefs.c:1128
 msgid "Foreground"
 msgstr "前景"
 
 #: src/plugins/notification/notification_prefs.c:922
-#: src/plugins/notification/notification_prefs.c:1141
+#: src/plugins/notification/notification_prefs.c:1134
 msgid "Foreground color"
 msgstr "前景顏色"
 
 #: src/plugins/notification/notification_prefs.c:927
-#: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
-#: src/prefs_msg_colors.c:286
+#: src/plugins/notification/notification_prefs.c:1140
+#: src/prefs_msg_colors.c:251 src/prefs_msg_colors.c:265
+#: src/prefs_msg_colors.c:279
 msgid "Background"
 msgstr "背景"
 
-#: src/plugins/notification/notification_prefs.c:933
-#: src/plugins/notification/notification_prefs.c:1152
+#: src/plugins/notification/notification_prefs.c:931
+#: src/plugins/notification/notification_prefs.c:1146
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/plugins/notification/notification_prefs.c:1045
-#: src/plugins/notification/notification_prefs.c:1646
+#: src/plugins/notification/notification_prefs.c:1037
+#: src/plugins/notification/notification_prefs.c:1634
 msgid "Enable popup"
 msgstr "彈跳視窗有效"
 
-#: src/plugins/notification/notification_prefs.c:1062
-#: src/plugins/notification/notification_prefs.c:1664
+#: src/plugins/notification/notification_prefs.c:1054
+#: src/plugins/notification/notification_prefs.c:1652
 msgid "Popup timeout"
 msgstr "彈跳視窗超時"
 
-#: src/plugins/notification/notification_prefs.c:1101
+#: src/plugins/notification/notification_prefs.c:1093
 msgid "Make popup sticky"
 msgstr "將彈跳視窗黏貼"
 
-#: src/plugins/notification/notification_prefs.c:1111
+#: src/plugins/notification/notification_prefs.c:1103
 msgid "Set popup window width and position"
 msgstr "設定彈跳視窗的寬度及位置"
 
-#: src/plugins/notification/notification_prefs.c:1116
+#: src/plugins/notification/notification_prefs.c:1108
 msgid "(the window manager is free to ignore this)"
 msgstr "(若忽略此項目,視窗管理員將不受限)"
 
-#: src/plugins/notification/notification_prefs.c:1164
-#: src/plugins/notification/notification_prefs.c:1676
+#: src/plugins/notification/notification_prefs.c:1158
+#: src/plugins/notification/notification_prefs.c:1664
 msgid "Display folder name"
 msgstr "顯示資料夾名稱"
 
-#: src/plugins/notification/notification_prefs.c:1229
+#: src/plugins/notification/notification_prefs.c:1217
 msgid "Sample popup window"
 msgstr "彈跳視窗範例"
 
-#: src/plugins/notification/notification_prefs.c:1235
+#: src/plugins/notification/notification_prefs.c:1223
 msgid "Done"
 msgstr "完成"
 
-#: src/plugins/notification/notification_prefs.c:1293
+#: src/plugins/notification/notification_prefs.c:1281
 msgid "Select command"
 msgstr "選擇命令"
 
-#: src/plugins/notification/notification_prefs.c:1322
+#: src/plugins/notification/notification_prefs.c:1310
 msgid "Enable command"
 msgstr "啟動命令"
 
-#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1327 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "執行的命令"
 
-#: src/plugins/notification/notification_prefs.c:1357
+#: src/plugins/notification/notification_prefs.c:1345
 msgid "Block command after execution for"
 msgstr "凍結命令於執行後"
 
-#: src/plugins/notification/notification_prefs.c:1464
+#: src/plugins/notification/notification_prefs.c:1452
 msgid "Enable LCD"
 msgstr "啟動LCD"
 
-#: src/plugins/notification/notification_prefs.c:1483
+#: src/plugins/notification/notification_prefs.c:1471
 msgid "Hostname:Port of LCDd server"
 msgstr "主機名稱:LCDd伺服器通訊埠"
 
-#: src/plugins/notification/notification_prefs.c:1568
+#: src/plugins/notification/notification_prefs.c:1556
 msgid "Enable Trayicon"
 msgstr "開啟系統匣圖示"
 
-#: src/plugins/notification/notification_prefs.c:1584
+#: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
 msgstr "啟動後隱藏"
 
-#: src/plugins/notification/notification_prefs.c:1592
+#: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
 msgstr "關閉後縮至系統匣"
 
-#: src/plugins/notification/notification_prefs.c:1600
+#: src/plugins/notification/notification_prefs.c:1588
 msgid "Hide when iconified"
 msgstr "iconified時隱藏"
 
@@ -11513,36 +11919,36 @@ msgstr "iconified時隱藏"
 #. 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:1637
+#: src/plugins/notification/notification_prefs.c:1625
 msgid "Passive toaster popup"
 msgstr "被動的彈出式視窗"
 
-#: src/plugins/notification/notification_prefs.c:1801
+#: src/plugins/notification/notification_prefs.c:1789
 msgid "Add to Indicator Applet"
 msgstr "加入到指示器面板"
 
-#: src/plugins/notification/notification_prefs.c:1815
+#: src/plugins/notification/notification_prefs.c:1803
 msgid "Hide mainwindow when minimized"
 msgstr "當最小化時隱藏主視窗"
 
-#: src/plugins/notification/notification_prefs.c:1868
+#: src/plugins/notification/notification_prefs.c:1856
 msgid "Enable global hotkeys"
 msgstr "使用全域的快捷鍵"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1870
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr "快捷鍵範例包括了 <b>%s</b> 和 <b>%s</b>"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<control><shift>F11"
 msgstr "<control><shift>F11"
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<alt>N"
 msgstr "<alt>N"
 
-#: src/plugins/notification/notification_prefs.c:1893
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "Toggle minimize"
 msgstr "圖釘最小化"
 
@@ -11583,169 +11989,169 @@ msgstr "顯示通知小圖示"
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "新的: %d, 未讀: %d, 全部: %d"
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:856
 msgid "New mail message"
 msgstr "新郵件"
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:858
 msgid "New news post"
 msgstr "新的新聞貼"
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:860
 msgid "New calendar message"
 msgstr "新行事曆訊息"
 
-#: src/plugins/notification/notification_trayicon.c:863
+#: src/plugins/notification/notification_trayicon.c:862
 msgid "New article in RSS feed"
 msgstr "新RSS文章"
 
-#: src/plugins/notification/notification_trayicon.c:866
+#: src/plugins/notification/notification_trayicon.c:865
 msgid "New messages arrived"
 msgstr "新訊息已到達"
 
-#: src/plugins/notification/notification_trayicon.c:922
+#: src/plugins/notification/notification_trayicon.c:921
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] "%d 新郵件已到達"
 msgstr[1] "%d 新郵件已到達"
 
-#: src/plugins/notification/notification_trayicon.c:933
+#: src/plugins/notification/notification_trayicon.c:932
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] "%d 新的新聞貼已到達"
 msgstr[1] "%d 新的新聞貼已到達"
 
-#: src/plugins/notification/notification_trayicon.c:955
+#: src/plugins/notification/notification_trayicon.c:954
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d 新的RSS文章已到達"
 msgstr[1] "%d 新的RSS文章已到達"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Title:"
 msgstr "標題:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:710
 msgid "Author:"
 msgstr "作者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:708
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Creator:"
 msgstr "建立者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:713
 msgid "Producer:"
 msgstr "製造者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:712
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Created:"
 msgstr "已建立:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:720
 msgid "Modified:"
 msgstr "已修改:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:723
 msgid "Format:"
 msgstr "格式:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
-#: src/plugins/pdf_viewer/poppler_viewer.c:724
+#: src/plugins/pdf_viewer/poppler_viewer.c:725
+#: src/plugins/pdf_viewer/poppler_viewer.c:728
 msgid "Optimized:"
 msgstr "已最佳化:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1222
+#: src/plugins/pdf_viewer/poppler_viewer.c:1233
 msgid "PDF properties"
 msgstr "PDF屬性"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1371
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1372
+#: src/plugins/pdf_viewer/poppler_viewer.c:1383
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "此文件已被鎖定,需要輸入正確的密碼才能開啟"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1387
+#: src/plugins/pdf_viewer/poppler_viewer.c:1398
 #, c-format
 msgid "%s Document"
 msgstr "%s 文件"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1393
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 #, c-format
 msgid "of %d"
 msgstr "%d 個當中"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1409
+#: src/plugins/pdf_viewer/poppler_viewer.c:1420
 msgid "PDF rendering failed for an unknown reason."
 msgstr "PDF因為未知原因開啟(渲染)失敗"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1781
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr "文件索引"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1963
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr "第一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1966
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1969
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr "下一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr "最後一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr "放大"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1977
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr "縮小"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1980
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr "滿版"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1983
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr "寬度放滿頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr "列印文件"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr "文件資訊"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2000
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr "頁碼"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2002
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr "縮放倍率因子"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2113
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11758,13 +12164,13 @@ msgstr ""
 "\n"
 "歡迎任何的回覆至: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2119
-#: src/plugins/pdf_viewer/poppler_viewer.c:2127
-#: src/plugins/pdf_viewer/poppler_viewer.c:2147
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr "PDF檢視器"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2123
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11778,7 +12184,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/perl/perl_gtk.c:50
+#: src/plugins/perl/perl_gtk.c:48
 msgid "Edit perl filter rules (ext)..."
 msgstr "編輯perl過濾器的規則 (ext)..."
 
@@ -11790,49 +12196,44 @@ msgstr "註冊PGP地址自動完成hook失敗"
 msgid "Passphrase"
 msgstr "密碼"
 
-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
 msgstr "[沒有使用者名稱(ID)]"
 
+#: src/plugins/pgpcore/passphrase.c:260
+msgid "Passphrases did not match.\n"
+msgstr "密碼不同\n"
+
 #: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr "請為新金鑰輸入密碼:"
 
-#: src/plugins/pgpcore/passphrase.c:264
-msgid "Passphrases did not match.\n"
-msgstr "密碼不同\n"
-
-#: src/plugins/pgpcore/passphrase.c:268
+#: src/plugins/pgpcore/passphrase.c:265
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "<請再一次為新金鑰輸入密碼:"
 
-#: src/plugins/pgpcore/passphrase.c:273
-msgid "Please enter the passphrase for:"
-msgstr "請輸入密碼:"
-
-#: src/plugins/pgpcore/passphrase.c:276
+#: src/plugins/pgpcore/passphrase.c:269
 msgid "Bad passphrase.\n"
 msgstr "錯誤的密碼\n"
 
+#: src/plugins/pgpcore/passphrase.c:270
+msgid "Please enter the passphrase for:"
+msgstr "請輸入密碼:"
+
 #: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr "金鑰匯入"
 
 #: src/plugins/pgpcore/pgp_viewer.c:180
 msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it?"
-msgstr ""
-"這個金鑰並不在你的鑰匙圈內。你希望 Claws Mail 嘗試匯入它嗎? "
-
-#: src/plugins/pgpcore/pgp_viewer.c:182
-msgid "_No"
-msgstr "_N否"
+"This key is not in your keyring. Do you want Claws Mail to try to import it?"
+msgstr "這個金鑰並不在你的鑰匙圈內。你希望 Claws Mail 嘗試匯入它嗎? "
 
 #: src/plugins/pgpcore/pgp_viewer.c:182
 msgid "from keyserver"
 msgstr "使用代理伺服器"
 
-#: src/plugins/pgpcore/pgp_viewer.c:182
+#: src/plugins/pgpcore/pgp_viewer.c:183
 msgid "from Web Key Directory"
 msgstr "來自網路金鑰路徑"
 
@@ -11892,8 +12293,7 @@ msgstr "   金鑰伺服器有時很緩慢\n"
 
 #: src/plugins/pgpcore/pgp_viewer.c:284
 msgid "   You can try to import it manually with the command:"
-msgstr ""
-"   你可以嘗試以手動匯入方式,以命令:"
+msgstr "   你可以嘗試以手動匯入方式,以命令:"
 
 #: src/plugins/pgpcore/pgp_viewer.c:288
 msgid "or"
@@ -11957,9 +12357,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:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
-#: src/prefs_account.c:2161 src/prefs_receive.c:190
+#: 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
 msgid "minutes"
 msgstr "分"
 
@@ -12017,69 +12417,69 @@ msgstr "產生一對新的金鑰"
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:35
+#: src/plugins/smime/smime.c:1078
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "沒有完全符合'%s'的;請選擇金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "為 '%s' ... %c 搜集資訊"
 
-#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr "未定義"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:166
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr "臨界值"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
-#: src/plugins/pgpcore/sgpgme.c:170
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr "極限值"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr "選擇金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:458
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr "金鑰 ID"
 
-#: src/plugins/pgpcore/select-keys.c:476
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr "信任"
 
-#: src/plugins/pgpcore/select-keys.c:495
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr "其它(_O)"
 
-#: src/plugins/pgpcore/select-keys.c:496
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr "不要加密(_n)"
 
-#: src/plugins/pgpcore/select-keys.c:677
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr "新加入金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:678
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr "輸入其它的使用者ID或金鑰ID:"
 
-#: src/plugins/pgpcore/select-keys.c:700
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "加密至 %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:701
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -12098,178 +12498,176 @@ msgstr ""
 "\n"
 "你是如足夠信任此金鑰並使用它?"
 
-#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
-#: src/privacy.c:270 src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:281 src/privacy.c:286
 msgid "No signature found"
 msgstr "找不到簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:164
+#: src/plugins/pgpcore/sgpgme.c:350
 msgid "Untrusted"
 msgstr "不被信任的"
 
-#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:424 src/plugins/pgpcore/sgpgme.c:443
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "這個簽名無法被檢查 - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
+#: src/plugins/pgpcore/sgpgme.c:428 src/plugins/pgpcore/sgpgme.c:432
 msgid "The signature has not been checked."
 msgstr "這個簽名尚未被檢查"
 
-#: src/plugins/pgpcore/sgpgme.c:252
+#: src/plugins/pgpcore/sgpgme.c:438
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: 無法取得金鑰 - 沒有執行gpg-agent"
 
-#: src/plugins/pgpcore/sgpgme.c:270
+#: src/plugins/pgpcore/sgpgme.c:456
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "來自於 \"%s\" 的良好簽名 [最根本的]"
 
-#: src/plugins/pgpcore/sgpgme.c:273
+#: src/plugins/pgpcore/sgpgme.c:459
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "來自於 \"%s\" 的良好簽名 [完整的]"
 
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:462
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "來自於 \"%s\" 的良好簽名 [最低限度的]"
 
-#: src/plugins/pgpcore/sgpgme.c:283
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "來自於 \"%s\" 的良好簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
+#: src/plugins/pgpcore/sgpgme.c:471 src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "金鑰 0x%s 用來驗證這一個簽名是無效的"
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:477
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "來自於 \"%s\" 的過期簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:294
+#: src/plugins/pgpcore/sgpgme.c:480
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經過期了"
 
-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:483
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經被撤回"
 
-#: src/plugins/pgpcore/sgpgme.c:300
+#: src/plugins/pgpcore/sgpgme.c:486
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "來自於 \"%s\" 的不良簽名,"
 
-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:493
 msgid "The signature has not been checked"
 msgstr "這個簽名尚未被檢查過"
 
-#: src/plugins/pgpcore/sgpgme.c:330
+#: src/plugins/pgpcore/sgpgme.c:516
 msgid "Error checking signature: no status\n"
 msgstr "檢查簽名發生錯誤:沒有狀態\n"
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:535
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "檢查簽名發生錯誤: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:553
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "此簽名是以 %s 製作,使用 %s 金鑰 ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:559
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的良好簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:564
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "逾期的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:569
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的逾期簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:574
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "已撤銷的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:392
+#: src/plugins/pgpcore/sgpgme.c:579
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "來自 \"%s\" 的不良簽名\n"
 
-#: src/plugins/pgpcore/sgpgme.c:405
-#, c-format
-msgid "uid \"%s\" (Validity: %s)\n"
+#: src/plugins/pgpcore/sgpgme.c:591
+msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr "uid\"%s\"(有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:593
 msgid "Revoked"
 msgstr "已撤銷"
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:598
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "擁有者信任: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:413
+#: src/plugins/pgpcore/sgpgme.c:599
 msgid "No key!"
 msgstr "沒有金鑰!"
 
-#: src/plugins/pgpcore/sgpgme.c:415
+#: src/plugins/pgpcore/sgpgme.c:601
 msgid "Primary key fingerprint:"
 msgstr "主要的金鑰指紋:"
 
-#: src/plugins/pgpcore/sgpgme.c:433
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告:簽名者的地址 \"%s\" 和DNS項目不符合\n"
 
-#: src/plugins/pgpcore/sgpgme.c:439
+#: src/plugins/pgpcore/sgpgme.c:625
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "已驗證的簽名者地址是 \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:473
+#: src/plugins/pgpcore/sgpgme.c:660
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "無法取得來自郵件 %s 的資料"
 
-#: src/plugins/pgpcore/sgpgme.c:489
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "無法初始化資料, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:855
 msgid "Secret key specification is ambiguous"
 msgstr "密鑰規格模稜兩可"
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:865
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "無不到密鑰 (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:689
+#: src/plugins/pgpcore/sgpgme.c:878
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "設定密鑰錯誤: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:782
+#: src/plugins/pgpcore/sgpgme.c:971
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme 協定 '%s' 無法使用:引擎 '%s' 尚未被正確的安裝"
 
-#: src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/pgpcore/sgpgme.c:977
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -12278,12 +12676,12 @@ msgstr ""
 "Gpgme 協定 '%s' 無法使用:已安裝引擎 '%s' ,版本為 %s,但是 需要的版本應為 "
 "%s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:796
+#: src/plugins/pgpcore/sgpgme.c:985
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme 協定 '%s' 無法使用 (未知的問題)"
 
-#: src/plugins/pgpcore/sgpgme.c:812
+#: src/plugins/pgpcore/sgpgme.c:1001
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -12291,17 +12689,17 @@ msgstr ""
 "GnuPG 尚未正確的安裝,或是需要升級\n"
 "OpenPGP支援已關閉"
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:1078
 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:894
+#: src/plugins/pgpcore/sgpgme.c:1083
 msgid "No PGP key found"
 msgstr "找不到PGP金鑰"
 
-#: src/plugins/pgpcore/sgpgme.c:895
+#: src/plugins/pgpcore/sgpgme.c:1084
 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"
@@ -12311,22 +12709,22 @@ msgstr ""
 "件\n"
 "你確定現在要產生一對新的金鑰嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
+#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "無法產生一對新的金鑰: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:994
+#: src/plugins/pgpcore/sgpgme.c:1184
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "你的新金鑰對正在建立中... 請將移動滑鼠以利產生... generate entropy..."
 
-#: src/plugins/pgpcore/sgpgme.c:1012
+#: src/plugins/pgpcore/sgpgme.c:1202
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "無法產生新的金鑰對: 未知的錯誤"
 
-#: src/plugins/pgpcore/sgpgme.c:1016
+#: src/plugins/pgpcore/sgpgme.c:1206
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12339,62 +12737,41 @@ msgstr ""
 "\n"
 "你要將它匯出至金鑰伺服器嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:1020
+#: src/plugins/pgpcore/sgpgme.c:1210
 msgid "Key generated"
 msgstr "金鑰已產生"
 
-#: src/plugins/pgpcore/sgpgme.c:1096
+#: src/plugins/pgpcore/sgpgme.c:1286
 msgid "Key exported."
 msgstr "金鑰已匯出"
 
-#: src/plugins/pgpcore/sgpgme.c:1098
+#: src/plugins/pgpcore/sgpgme.c:1288
 msgid "Couldn't export key."
 msgstr "無法匯出金鑰"
 
-#: src/plugins/pgpinline/pgpinline.c:156
-msgid "Incorrect part"
-msgstr "不正確的區塊"
-
-#: src/plugins/pgpinline/pgpinline.c:160
-msgid "Not a text part"
-msgstr "不是一個文件區塊"
+#: src/plugins/pgpinline/pgpinline.c:385
+msgid "Couldn't parse mime part."
+msgstr "無法解析mime的區塊"
 
-#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
+#: src/plugins/pgpinline/pgpinline.c:392
 msgid "Couldn't get text data."
 msgstr "無法取得文件資料"
 
-#: src/plugins/pgpinline/pgpinline.c:189
-msgid "Couldn't convert text data to any sane charset."
-msgstr "無法將文字資料轉換至其它合理的字元"
-
-#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
-#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
-#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
-#: src/plugins/smime/smime.c:418
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "無法初始化PGP內容, %s"
-
-#: src/plugins/pgpinline/pgpinline.c:316
-msgid "Couldn't parse mime part."
-msgstr "無法解析mime的區塊"
-
-#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
+#: src/plugins/pgpinline/pgpinline.c:423 src/plugins/pgpmime/pgpmime.c:262
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "無法開啟已加密的檔案 %s"
 
-#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
-#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
-#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
-#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#: src/plugins/pgpinline/pgpinline.c:442 src/plugins/pgpinline/pgpinline.c:451
+#: src/plugins/pgpinline/pgpinline.c:460 src/plugins/pgpinline/pgpinline.c:468
+#: src/plugins/pgpinline/pgpinline.c:478 src/plugins/pgpinline/pgpinline.c:487
+#: src/plugins/pgpmime/pgpmime.c:274 src/plugins/pgpmime/pgpmime.c:289
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "無法寫入已解密的檔案 %s"
 
-#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
-#: src/plugins/pgpinline/pgpinline.c:379
+#: src/plugins/pgpinline/pgpinline.c:456 src/plugins/pgpinline/pgpinline.c:457
+#: src/plugins/pgpinline/pgpinline.c:458
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12402,69 +12779,77 @@ msgstr ""
 "\n"
 "--- 此為 PGP/Inline 加密資料的開始 ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
-#: src/plugins/pgpinline/pgpinline.c:397
+#: 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 "--- 此為 PGP/Inline 加密資料的結束 ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
+#: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpmime/pgpmime.c:302
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "無法關閉已解密的檔案 %s"
 
-#: src/plugins/pgpinline/pgpinline.c:428
+#: src/plugins/pgpinline/pgpinline.c:509
 msgid "Couldn't scan decrypted file."
 msgstr "無法掃描已解密的檔案"
 
-#: src/plugins/pgpinline/pgpinline.c:436
+#: src/plugins/pgpinline/pgpinline.c:518
 msgid "Couldn't scan decrypted file parts."
 msgstr "無法掃描已解密的部份檔案"
 
-#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
+#: src/plugins/pgpinline/pgpinline.c:575 src/plugins/pgpinline/pgpinline.c:770
 msgid "Malformed message"
 msgstr "Malformed 郵件"
 
-#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
-#: src/plugins/pgpmime/pgpmime.c:696
+#: src/plugins/pgpinline/pgpinline.c:586 src/plugins/pgpinline/pgpinline.c:784
+#: src/plugins/pgpmime/pgpmime.c:614
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "無法建立暫存檔,%s"
 
-#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
+#: src/plugins/pgpinline/pgpinline.c:601 src/plugins/pgpinline/pgpinline.c:740
+#: src/plugins/pgpinline/pgpinline.c:805 src/plugins/pgpmime/pgpmime.c:230
+#: src/plugins/pgpmime/pgpmime.c:425 src/plugins/pgpmime/pgpmime.c:569
+#: src/plugins/smime/smime.c:559
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "無法初始化PGP內容, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:625 src/plugins/pgpmime/pgpmime.c:452
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "資料簽名失敗, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
+#: src/plugins/pgpinline/pgpinline.c:643 src/plugins/pgpmime/pgpmime.c:479
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "資料簽名失敗起因於無效的簽名者: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
+#: src/plugins/pgpinline/pgpinline.c:652 src/plugins/pgpmime/pgpmime.c:488
 msgid "Data signing failed, no results."
 msgstr "資料簽名失敗, 沒有結果"
 
-#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
+#: src/plugins/pgpinline/pgpinline.c:662 src/plugins/pgpmime/pgpmime.c:499
 msgid "Data signing failed, no contents."
 msgstr "資料簽名失敗,沒有內容"
 
-#: src/plugins/pgpinline/pgpinline.c:624
+#: src/plugins/pgpinline/pgpinline.c:706
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
 msgstr "請注意!附件沒有用 PGP/Inline 系統進行加密,不包括 郵件標頭,像是主旨"
 
-#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:580
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "無法加入 GPG 金鑰 %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpinline/pgpinline.c:823 src/plugins/pgpmime/pgpmime.c:649
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失敗,%s"
 
-#: src/plugins/pgpinline/pgpinline.c:796
+#: src/plugins/pgpinline/pgpinline.c:892
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12496,34 +12881,30 @@ msgstr ""
 "\n"
 "GPGME 版權宣告於 2001 屬於 Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:204
-msgid "Signature boundary not found."
-msgstr "找不到簽名的邊界"
-
-#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
+#: src/plugins/pgpmime/pgpmime.c:314 src/plugins/smime/smime.c:653
 msgid "Couldn't parse decrypted file."
 msgstr "無法解析已解密的檔案"
 
-#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
+#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/smime/smime.c:661
 msgid "Couldn't parse decrypted file parts."
 msgstr "無法解析已解密的部份檔案"
 
-#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
+#: src/plugins/pgpmime/pgpmime.c:369 src/plugins/pgpmime/pgpmime.c:408
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "無法建立暫存檔案: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:599
+#: src/plugins/pgpmime/pgpmime.c:513
 msgid "OpenPGP digital signature"
 msgstr "OpenPGP 數位簽名"
 
-#: src/plugins/pgpmime/pgpmime.c:622
+#: src/plugins/pgpmime/pgpmime.c:536
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr "請注郵件標頭,像是主旨,無法使用PGP/Mime系統進行加密"
 
-#: src/plugins/pgpmime/pgpmime.c:798
+#: src/plugins/pgpmime/pgpmime.c:723
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12554,36 +12935,36 @@ msgstr ""
 "\n"
 "GPGME 版權宣告於 2001 屬於 Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:379
-#: src/plugins/python/python_plugin.c:523
+#: src/plugins/python/python_plugin.c:380
+#: src/plugins/python/python_plugin.c:524
 msgid "Python scripts"
 msgstr "Python 腳本"
 
-#: src/plugins/python/python_plugin.c:518
+#: src/plugins/python/python_plugin.c:519
 msgid "Show Python console..."
 msgstr "顯示 Python 控制台..."
 
-#: src/plugins/python/python_plugin.c:524
-#: src/plugins/rssyl/rssyl_feed_props.c:471
+#: src/plugins/python/python_plugin.c:525
+#: src/plugins/rssyl/rssyl_feed_props.c:470
 msgid "Refresh"
 msgstr "更新"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3026
-#: src/prefs_account.c:3054 src/prefs_account.c:3491 src/wizard.c:1206
-#: src/wizard.c:1626
+#: 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/wizard.c:1659
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/plugins/python/python_plugin.c:672
-#: src/plugins/python/python_plugin.c:762
+#: src/plugins/python/python_plugin.c:635
+#: src/plugins/python/python_plugin.c:722
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:681
+#: src/plugins/python/python_plugin.c:644
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "在 Python 外掛程式中註冊 \"建立新郵件 hook\" 失敗"
 
-#: src/plugins/python/python_plugin.c:767
+#: src/plugins/python/python_plugin.c:727
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12663,11 +13044,11 @@ msgstr ""
 " \n"
 "歡迎回覆至 <berndth at gmx.de> "
 
-#: src/plugins/python/python_plugin.c:818
+#: src/plugins/python/python_plugin.c:778
 msgid "Python integration"
 msgstr "Python 整合"
 
-#: src/plugins/rssyl/old_feeds.c:90
+#: src/plugins/rssyl/old_feeds.c:92
 #, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
@@ -12731,40 +13112,40 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(空白)"
 
-#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
 msgid "Refresh all feeds"
 msgstr "更新所有的feeds"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 msgid "Subscribe feed"
 msgstr "訂閱feed"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:67
+#: src/plugins/rssyl/rssyl_cb_menu.c:100
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "輸入你希望訂閱的新聞feed的URL:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:136
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' 不能用於資料夾名稱"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail需要網路的存取能力才能進行feed的更新"
 msgstr[1] "Claws Mail需要網路的存取能力才能進行feed的更新"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:321
+#: src/plugins/rssyl/rssyl_cb_menu.c:359
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "你確定要移除feed `%s' 的樹狀結構嗎?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:322
+#: src/plugins/rssyl/rssyl_cb_menu.c:360
 msgid "Remove feed tree"
 msgstr "移除feed的樹狀結構"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_cb_menu.c:395
 msgid "Select an OPML file"
 msgstr "選擇一個 OPML 檔案"
 
@@ -12808,51 +13189,51 @@ msgstr "RSSyl: 無法在 '%s' 進行 feed \n"
 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:270
+#: src/plugins/rssyl/rssyl_feed_props.c:269
 msgid "HTTP Basic authentication"
 msgstr "HTTP 基礎認證"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:292
+#: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr "使用預設更新時間"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:304
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
 msgstr "保持舊有的項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:310
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
 msgstr "對齊(_T)"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "更新 feed,刪除那些已經不在來源feed內的項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:315
+#: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr "如果可以的話擷取註解"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:335
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Always mark it as new"
 msgstr "永遠標示為新feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:336
 msgid "Only mark it as new if its text has changed"
 msgstr "只有當此文件內容異動時,才會把它標示為新文件"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Never mark it as new"
 msgstr "永遠不要標示為新feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:344
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 msgid "Add item title to the top of message"
 msgstr "增加項目的標題至郵件的頂端"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Ignore title rename"
 msgstr "忽略標題的變更"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12860,54 +13241,50 @@ msgstr ""
 "啟用這個功能可以保持目前的資料夾名稱,甚至當feed作者改變feed的標題時也一樣有"
 "效"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:360
-#: src/plugins/vcalendar/vcal_prefs.c:593
-msgid "Verify SSL/TLS certificate validity"
+#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/vcalendar/vcal_prefs.c:594
+msgid "Verify TLS certificate validity"
 msgstr "驗證 SSL/TLS 認證的有效期限"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:380
+#: src/plugins/rssyl/rssyl_feed_props.c:379
 msgid "User name"
 msgstr "使用者名稱"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "Source URL"
 msgstr "來源 URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:406
+#: src/plugins/rssyl/rssyl_feed_props.c:405
 msgid "Fetch comments on posts aged less than"
 msgstr "如果可以的話擷取註解,貼文出現至今少於"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
-#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: 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
 msgid "days"
 msgstr "天"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:415
+#: src/plugins/rssyl/rssyl_feed_props.c:414
 msgid "Set to -1 to fetch all comments"
 msgstr "設定為 -1 時將會擷取所有的註解"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:439
+#: src/plugins/rssyl/rssyl_feed_props.c:438
 msgid "If an item changes"
 msgstr "如果項目改變了"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:444
+#: src/plugins/rssyl/rssyl_feed_props.c:443
 msgid "Items"
 msgstr "項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:457
+#: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Refresh interval"
 msgstr "刷新的間隔時間"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:465
+#: src/plugins/rssyl/rssyl_feed_props.c:464
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "若要關閉此feed的自動更新功能,將它設定為0"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:517
-msgid "_OK"
-msgstr "確定(_O)"
-
-#: src/plugins/rssyl/rssyl_feed_props.c:525
+#: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "Set feed properties"
 msgstr "設定 feed 屬性"
 
@@ -12977,7 +13354,7 @@ msgid "Refresh all feeds on application start"
 msgstr "啟動時更新所有feeds"
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-msgid "Verify SSL/TLS certificates validity for new feeds"
+msgid "Verify TLS certificates validity for new feeds"
 msgstr "對所有新的feeds進行SSL/TLS認證的驗證"
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
@@ -13009,23 +13386,23 @@ msgstr "加入新 feed 嗎?"
 msgid "Feed folder:"
 msgstr "Feed 資料夾:"
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 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:77
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
 msgid "_Edit feed properties after subscribing"
 msgstr "加入後編輯 feed 屬性(_E)"
 
-#: src/plugins/rssyl/rssyl_update_comments.c:107
+#: src/plugins/rssyl/rssyl_update_comments.c:109
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr "為 '%s' 更新註解..."
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1624
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "401 (Authorisation required)"
 msgstr "401 (要求認證)"
 
@@ -13034,7 +13411,7 @@ msgid "403 (Forbidden)"
 msgstr "403 (無法認證)"
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1630
+#: src/plugins/vcalendar/vcal_folder.c:1632
 msgid "404 (Not found)"
 msgstr "404 (找不到)"
 
@@ -13102,7 +13479,7 @@ msgid ""
 msgstr ""
 "升級儲存格式時發生內部錯誤,這是不應該發生的。請將除錯輸出夾檔後提報。\n"
 
-#: src/plugins/smime/plugin.c:59
+#: src/plugins/smime/plugin.c:61
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
@@ -13136,44 +13513,44 @@ msgstr ""
 "找得到\n"
 "GPGME 版本來自於 Werner Koch <dd9jn at gnu.org>,於 2001"
 
-#: src/plugins/smime/smime.c:426
+#: src/plugins/smime/smime.c:567
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "無法設定 GPG 協定,%s"
 
-#: src/plugins/smime/smime.c:454
+#: src/plugins/smime/smime.c:603
 msgid "Couldn't open temporary file"
 msgstr "無法開啟暫存檔"
 
-#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
+#: src/plugins/smime/smime.c:615 src/plugins/smime/smime.c:631
 msgid "Couldn't write to temporary file"
 msgstr "無法寫入暫存檔"
 
-#: src/plugins/smime/smime.c:491
+#: src/plugins/smime/smime.c:643
 msgid "Couldn't close temporary file"
 msgstr "無法關閉暫存檔"
 
-#: src/plugins/smime/smime.c:714
+#: src/plugins/smime/smime.c:867
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr "請注意,郵件的標頭,像是主旨,無法使用 S/MIME 系統進行加密"
 
-#: src/plugins/spam_report/spam_report.c:307
+#: src/plugins/spam_report/spam_report.c:312
 msgid "Reporting spam..."
 msgstr "正在提報垃圾郵件..."
 
-#: src/plugins/spam_report/spam_report.c:342
+#: src/plugins/spam_report/spam_report.c:347
 msgid "Report spam online..."
 msgstr "線上提報垃圾郵件..."
 
-#: src/plugins/spam_report/spam_report.c:353
-#: src/plugins/spam_report/spam_report.c:391
+#: src/plugins/spam_report/spam_report.c:358
+#: src/plugins/spam_report/spam_report.c:396
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "垃圾郵件提報"
 
-#: src/plugins/spam_report/spam_report.c:396
+#: src/plugins/spam_report/spam_report.c:401
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -13189,7 +13566,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:421
+#: src/plugins/spam_report/spam_report.c:426
 msgid "Spam reporting"
 msgstr "垃圾郵件提報"
 
@@ -13197,16 +13574,17 @@ msgstr "垃圾郵件提報"
 msgid "Enabled"
 msgstr "啟用"
 
-#: src/plugins/spam_report/spam_report_prefs.c:169
+#: src/plugins/spam_report/spam_report_prefs.c:167
 msgid "Forward to:"
 msgstr "轉寄至:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
+#: src/plugins/spam_report/spam_report_prefs.c:181 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_gtk.c:674
+#: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr "垃圾暗殺者(SpamAssassin)"
 
@@ -13241,15 +13619,15 @@ msgid ""
 "learner."
 msgstr "Claws Mail 需要網路的存取能力才能將郵件送至遠端的學習器  "
 
-#: src/plugins/spamassassin/spamassassin.c:561
+#: src/plugins/spamassassin/spamassassin.c:565
 msgid "Failed to get username"
 msgstr "取得使用者名稱失敗"
 
-#: src/plugins/spamassassin/spamassassin.c:578
+#: src/plugins/spamassassin/spamassassin.c:582
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin外掛程式已載入,但是已在它的選項目被關閉了。\n"
 
-#: src/plugins/spamassassin/spamassassin.c:612
+#: src/plugins/spamassassin/spamassassin.c:616
 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 "
@@ -13299,39 +13677,39 @@ msgstr "傳送"
 msgid "Type of transport"
 msgstr "傳送的型別"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:310
+#: src/plugins/spamassassin/spamassassin_gtk.c:306
 msgid "User"
 msgstr "使用者"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:323
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "User to use with spamd server"
 msgstr "使用spamd伺服器的使用者"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:325
+#: src/plugins/spamassassin/spamassassin_gtk.c:319
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:343
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
 msgstr "spamd伺服器的主機名稱或IP位址"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:354
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
 msgid "Port of spamd server"
 msgstr "spamd伺服器的通訊埠"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:360
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
 msgstr "Unix socket的路徑"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:359
 msgid "Use compression"
 msgstr "使用壓縮模式"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:371
+#: src/plugins/spamassassin/spamassassin_gtk.c:363
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr "若spamd使用了壓縮,就啟用壓縮功能,否則,停止此功能"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:406
+#: src/plugins/spamassassin/spamassassin_gtk.c:398
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -13350,29 +13728,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:131
-#: src/plugins/tnef_parse/tnef_parse.c:138
+#: src/plugins/tnef_parse/tnef_parse.c:134
+#: src/plugins/tnef_parse/tnef_parse.c:142
 msgid "Failed to write the part data."
 msgstr "部份寫入資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:183
+#: src/plugins/tnef_parse/tnef_parse.c:187
 msgid "Failed to parse VCalendar data."
 msgstr "解析 VCalendar 資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:222
+#: src/plugins/tnef_parse/tnef_parse.c:226
 msgid "Failed to parse VTask data."
 msgstr "解析 VTask 資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:274
+#: src/plugins/tnef_parse/tnef_parse.c:278
 msgid "Failed to parse VCard data."
 msgstr "解析 VCard 資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:414
-#: src/plugins/tnef_parse/tnef_parse.c:438
+#: src/plugins/tnef_parse/tnef_parse.c:418
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid "TNEF Parser"
 msgstr "TNEF解析器"
 
-#: src/plugins/tnef_parse/tnef_parse.c:443
+#: src/plugins/tnef_parse/tnef_parse.c:447
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13384,115 +13762,115 @@ msgstr ""
 "此外掛程式使用 Ytnef 函式庫,其著作權屬於 Randall 2002-2007 <yerase at yerot."
 "com>"
 
-#: src/plugins/vcalendar/common-views.c:62
+#: src/plugins/vcalendar/common-views.c:61
 msgid "_Edit this meeting..."
 msgstr "編輯這個會議(_E)"
 
-#: src/plugins/vcalendar/common-views.c:63
+#: src/plugins/vcalendar/common-views.c:62
 msgid "_Cancel this meeting..."
 msgstr "取消這個會議(_C)"
 
-#: src/plugins/vcalendar/common-views.c:65
+#: src/plugins/vcalendar/common-views.c:64
 msgid "_Create new meeting..."
 msgstr "建立新會議(_C)"
 
-#: src/plugins/vcalendar/common-views.c:67
+#: src/plugins/vcalendar/common-views.c:66
 msgid "_Go to today"
 msgstr "前往今天(_G)"
 
-#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:599 src/plugins/vcalendar/month-view.c:688
 msgid "Start"
 msgstr "開始"
 
-#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:701
 msgid "Show"
 msgstr "顯示"
 
-#: src/plugins/vcalendar/month-view.c:109
+#: src/plugins/vcalendar/month-view.c:108
 msgid "Monday"
 msgstr "星期一"
 
-#: src/plugins/vcalendar/month-view.c:110
+#: src/plugins/vcalendar/month-view.c:109
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/plugins/vcalendar/month-view.c:111
+#: src/plugins/vcalendar/month-view.c:110
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/plugins/vcalendar/month-view.c:112
+#: src/plugins/vcalendar/month-view.c:111
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/plugins/vcalendar/month-view.c:113
+#: src/plugins/vcalendar/month-view.c:112
 msgid "Friday"
 msgstr "星期五"
 
-#: src/plugins/vcalendar/month-view.c:114
+#: src/plugins/vcalendar/month-view.c:113
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/plugins/vcalendar/month-view.c:115
+#: src/plugins/vcalendar/month-view.c:114
 msgid "Sunday"
 msgstr "星期天"
 
-#: src/plugins/vcalendar/month-view.c:118
+#: src/plugins/vcalendar/month-view.c:117
 msgid "January"
 msgstr "一月"
 
-#: src/plugins/vcalendar/month-view.c:119
+#: src/plugins/vcalendar/month-view.c:118
 msgid "February"
 msgstr "二月"
 
-#: src/plugins/vcalendar/month-view.c:120
+#: src/plugins/vcalendar/month-view.c:119
 msgid "March"
 msgstr "三月"
 
-#: src/plugins/vcalendar/month-view.c:121
+#: src/plugins/vcalendar/month-view.c:120
 msgid "April"
 msgstr "四月"
 
-#: src/plugins/vcalendar/month-view.c:122
+#: src/plugins/vcalendar/month-view.c:121
 msgid "May"
 msgstr "五月"
 
-#: src/plugins/vcalendar/month-view.c:123
+#: src/plugins/vcalendar/month-view.c:122
 msgid "June"
 msgstr "六月"
 
-#: src/plugins/vcalendar/month-view.c:124
+#: src/plugins/vcalendar/month-view.c:123
 msgid "July"
 msgstr "七月"
 
-#: src/plugins/vcalendar/month-view.c:125
+#: src/plugins/vcalendar/month-view.c:124
 msgid "August"
 msgstr "八月"
 
-#: src/plugins/vcalendar/month-view.c:126
+#: src/plugins/vcalendar/month-view.c:125
 msgid "September"
 msgstr "九月"
 
-#: src/plugins/vcalendar/month-view.c:127
+#: src/plugins/vcalendar/month-view.c:126
 msgid "October"
 msgstr "十月"
 
-#: src/plugins/vcalendar/month-view.c:128
+#: src/plugins/vcalendar/month-view.c:127
 msgid "November"
 msgstr "十一月"
 
-#: src/plugins/vcalendar/month-view.c:129
+#: src/plugins/vcalendar/month-view.c:128
 msgid "December"
 msgstr "十二月"
 
-#: src/plugins/vcalendar/month-view.c:798
+#: src/plugins/vcalendar/month-view.c:789
 msgid "Week number"
 msgstr "星期幾"
 
-#: src/plugins/vcalendar/month-view.c:889
+#: src/plugins/vcalendar/month-view.c:874
 msgid "Previous month"
 msgstr "上個月"
 
-#: src/plugins/vcalendar/month-view.c:909
+#: src/plugins/vcalendar/month-view.c:893
 msgid "Next month"
 msgstr "下個月"
 
@@ -13527,75 +13905,75 @@ msgstr ""
 msgid "Calendar"
 msgstr "行事曆"
 
-#: src/plugins/vcalendar/vcalendar.c:100
+#: src/plugins/vcalendar/vcalendar.c:97
 msgid "Create meeting from message..."
 msgstr "從郵件建立會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:120
+#: src/plugins/vcalendar/vcalendar.c:117
 #, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "你可以一個一個建立 %d 會議,你要續嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:140
+#: src/plugins/vcalendar/vcalendar.c:137
 msgid "Creating meeting..."
 msgstr "建立會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:159
+#: src/plugins/vcalendar/vcalendar.c:156
 msgid "no subject"
 msgstr "沒有主旨"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:382
 msgid "Accept"
 msgstr "接受"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:383
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: src/plugins/vcalendar/vcalendar.c:387
+#: src/plugins/vcalendar/vcalendar.c:384
 msgid "Decline"
 msgstr "拒絕"
 
-#: src/plugins/vcalendar/vcalendar.c:476
+#: src/plugins/vcalendar/vcalendar.c:473
 msgid "You have a Todo item."
 msgstr "你有一個待執行項目"
 
-#: src/plugins/vcalendar/vcalendar.c:477 src/plugins/vcalendar/vcalendar.c:484
-#: src/plugins/vcalendar/vcalendar.c:489 src/plugins/vcalendar/vcalendar.c:497
-#: src/plugins/vcalendar/vcalendar.c:506 src/plugins/vcalendar/vcalendar.c:718
+#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:712
 msgid "Details follow:"
 msgstr "細節如下:"
 
-#: src/plugins/vcalendar/vcalendar.c:483
+#: src/plugins/vcalendar/vcalendar.c:480
 msgid "You have created a meeting."
 msgstr "你已經建立了一個會議"
 
-#: src/plugins/vcalendar/vcalendar.c:488
+#: src/plugins/vcalendar/vcalendar.c:485
 msgid "You have been invited to a meeting."
 msgstr "你已收到一個會議的邀請"
 
-#: src/plugins/vcalendar/vcalendar.c:496
+#: src/plugins/vcalendar/vcalendar.c:493
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "一個你已收到的會議邀請已取消"
 
-#: src/plugins/vcalendar/vcalendar.c:505
+#: src/plugins/vcalendar/vcalendar.c:502
 msgid "You have been forwarded an appointment."
 msgstr "你已轉發一個約會"
 
-#: src/plugins/vcalendar/vcalendar.c:559
+#: src/plugins/vcalendar/vcalendar.c:556
 msgid "(this event recurs)"
 msgstr "(此事件重現)"
 
-#: src/plugins/vcalendar/vcalendar.c:566
+#: src/plugins/vcalendar/vcalendar.c:562
 msgid "(this event is part of a recurring event)"
 msgstr "(這個事件是一個重現性事件的一部份)"
 
-#: src/plugins/vcalendar/vcalendar.c:717
+#: src/plugins/vcalendar/vcalendar.c:711
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "你收到了一個未知的計畫會議回覆"
 
-#: src/plugins/vcalendar/vcalendar.c:721
+#: src/plugins/vcalendar/vcalendar.c:715
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13604,35 +13982,35 @@ msgstr ""
 "你收到了一個計畫的會議回覆\n"
 "%s 有 %s 個邀請,細節如下:"
 
-#: src/plugins/vcalendar/vcalendar.c:800
+#: src/plugins/vcalendar/vcalendar.c:796
 msgid "Error - could not get the calendar MIME part."
 msgstr "錯誤 - 無法取得行事曆的 MIME 部份"
 
-#: src/plugins/vcalendar/vcalendar.c:807
+#: src/plugins/vcalendar/vcalendar.c:803
 msgid "Error - no calendar part found."
 msgstr "錯誤 - 找不到行事曆"
 
-#: src/plugins/vcalendar/vcalendar.c:821
+#: src/plugins/vcalendar/vcalendar.c:817
 msgid "Error - Unknown calendar component type."
 msgstr "錯誤 - 未知的行事曆型式"
 
-#: src/plugins/vcalendar/vcalendar.c:953
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "傳送通知給出席人員"
 
-#: src/plugins/vcalendar/vcalendar.c:962
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "取消會議"
 
-#: src/plugins/vcalendar/vcalendar.c:963
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "你確定要取消這個會議嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:1058
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "找不到帳號"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13640,128 +14018,128 @@ msgstr ""
 "你沒有任何符合出席人員的帳號\n"
 "確定要回覆嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:1061
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "直接回覆"
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Answer"
 msgstr "回答"
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Edit meeting..."
 msgstr "編輯會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:1192
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Cancel meeting..."
 msgstr "取消會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:1193
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "Launch website"
 msgstr "執行網站"
 
-#: src/plugins/vcalendar/vcalendar.c:1197
+#: src/plugins/vcalendar/vcalendar.c:1199
 msgid "You are already busy at this time."
 msgstr "你這個時間是忙碌的"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
 msgid "Event:"
 msgstr "事件:"
 
-#: src/plugins/vcalendar/vcalendar.c:1237
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
+#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
 msgid "Organizer:"
 msgstr "發起人:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
+#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1611
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1621
 msgid "Location:"
 msgstr "地點:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Summary:"
 msgstr "摘要:"
 
-#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Starting:"
 msgstr "開始:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Ending:"
 msgstr "結束:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
+#: src/plugins/vcalendar/vcalendar.c:1245
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
 msgid "Attendees:"
 msgstr "出席人員:"
 
-#: src/plugins/vcalendar/vcalendar.c:1245
+#: src/plugins/vcalendar/vcalendar.c:1247
 msgid "Action:"
 msgstr "動作:"
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_New meeting..."
 msgstr "新會議(_N)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Export calendar..."
 msgstr "匯出行事曆(_E)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Subscribe to Webcal..."
 msgstr "向webCal訂閱(_S)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Rename..."
 msgstr "修改名稱(_R)"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "U_pdate subscriptions"
 msgstr "更新訂閱(_p)"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_List view"
 msgstr "檢視清單(_L)"
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "_Week view"
 msgstr "以週檢視(_W)"
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_Month view"
 msgstr "以月份檢視(_M)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1101
 msgid "Meetings"
 msgstr "會議"
 
-#: src/plugins/vcalendar/vcal_folder.c:1502
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "in the past"
 msgstr "在過去"
 
-#: src/plugins/vcalendar/vcal_folder.c:1505
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "today"
 msgstr "今天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1508
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "tomorrow"
 msgstr "明天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1511
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "this week"
 msgstr "本週"
 
-#: src/plugins/vcalendar/vcal_folder.c:1514
+#: src/plugins/vcalendar/vcal_folder.c:1513
 msgid "later"
 msgstr "稍後"
 
-#: src/plugins/vcalendar/vcal_folder.c:1518
+#: src/plugins/vcalendar/vcal_folder.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -13770,21 +14148,21 @@ msgstr ""
 "\n"
 "這些是已計劃的事件 %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1615
+#: src/plugins/vcalendar/vcal_folder.c:1617
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "已超時 (%d 秒),發生在連線至 %s 時\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1627
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "403 (Unauthorised)"
 msgstr "403 (無法認證)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1633
+#: src/plugins/vcalendar/vcal_folder.c:1635
 #, c-format
 msgid "Error %ld"
 msgstr "錯誤 %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1815
+#: src/plugins/vcalendar/vcal_folder.c:1811
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13797,7 +14175,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1846
+#: src/plugins/vcalendar/vcal_folder.c:1842
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13808,46 +14186,46 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1877
-#: src/plugins/vcalendar/vcal_folder.c:1880
+#: src/plugins/vcalendar/vcal_folder.c:1873
+#: src/plugins/vcalendar/vcal_folder.c:1876
 #, c-format
 msgid "Could not create directory %s"
 msgstr "無法建立目錄 %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1916
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail 需要網路的存取能力以更新Webcal feed"
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1927
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "為 %s 取得行事曆..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1932
+#: src/plugins/vcalendar/vcal_folder.c:1928
 msgid "new subscription"
 msgstr "新的訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
+#: src/plugins/vcalendar/vcal_folder.c:1939
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail 需要網路的存取能力以進行訂閱更新"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Subscribe to Webcal"
 msgstr "向WebCal訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Enter the Webcal URL:"
 msgstr "輸入WebCal的URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1967
+#: src/plugins/vcalendar/vcal_folder.c:2000
 msgid "Could not parse the URL."
 msgstr "無法解析此URL"
 
-#: src/plugins/vcalendar/vcal_folder.c:1995
+#: src/plugins/vcalendar/vcal_folder.c:2028
 msgid "Do you really want to unsubscribe?"
 msgstr "你確定要取消訂閱?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1996
+#: src/plugins/vcalendar/vcal_folder.c:2029
 msgid "Delete subscription"
 msgstr "取消訂閱"
 
@@ -13915,23 +14293,23 @@ msgstr "拒絕:"
 msgid "Tentatively Accepted: "
 msgstr "暫時接受:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:320
 msgid "Individual"
 msgstr "個人"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:322
 msgid "Resource"
 msgstr "資源"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
 msgid "Room"
 msgstr "室"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:336
 msgid "Add..."
 msgstr "新增..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -13939,62 +14317,62 @@ msgstr ""
 "以下這些人員在你計畫的這個會議時間是忙碌的\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:830
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:916
 msgid "You"
 msgstr "你"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:742
 msgid "You are busy at the time of your planned meeting"
 msgstr "你自己在你計畫的這個會議時間是忙碌的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:744
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s 在你計畫的這個會議時間是忙碌的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:746
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d 小時之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:748
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d 小時之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:750
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d 小時和 %d 分鐘之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:752
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d 分鐘之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid "%d hour later"
 msgstr "%d 小時之後"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid "%d hours later"
 msgstr "%d 小時之後"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d 小時和 %d 分鐘之後"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:763
 #, c-format
 msgid "%d minutes later"
 msgstr "%d 分鐘之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:769
 #, c-format
 msgid ""
 "\n"
@@ -14005,7 +14383,7 @@ msgstr ""
 "\n"
 "每一個人都可以 %s 或 %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:771
 #, c-format
 msgid ""
 "\n"
@@ -14016,7 +14394,7 @@ msgstr ""
 "\n"
 "每一個人都可以 %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 msgid ""
 "\n"
 "\n"
@@ -14027,79 +14405,79 @@ msgstr ""
 "\n"
 "在這之前的6個小時或是之前的6個小時內,要每一個人參與這個會議是不可 能的事情"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:778
 #, c-format
 msgid "would be available %s or %s"
 msgstr "%s 或 %s 將是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
 #, c-format
 msgid "would be available %s"
 msgstr "%s 是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:782
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:843
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:913
 msgid "not available"
 msgstr "不可能"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", 但是 %s 或 %s 是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
 #, c-format
 msgid ", but would be available %s."
 msgstr ", 但是 %s 是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", 而且在此之前或是之後的6個小時是不可能的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:846
 msgid "available"
 msgstr "可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:848
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1105
 msgid "Free/busy retrieval failed"
 msgstr "空閒/忙錄 取回失敗"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available"
 msgstr "不是每一個人都可以"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931
 msgid "Send anyway"
 msgstr "傳送出去"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:943
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "並不是每個人都可以!參考提示以獲得更多的資訊..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "為 %s 取得計畫..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1114
 msgid "Available"
 msgstr "可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1127
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1134
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1142
 msgid "Everyone is available."
 msgstr "每一個人都是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1143
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr "似乎每一個人都可以,但是有些 空閒/忙碌 的資訊取得失敗  "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1315
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14107,61 +14485,61 @@ msgstr ""
 "不能傳送會議的邀請\n"
 "檢查回條"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1393
 msgid "Save & Send"
 msgstr "儲存並傳送"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1394
 msgid "Check availability"
 msgstr "檢查可行性"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1488
 msgid "Starts at:"
 msgstr "開始於:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1518 src/prefs_matcher.c:768
 msgid "on:"
 msgstr "在:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1512
 msgid "Ends at:"
 msgstr "結束於:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1553
 msgid "New meeting"
 msgstr "新的會議"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1555
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - 編輯會議"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1610
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1634
 msgid "Time:"
 msgstr "時間:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1757
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1760
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
 msgstr[1] "%d 分鐘"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "即將到來的事件: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1772
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14178,118 +14556,118 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "在 %d 分鐘後提醒我"
 msgstr[1] "在 %d 分鐘後提醒我"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1915
 msgid "Empty calendar"
 msgstr "清空行事曆"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1916
 msgid "There is nothing to export."
 msgstr "沒有什麼可以匯出"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1956
 msgid "Could not export the calendar."
 msgstr "無法匯出行事曆"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1979
 msgid "Export calendar to ICS"
 msgstr "把行事曆匯出至 ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1996
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "無法匯出行事曆至 '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Could not export the freebusy info."
 msgstr "無法匯出 空閒/忙碌 的資訊"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2144
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "無法匯出 空閒/忙碌 至'%s'\n"
 
-#: src/plugins/vcalendar/vcal_prefs.c:300
+#: src/plugins/vcalendar/vcal_prefs.c:301
 msgid "Reminders"
 msgstr "提示功能"
 
-#: src/plugins/vcalendar/vcal_prefs.c:309
+#: src/plugins/vcalendar/vcal_prefs.c:310
 msgid "Alert me"
 msgstr "事件觸發前"
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
+#: src/plugins/vcalendar/vcal_prefs.c:339
 msgid "minutes before an event"
 msgstr "分鐘提醒我"
 
-#: src/plugins/vcalendar/vcal_prefs.c:361
+#: src/plugins/vcalendar/vcal_prefs.c:362
 msgid "Calendar export"
 msgstr "匯出時程表"
 
-#: src/plugins/vcalendar/vcal_prefs.c:372
+#: src/plugins/vcalendar/vcal_prefs.c:373
 msgid "Automatically export calendar to"
 msgstr "自動匯出時程表到"
 
-#: src/plugins/vcalendar/vcal_prefs.c:381
-#: src/plugins/vcalendar/vcal_prefs.c:500
+#: 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 "你可以匯出到一個本地檔案或URL"
 
-#: src/plugins/vcalendar/vcal_prefs.c:383
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr "選擇一個本地檔案或URL (http://server/path/file.ics)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:413
+#: src/plugins/vcalendar/vcal_prefs.c:414
 msgid "Include Webcal subscriptions in export"
 msgstr "在匯出內容中包含網路時程表訂閱"
 
-#: src/plugins/vcalendar/vcal_prefs.c:423
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Command to run after calendar export"
 msgstr "在時程表匯出後執行命令"
 
-#: src/plugins/vcalendar/vcal_prefs.c:452
+#: src/plugins/vcalendar/vcal_prefs.c:453
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr "在 XFCE's Orage clock 中註冊 Claws的 時程表"
 
-#: src/plugins/vcalendar/vcal_prefs.c:454
+#: src/plugins/vcalendar/vcal_prefs.c:455
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr "允許 Orage (V4.4版本以上) 接受 Claws Mail 的時程表"
 
-#: src/plugins/vcalendar/vcal_prefs.c:467
+#: src/plugins/vcalendar/vcal_prefs.c:468
 msgid "Export as GNOME shell calendar server"
 msgstr "匯出為 GNOME 格式的行事曆伺服器"
 
-#: src/plugins/vcalendar/vcal_prefs.c:469
+#: src/plugins/vcalendar/vcal_prefs.c:470
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr "註冊為 D-Bus 格式的行事曆伺服器界面以匯出 Claws Mail 的行事曆"
 
-#: src/plugins/vcalendar/vcal_prefs.c:479
+#: src/plugins/vcalendar/vcal_prefs.c:480
 msgid "Free/Busy information"
 msgstr "空閒/忙碌訊息"
 
-#: src/plugins/vcalendar/vcal_prefs.c:491
+#: src/plugins/vcalendar/vcal_prefs.c:492
 msgid "Automatically export free/busy status to"
 msgstr "自動匯出空閒/忙碌狀態到"
 
-#: src/plugins/vcalendar/vcal_prefs.c:502
+#: src/plugins/vcalendar/vcal_prefs.c:503
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr "指定一個本地檔案或 URL (http://server/path/file.ifb)"
 
-#: src/plugins/vcalendar/vcal_prefs.c:532
+#: src/plugins/vcalendar/vcal_prefs.c:533
 msgid "Command to run after free/busy status export"
 msgstr "在匯出空閒/忙碌狀態後執行命令"
 
-#: src/plugins/vcalendar/vcal_prefs.c:559
+#: src/plugins/vcalendar/vcal_prefs.c:560
 msgid "Get free/busy status of others from"
 msgstr "從其它的寄件者取得空閒/忙碌狀態"
 
-#: src/plugins/vcalendar/vcal_prefs.c:567
+#: src/plugins/vcalendar/vcal_prefs.c:568
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
@@ -14298,8 +14676,8 @@ msgstr ""
 "指定一個本地檔案或 URL (http://server/path/file.ifb 。使用 %u 作為郵件地址左"
 "側資訊, %d 作為網域名稱"
 
-#: src/plugins/vcalendar/vcal_prefs.c:581
-msgid "SSL/TLS options"
+#: src/plugins/vcalendar/vcal_prefs.c:582
+msgid "TLS options"
 msgstr "SSL/TLS 選項"
 
 #: src/pop.c:153
@@ -14314,95 +14692,95 @@ msgstr "在問候語中的時間戳記語法錯誤\n"
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "在問候語中的時間戳記語法錯誤 (非ASCII)\n"
 
-#: src/pop.c:216 src/pop.c:243
+#: src/pop.c:218 src/pop.c:245
 msgid "POP protocol error\n"
 msgstr "POP3 協定錯誤\n"
 
-#: src/pop.c:289
+#: src/pop.c:291
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無效的 UIDL 回應: %s\n"
 
-#: src/pop.c:870
+#: src/pop.c:874
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP3: 刪除已過期的郵件 %d [%s]\n"
 
-#: src/pop.c:886
+#: src/pop.c:890
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d [%s] (%d 位元)\n"
 
-#: src/pop.c:918
+#: src/pop.c:922
 msgid "mailbox is locked\n"
 msgstr "郵件箱已鎖定\n"
 
-#: src/pop.c:921
+#: src/pop.c:925
 msgid "Session timeout\n"
 msgstr "通信超時\n"
 
-#: src/pop.c:940
+#: src/pop.c:944
 msgid "command not supported\n"
 msgstr "未支援的命令\n"
 
-#: src/pop.c:945
+#: src/pop.c:949
 msgid "error occurred on POP session\n"
 msgstr "POP3通信發生錯誤\n"
 
-#: src/pop.c:1145
+#: src/pop.c:1156
 msgid "TOP command unsupported\n"
 msgstr "未支援的頂端命令\n"
 
-#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
+#: src/prefs_account.c:414 src/prefs_account.c:1623 src/prefs_account.c:2953
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
-#: src/wizard.c:1501
+#: src/prefs_account.c:415 src/prefs_account.c:1769 src/prefs_account.c:2968
+#: src/wizard.c:1516
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:416
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1502
+#: src/prefs_account.c:417 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr "本地 mbox 檔案"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:418
 msgid "None (SMTP only)"
 msgstr "空  (只針對SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1229
 msgid "Name of account"
 msgstr "帳號名稱"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1238
 msgid "Set as default"
 msgstr "設定為預設值"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1246
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1255
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1260
 msgid "Mail address"
 msgstr "郵件地址"
 
-#: src/prefs_account.c:1298 src/wizard.c:1525
+#: src/prefs_account.c:1321 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr "自動配置"
 
-#: src/prefs_account.c:1300 src/wizard.c:1526
+#: src/prefs_account.c:1323 src/wizard.c:1541
 msgid "Cancel"
 msgstr "取消"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1340
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14410,199 +14788,199 @@ msgstr ""
 "警告:此 Claws Mail 編譯版本未支援\n"
 "IMPA 和 新聞功能"
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1369
 msgid "This server requires authentication"
 msgstr "此伺服器要求認證"
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1375
 msgid "Authenticate on connect"
 msgstr "連線時進行認證"
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1425
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1430
 msgid "Server for receiving"
 msgstr "POP3 伺服器 (接收)"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1435
 msgid "Local mailbox"
 msgstr "本地郵件夾"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1440
 msgid "SMTP server (send)"
 msgstr "SMTP 伺服器 (傳送)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1446
 msgid "Use mail command rather than SMTP server"
 msgstr "與其使用郵件命令,不如使用 SMTP 伺服器"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1454
 msgid "command to send mails"
 msgstr "傳送郵件命令"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1519
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1598
 msgid "Local"
 msgstr "本地"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1604 src/prefs_account.c:1726
 msgid "Default Inbox"
 msgstr "預設收件夾"
 
-#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1611 src/prefs_account.c:1617 src/prefs_account.c:1733
+#: src/prefs_account.c:1739
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未過濾郵件將被儲存在這個資料夾"
 
-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1626
 msgid "Authenticate before POP connection"
 msgstr "POP連線前進行認證"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1651 src/prefs_account.c:2261
 msgid "Select"
 msgstr "選擇"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1662
 msgid "Remove messages on server when received"
 msgstr "郵件接收後從伺服器上移除"
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1673
 msgid "Remove after"
 msgstr "超過"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1680 src/prefs_account.c:1690
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 天 0 小時後: 立刻移除"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1703
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1706
 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:1750 src/prefs_account.c:2984
+#: src/prefs_account.c:1745 src/prefs_account.c:2983
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1752
 msgid "Maximum number of articles to download"
 msgstr "可允許最大的郵件下載數量"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1762
 msgid "unlimited if 0 is specified"
 msgstr "若設為0代表沒有限制"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1787
 msgid "Plain text"
 msgstr "尋找字串:"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1804
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1808
 msgid "(usually empty)"
 msgstr "(通常是空白的)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1822
 msgid "Show subscribed folders only"
 msgstr "只顯示訂閱資料夾"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1829
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "寬頻效果模式 (防止接到遠端的標籤)"
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1831
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "此模式使用較少的頻寬,對於某此伺服器可能會有速度較慢的情況發生"
 
-#: src/prefs_account.c:1840 src/prefs_receive.c:164
+#: src/prefs_account.c:1838 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "自動檢查"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1841
 msgid "Use global settings"
 msgstr "使用全域設定"
 
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1847 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "檢查新郵件頻率"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1886
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1902
 msgid "Allow filtering using plugins on receiving"
 msgstr "接收郵件時允許使用外掛程式進行過濾"
 
-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1906
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'接收郵件' 檢查此帳號的新郵件"
 
-#: src/prefs_account.c:1998 src/prefs_customheader.c:210
-#: src/prefs_matcher.c:634 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
+#: src/prefs_account.c:1996 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:2000
+#: src/prefs_account.c:1998
 msgid "Generate Message-ID"
 msgstr "產生  Message-ID"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2001
 msgid "Send account mail address in Message-ID"
 msgstr "將傳送帳號的郵件地址放入  Message-ID"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2004
 msgid "Add user agent header"
 msgstr "加入使用者代理郵件標頭"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2011
 msgid "Add user-defined header"
 msgstr "加入使用者自訂郵件標頭"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2026
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2128
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若以下欄位空白,將以使用者名稱和密碼進行接收"
 
-#: src/prefs_account.c:2138
+#: src/prefs_account.c:2139
 msgid "Authenticate with POP before sending"
 msgstr "傳送前用 POP3 認證"
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2154
 msgid "POP authentication timeout"
 msgstr "POP 認證超時:"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2235
 msgid "Authorization"
 msgstr "認證"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2252
 msgid "Select OAuth2 Email Service Provider"
 msgstr "選擇 OAuth2 電子郵件服務提供者"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2292
 msgid "Client ID"
 msgstr "客戶端 ID"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2303
 msgid "Client secret"
 msgstr "客戶端安全"
 
@@ -14614,183 +14992,183 @@ msgstr "取得認證碼"
 msgid "Open default browser with request"
 msgstr "按照要求開啟預設的瀏覽器"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2339
 msgid "Copy link"
 msgstr "複製連結"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2352
 msgid "Authorization code"
 msgstr "認證碼"
 
-#: src/prefs_account.c:2357
-msgid "Paste complete URL from browser or the provided auth token"
+#: src/prefs_account.c:2361
+msgid "Paste complete URL from browser or the provided authorization token"
 msgstr "貼上來自於瀏覽器的完整URL或提供認證token"
 
-#: src/prefs_account.c:236
+#: src/prefs_account.c:2368
 msgid "Complete authorization"
 msgstr "完成認證"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2372
 msgid "Authorize"
 msgstr "授權"
 
-#: src/prefs_account.c:2455 src/prefs_account.c:2501
+#: src/prefs_account.c:2459 src/prefs_account.c:2505
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2462
 msgid "Automatically insert signature"
 msgstr "自動插入簽名"
 
-#: src/prefs_account.c:2463
+#: src/prefs_account.c:2467
 msgid "Signature separator"
 msgstr "簽名分隔線"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2492
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account.c:2521
+#: src/prefs_account.c:2525
 msgid "Automatically set the following addresses"
 msgstr "自動設置轉寄地址"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2574
 msgid "Spell check dictionaries"
 msgstr "併字檢查字典"
 
-#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
-#: src/prefs_spelling.c:162
+#: src/prefs_account.c:2584 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:1148
-#: src/prefs_spelling.c:174
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1193
+#: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr "預設替代定典"
 
-#: src/prefs_account.c:2682 src/prefs_account.c:4158
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
-#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
+#: src/prefs_account.c:2681 src/prefs_account.c:4172
+#: 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:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
-#: src/toolbar.c:490
+#: src/prefs_account.c:2696 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/toolbar.c:500
 msgid "Reply"
 msgstr "回覆"
 
-#: src/prefs_account.c:2712 src/prefs_filtering_action.c:185
-#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2711 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:2759
+#: src/prefs_account.c:2758
 msgid "Default privacy system"
 msgstr "預設的隱私系統"
 
-#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2787 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr "總是進行郵件簽章"
 
-#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2789 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr "總是將郵件加密"
 
-#: src/prefs_account.c:2792
+#: src/prefs_account.c:2791
 msgid "Always sign messages when replying to a signed message"
 msgstr "當回覆簽章郵件時,總是將郵件進行簽章"
 
-#: src/prefs_account.c:2795
+#: src/prefs_account.c:2794
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "當回覆已加密郵件時,總是將郵件進行加密"
 
-#: src/prefs_account.c:2798
+#: src/prefs_account.c:2797
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "除了收件者外,將已傳送的郵件用私有金鑰進行加密"
 
-#: src/prefs_account.c:2800
+#: src/prefs_account.c:2799
 msgid "Save sent encrypted messages as clear text"
 msgstr "將已傳送的加密郵件儲存為明碼文件"
 
-#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
-msgid "Don't use SSL/TLS"
+#: src/prefs_account.c:2957 src/prefs_account.c:2972 src/prefs_account.c:2986
+msgid "Don't use TLS"
 msgstr "不使用 SSL/TLS"
 
-#: src/prefs_account.c:2961 src/prefs_account.c:2976 src/prefs_account.c:2996
-#: src/prefs_account.c:3007
-msgid "Use SSL/TLS"
+#: src/prefs_account.c:2960 src/prefs_account.c:2975 src/prefs_account.c:2995
+#: src/prefs_account.c:3006
+msgid "Use TLS"
 msgstr "使用 SSL/TLS"
 
-#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
+#: src/prefs_account.c:2963 src/prefs_account.c:2978 src/prefs_account.c:3009
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "使用 STARTTLS 命令啟用加密通訊"
 
-#: src/prefs_account.c:3000
+#: src/prefs_account.c:2999
 msgid "Send (SMTP)"
 msgstr "傳送 (SMTP)"
 
-#: src/prefs_account.c:3004
-msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
+#: src/prefs_account.c:3003
+msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "不使用 SSL/TLS (若需要,使用 STARTTLS)"
 
-#: src/prefs_account.c:3015
+#: src/prefs_account.c:3014
 msgid "Client certificates"
 msgstr "客戶端認證"
 
-#: src/prefs_account.c:3023
+#: src/prefs_account.c:3022
 msgid "Certificate for receiving"
 msgstr "進行接收認證"
 
-#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
-#: src/prefs_account.c:3058
+#: src/prefs_account.c:3027 src/prefs_account.c:3029 src/prefs_account.c:3055
+#: src/prefs_account.c:3057
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "客戶端認證檔案為 PKCS12 或 PEM 檔"
 
-#: src/prefs_account.c:3051
+#: src/prefs_account.c:3050
 msgid "Certificate for sending"
 msgstr "進行傳送認證"
 
-#: src/prefs_account.c:3091
-msgid "Automatically accept valid SSL/TLS certificates"
+#: src/prefs_account.c:3090
+msgid "Automatically accept valid TLS certificates"
 msgstr "自動接放不明的合法 SSL/TLS 認證"
 
-#: src/prefs_account.c:3094
-msgid "Use non-blocking SSL/TLS"
+#: src/prefs_account.c:3093
+msgid "Use non-blocking TLS"
 msgstr "使用非阻斷式 SSL/TLS"
 
-#: src/prefs_account.c:3106
-msgid "Turn this off if you have SSL/TLS connection problems"
+#: src/prefs_account.c:3105
+msgid "Turn this off if you have TLS connection problems"
 msgstr "如果發生 SSL/TLS 連線問題,請把此功能關閉"
 
-#: src/prefs_account.c:3198 src/prefs_proxy.c:73
+#: src/prefs_account.c:3197 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "使用代理伺服器"
 
-#: src/prefs_account.c:3207
+#: src/prefs_account.c:3206
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "使用預設值"
 
-#: src/prefs_account.c:3209
+#: src/prefs_account.c:3208
 msgid "Use global proxy server settings"
 msgstr "使用全域的代理伺服器設定"
 
-#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3245 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr "使用認證"
 
-#: src/prefs_account.c:3251 src/prefs_proxy.c:123
+#: src/prefs_account.c:3250 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "使用者名稱"
 
-#: src/prefs_account.c:3285
+#: src/prefs_account.c:3279
 msgid "Use proxy server for sending"
 msgstr "使用代理伺服器寄送郵件"
 
-#: src/prefs_account.c:3287
+#: src/prefs_account.c:3281
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14798,268 +15176,299 @@ msgstr ""
 "若關閉此功能,郵件將忽略任何設置的代理伺服器,轉而使用已設置的外部伺服器直接"
 "連線並寄送郵件"
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3392
 msgid "SMTP port"
 msgstr "SMTP 通訊埠"
 
-#: src/prefs_account.c:3405
+#: src/prefs_account.c:3399
 msgid "POP port"
 msgstr "POP3 通訊埠"
 
-#: src/prefs_account.c:3412
+#: src/prefs_account.c:3406
 msgid "IMAP port"
 msgstr "IMAP4 通訊埠"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3413
 msgid "NNTP port"
 msgstr "NNTP 通訊埠"
 
-#: src/prefs_account.c:3425
+#: src/prefs_account.c:3419
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: src/prefs_account.c:3428
+#: src/prefs_account.c:3422
 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:3442
+#: src/prefs_account.c:3436
 msgid "Use command to communicate with server"
 msgstr "以命令和伺服器進行通訊"
 
-#: src/prefs_account.c:3451
+#: src/prefs_account.c:3445
 msgid "Mark cross-posted messages as read and color:"
 msgstr "標示已傳送郵件為已讀並更改顏色"
 
-#: src/prefs_account.c:3504
+#: src/prefs_account.c:3494
 msgid "Put sent messages in"
 msgstr "郵已傳送郵件放在"
 
-#: src/prefs_account.c:3506
+#: src/prefs_account.c:3496
 msgid "Put queued messages in"
 msgstr "將暫存郵件放在"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3498
 msgid "Put draft messages in"
 msgstr "將草稿郵件放在"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3500
 msgid "Put deleted messages in"
 msgstr "將刪除的郵件放在"
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3557
 msgid "Account name is not entered."
 msgstr "未指定帳號名稱"
 
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3561
 msgid "Mail address is not entered."
 msgstr "未指定郵件地方"
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3569
 msgid "SMTP server is not entered."
 msgstr "未指定 SMTP 伺服器"
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3574
 msgid "User ID is not entered."
 msgstr "使用者 ID 未指定"
 
-#: src/prefs_account.c:3589
+#: src/prefs_account.c:3579
 msgid "POP server is not entered."
 msgstr "未指定 POP3 伺服器"
 
-#: src/prefs_account.c:3609
+#: src/prefs_account.c:3599
 msgid "The default Inbox folder doesn't exist."
 msgstr "預設收件夾不存在"
 
-#: src/prefs_account.c:3615
+#: src/prefs_account.c:3605
 msgid "IMAP server is not entered."
 msgstr "IMAP4 伺服器未指定"
 
-#: src/prefs_account.c:3620
+#: src/prefs_account.c:3610
 msgid "NNTP server is not entered."
 msgstr "NNTP 伺服器未指定"
 
-#: src/prefs_account.c:3626
+#: src/prefs_account.c:3616
 msgid "local mailbox filename is not entered."
 msgstr "本地郵件夾名稱未指定"
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3622
 msgid "mail command is not entered."
 msgstr "郵件命令未指定"
 
-#: src/prefs_account.c:3642
+#: src/prefs_account.c:3632
 msgid "User ID cannot contain a newline character."
 msgstr "使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3647
+#: src/prefs_account.c:3639
 msgid "Password cannot contain a newline character."
 msgstr "密碼不能包含新行的字元"
 
-#: src/prefs_account.c:3678
+#: src/prefs_account.c:3676
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP的使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3683
+#: src/prefs_account.c:3681
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP的密碼不能包含新行的字元"
 
-#: src/prefs_account.c:3775
+#: src/prefs_account.c:3776
 msgid "domain is not specified."
 msgstr "尚未指定收件者"
 
-#: src/prefs_account.c:3780
+#: src/prefs_account.c:3781
 msgid "sent folder is not selected."
 msgstr "尚未選擇已傳送資料夾"
 
-#: src/prefs_account.c:3785
+#: src/prefs_account.c:3786
 msgid "queue folder is not selected."
 msgstr "尚未選擇暫存資料夾"
 
-#: src/prefs_account.c:3790
+#: src/prefs_account.c:3791
 msgid "draft folder is not selected."
 msgstr "尚未選擇草稿資料夾"
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3796
 msgid "trash folder is not selected."
 msgstr "尚未選擇回收資料夾"
 
-#: src/prefs_account.c:4104
+#: src/prefs_account.c:4116
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:4140
+#: src/prefs_account.c:4134
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "傳送"
+
+#: src/prefs_account.c:4153
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4190 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "樣版"
 
-#: src/prefs_account.c:4194
+#: src/prefs_account.c:4208
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/prefs_account.c:4324
+#: src/prefs_account.c:4328
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs_account.c:4679
+#: src/prefs_account.c:4690
 msgid "Preferences for new account"
 msgstr "新帳號選項"
 
-#: src/prefs_account.c:4681
+#: src/prefs_account.c:4692
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帳號選項"
 
-#: src/prefs_account.c:4800 src/wizard.c:1390
+#: src/prefs_account.c:4804 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr "失敗 (錯誤的地址)"
 
-#: src/prefs_account.c:4885
+#: src/prefs_account.c:4889
 msgid "Select signature file"
 msgstr "繼擇簽名檔案"
 
-#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
+#: src/prefs_account.c:4907 src/prefs_account.c:4924 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr "選擇認證檔案"
 
-#: src/prefs_account.c:5016
+#: src/prefs_account.c:5020
 msgid "Protocol:"
 msgstr "通訊協定"
 
-#: src/prefs_account.c:5333
+#: src/prefs_account.c:5363
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (未載入外掛程式)"
 
-#: src/prefs_actions.c:225
-msgid "Actions configuration"
+#: src/prefs_account.c:6138
+msgid "Authorisation complete"
+msgstr "認證碼"
+
+#: src/prefs_account.c:6139
+msgid "Your OAuth2 authorisation code has been received by Claws Mail"
+msgstr "你的OAuth2認證碼已被Claws Mail接受"
+
+#: src/prefs_account.c:6142
+msgid "Authorisation NOT completed"
+msgstr "認證碼"
+
+#: src/prefs_account.c:6143
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "你的OAuth2認證碼不被Claws Mail接受"
+
+#: src/prefs_actions.c:226
+msgid "Actions configuration"
 msgstr "動作配置"
 
-#: src/prefs_actions.c:252
+#: src/prefs_actions.c:253
 msgid "Menu name"
 msgstr "功能清單名稱"
 
-#: src/prefs_actions.c:285
+#: src/prefs_actions.c:282
 msgid "Shell command"
 msgstr "Shell命令"
 
-#: src/prefs_actions.c:295
+#: src/prefs_actions.c:292
 msgid "Filter action"
 msgstr "過濾器動作"
 
-#: src/prefs_actions.c:301
+#: src/prefs_actions.c:298
 msgid "Edit filter action"
 msgstr "編輯過濾器動作"
 
-#: src/prefs_actions.c:329
+#: src/prefs_actions.c:326
 msgid "Append the new action above to the list"
 msgstr "在此清單上加入新的動作"
 
-#: src/prefs_actions.c:337
+#: src/prefs_actions.c:334
 msgid "Replace the selected action in list with the action above"
 msgstr "將清單內選擇的動作以上方的動作取代"
 
-#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
-#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1024
-msgid "D_elete"
-msgstr "刪除(_e)"
-
-#: src/prefs_actions.c:347
+#: src/prefs_actions.c:342
 msgid "Delete the selected action from the list"
 msgstr "從清單中刪除已選擇的動作"
 
-#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
+#: src/prefs_actions.c:350 src/prefs_filtering.c:485 src/prefs_template.c:330
 msgid "Clear all the input fields in the dialog"
 msgstr "在對話框中清除所有輸入的區塊"
 
-#: src/prefs_actions.c:365
+#: src/prefs_actions.c:358
 msgid "Show information on configuring actions"
 msgstr "顯示配置動作的資訊"
 
-#: src/prefs_actions.c:396
+#: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:356
+msgid "_Top"
+msgstr "置頂(_T)"
+
+#: src/prefs_actions.c:389
+msgid "Move the selected action to the top"
+msgstr "將選擇的樣版移至最上方"
+
+#: src/prefs_actions.c:399
 msgid "Move the selected action up"
 msgstr "將選擇的動作上移"
 
-#: src/prefs_actions.c:404
+#: src/prefs_actions.c:407
 msgid "Move selected action down"
 msgstr "將選擇的動作下移"
 
-#: src/prefs_actions.c:537 src/prefs_filtering_action.c:678
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
-#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
-#: src/prefs_template.c:472
+#: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
+msgid "_Bottom"
+msgstr "置底(_B)"
+
+#: src/prefs_actions.c:417
+msgid "Move the selected action to the bottom"
+msgstr "移動已選擇的樣版到底部"
+
+#: src/prefs_actions.c:550 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:822 src/prefs_filtering.c:824
+#: src/prefs_filtering.c:825 src/prefs_filtering.c:935 src/prefs_matcher.c:918
+#: src/prefs_template.c:465
 msgid "(New)"
 msgstr "(新的)"
 
-#: src/prefs_actions.c:602
+#: src/prefs_actions.c:615
 msgid "Menu name is not set."
 msgstr "尚未設定功能項目名稱"
 
-#: src/prefs_actions.c:607
+#: src/prefs_actions.c:620
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "功能項目名稱不能以 '/' 作為開頭"
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:625
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "功能項目名稱不能包含冒號 ':'"
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:644
 msgid "Menu name is too long."
 msgstr "功能項目名稱太長了"
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:653
 msgid "Command-line not set."
 msgstr "尚未設定命令列"
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:658
 msgid "Menu name and command are too long."
 msgstr "功能項目和命令都太長了"
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:664
 #, c-format
 msgid ""
 "The command\n"
@@ -15070,134 +15479,134 @@ msgstr ""
 "%s\n"
 "有一個語法上的錯誤"
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:722
 msgid "Delete action"
 msgstr "刪除動作"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:723
 msgid "Do you really want to delete this action?"
 msgstr "你確定要刪除這個動作嗎?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:744
 msgid "Delete all actions"
 msgstr "刪除所有動作"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:745
 msgid "Do you really want to delete all the actions?"
 msgstr "你真的要刪除所有的動作嗎?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
-#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:913 src/prefs_actions.c:944 src/prefs_filtering.c:1491
+#: src/prefs_filtering.c:1514 src/prefs_matcher.c:2165 src/prefs_template.c:565
+#: src/prefs_template.c:590
 msgid "Entry not saved"
 msgstr "項目尚未儲存"
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1505
-#: src/prefs_filtering.c:1527 src/prefs_template.c:573 src/prefs_template.c:598
+#: 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 "項目尚未儲存,仍然要關閉嗎?"
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
-#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: 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
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr "繼續編輯(_C)"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:918
 msgid "Actions list not saved"
 msgstr "動作清單尚未儲存"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:919
 msgid "The actions list has been modified. Close anyway?"
 msgstr "動作清單已被修改,仍然要離開嗎?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:989
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">功能項目名稱:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:990
 msgid "Use / in menu name to make submenus."
 msgstr "在功能項目名稱中使用 / 可以製作子功能項目"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:992
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">命令列:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:993
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">開始於:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:994
 msgid "to send message body or selection to command's standard input"
 msgstr "傳送郵件內容或選項到命令的標準輸入"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:995
 msgid "to send user provided text to command's standard input"
 msgstr "傳送使用者提供的文字到命令的標準輸入"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:996
 msgid "to send user provided hidden text to command's standard input"
 msgstr "傳送使用者提供的隱藏文字到命令的標準輸入"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:997
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">結束於:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:998
 msgid "to replace message body or selection with command's standard output"
 msgstr "取代郵件內容或選項到命令的標準輸出"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:999
 msgid "to insert command's standard output without replacing old text"
 msgstr "插入命令的標準輸出而不取代舊的文字"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:1000
 msgid "to run command asynchronously"
 msgstr "非同步執行命令"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:1001
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">使用:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:1002
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "所選擇之郵件的檔案格式為 RFC822/2822"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:1003
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "所選擇之郵件的檔案的清單格式為 RFC822/2822"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:1004
 msgid "for the file of the selected decoded message MIME part"
 msgstr "所選擇之已解密MIME郵件的檔案"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:1005
 msgid "for a user provided argument"
 msgstr "使用者已提供的參數"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:1006
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "使用者已提供的隱藏參數 (例如:密碼)"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:1007
 msgid "for the text selection"
 msgstr "文字選擇"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:1008
 msgid "apply filtering actions between {} to selected messages"
 msgstr "套用在 {} 間的過濾動作到選擇的郵件上"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:1009
 msgid "for a literal %"
 msgstr "文字 %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
 msgid "Actions"
 msgstr "動作"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1020
 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."
@@ -15205,29 +15614,41 @@ msgstr ""
 "此動作功能提供了使用者一個可以執行外部命令的方法,用來套用至完整郵件檔案或是"
 "郵件的其中的一個部份"
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
-#: src/prefs_template.c:1114
+#: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
+#: src/prefs_template.c:1107
 msgid "D_uplicate"
 msgstr "重複的(_u)"
 
-#: src/prefs_actions.c:1208
+#: src/prefs_actions.c:1225
 msgid "Current actions"
 msgstr "目前的動作"
 
-#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
-#: src/prefs_filtering.c:1137
+#: src/prefs_actions.c:1312
+msgid "Entry was modified"
+msgstr "入口已被修改"
+
+#: src/prefs_actions.c:1313
+msgid ""
+"Opening the filter action dialog will clear current modifications of the "
+"command-line."
+msgstr ""
+"開啟過濾器啟用對話框將會清除目前已經"
+"修改過的命令列"
+
+#: src/prefs_actions.c:1324 src/prefs_filtering.c:1062
+#: src/prefs_filtering.c:1120
 msgid "Action string is not valid."
 msgstr "動作字串是無效的"
 
-#: src/prefs_common.c:239 src/prefs_quote.c:69
+#: src/prefs_common.c:238 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "嗨, \\n"
 
-#: src/prefs_common.c:317
+#: src/prefs_common.c:316
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "在 %d\\n%f 已寫入:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:323 src/prefs_quote.c:85
+#: 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"
@@ -15235,223 +15656,227 @@ 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"
 
-#: src/prefs_common.c:458
+#: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
-#: src/prefs_compose_writing.c:126
+#: src/prefs_compose_writing.c:123
 msgid "Automatic account selection"
 msgstr "帳號自動選擇"
 
-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:131
 msgid "when replying"
 msgstr "當回信時"
 
-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:133
 msgid "when forwarding"
 msgstr "當轉信時"
 
-#: src/prefs_compose_writing.c:138
+#: src/prefs_compose_writing.c:135
 msgid "when re-editing"
 msgstr "當重新編輯時"
 
-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:138
 msgid "Editing"
 msgstr "編輯"
 
-#: src/prefs_compose_writing.c:145
+#: src/prefs_compose_writing.c:142
 msgid "Automatically launch the external editor"
 msgstr "自動執行外部編輯器"
 
-#: src/prefs_compose_writing.c:153
+#: src/prefs_compose_writing.c:150
 msgid "Automatically save message to Drafts folder every"
 msgstr "自動儲存至暫存資料夾  每"
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
+#: src/prefs_compose_writing.c:159 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr "字串"
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:170
 msgid "Even if message is to be encrypted"
 msgstr "即使郵件已經加密"
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:177
 msgid "Undo level"
 msgstr "復原次數"
 
-#: src/prefs_compose_writing.c:197
+#: src/prefs_compose_writing.c:194
 msgid "Warn when inserting a file larger than"
 msgstr "發出警告,當附加檔案超過"
 
-#: src/prefs_compose_writing.c:208
-msgid "KB into message body "
+#: src/prefs_compose_writing.c:205
+msgid "KiB into message body"
 msgstr "KB 被插入郵件內"
 
-#: src/prefs_compose_writing.c:214
+#: src/prefs_compose_writing.c:211
 msgid "Replying"
 msgstr "回信"
 
-#: src/prefs_compose_writing.c:217
+#: src/prefs_compose_writing.c:214
 msgid "Reply will quote by default"
 msgstr "回信內容預設將被引用"
 
-#: src/prefs_compose_writing.c:220
+#: src/prefs_compose_writing.c:217
 msgid "Reply button invokes mailing list reply"
 msgstr "回信按鍵執行寄件清單的回覆"
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:219
 msgid "Forwarding"
 msgstr "轉送"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
+#: src/prefs_compose_writing.c:222 src/prefs_filtering_action.c:184
 msgid "Forward as attachment"
 msgstr "以附加檔轉送"
 
-#: src/prefs_compose_writing.c:227
+#: src/prefs_compose_writing.c:224
 #, c-format
 msgid "Keep the original '%s' header when redirecting"
 msgstr "當改寄時保持原郵件的 '%s' 欄位"
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:230
 msgid "When dropping files into the Compose window"
 msgstr "當檔案被移入寄件視窗時"
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:239
 msgid "Ask"
 msgstr "詢問"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:522
+#: src/prefs_compose_writing.c:240 src/toolbar.c:533
 msgid "Insert"
 msgstr "插入"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:523
+#: src/prefs_compose_writing.c:241 src/toolbar.c:534
 msgid "Attach"
 msgstr "附件"
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:365
 msgid "Writing"
 msgstr "寫信"
 
-#: src/prefs_customheader.c:185
+#: src/prefs_customheader.c:183
 msgid "Custom header configuration"
 msgstr "自訂的標頭配置"
 
-#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
-#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
+#: src/prefs_customheader.c:494 src/prefs_display_header.c:588
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1649
 msgid "Header name is not set."
 msgstr "尚未設定標頭名稱"
 
-#: src/prefs_customheader.c:514
+#: src/prefs_customheader.c:504
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "此標頭名稱不允許作為自訂標頭"
+
+#: src/prefs_customheader.c:509
 msgid "This Header name is not allowed as a custom header."
 msgstr "此標頭名稱不允許作為自訂標頭"
 
-#: src/prefs_customheader.c:561
+#: src/prefs_customheader.c:556
 msgid "Choose a PNG file"
 msgstr "選擇一個 PNG 檔"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:558
 msgid "Choose an XBM file"
 msgstr "選擇一個 XBM 檔"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:560
 msgid "Choose a text file"
 msgstr "選擇一個文字檔"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:573
 msgid "This file isn't an image."
 msgstr "這不是一個影像檔"
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:578
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "所選的影像檔大小不正確 (48x48)"
 
-#: src/prefs_customheader.c:589
+#: src/prefs_customheader.c:584
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "此影像檔太大;最大不可超過 725 位元"
 
-#: src/prefs_customheader.c:594
+#: src/prefs_customheader.c:589
 msgid "The image isn't in the correct format (PNG)."
 msgstr "此影像檔格式不正確 (PNG)"
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:598
 msgid "The image isn't in the correct format (XBM)."
 msgstr "此影像檔格式不正確 (XBM)"
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:607
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "無法呼叫 `compface`。請確認它在你的 $PATH 內"
 
-#: src/prefs_customheader.c:618
+#: src/prefs_customheader.c:613
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface 錯誤: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:666
 msgid "This file contains newlines."
 msgstr "此檔包含了新列"
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:696
 msgid "Delete header"
 msgstr "刪除標頭"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:697
 msgid "Do you really want to delete this header?"
 msgstr "你確定要刪除這個標頭嗎?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:871
 msgid "Current custom headers"
 msgstr "目前的自訂標頭"
 
-#: src/prefs_display_header.c:254
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr "顯示標頭配置"
 
-#: src/prefs_display_header.c:278
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr "標頭名稱"
 
-#: src/prefs_display_header.c:313
+#: src/prefs_display_header.c:312
 msgid "Hidden headers"
 msgstr "隱藏標頭"
 
-#: src/prefs_display_header.c:354
+#: src/prefs_display_header.c:353
 msgid "Displayed Headers"
 msgstr "顯示標頭"
 
-#: src/prefs_display_header.c:399
+#: src/prefs_display_header.c:398
 msgid "Show all unspecified headers"
 msgstr "顯示所有未指定的標頭"
 
-#: src/prefs_display_header.c:599
+#: src/prefs_display_header.c:598
 msgid "This header is already in the list."
 msgstr "此標頭已經存在清單中了"
 
-#: src/prefs_ext_prog.c:102
+#: src/prefs_ext_prog.c:100
 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s 將會被檔案名稱覆蓋 / URI"
 
-#: src/prefs_ext_prog.c:110
+#: src/prefs_ext_prog.c:108
 msgid "For the text editor, %w will be replaced with GtkSocket ID"
 msgstr "為此純文字編輯器,%w 將以 GtkSocket ID 覆蓋"
 
-#: src/prefs_ext_prog.c:129
+#: src/prefs_ext_prog.c:127
 msgid "Use system defaults when possible"
 msgstr "盡量使用系統預設值"
 
-#: src/prefs_ext_prog.c:150
+#: src/prefs_ext_prog.c:146
 msgid "Web browser"
 msgstr "瀏覽器"
 
-#: src/prefs_ext_prog.c:178
+#: src/prefs_ext_prog.c:172
 msgid "Text editor"
 msgstr "文字編輯器"
 
-#: src/prefs_ext_prog.c:210
+#: src/prefs_ext_prog.c:201
 msgid "Command for 'Display as text'"
 msgstr "以文字顯示的命令"
 
-#: src/prefs_ext_prog.c:223
+#: src/prefs_ext_prog.c:212
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
@@ -15459,120 +15884,120 @@ msgstr ""
 "此選項啟用了在郵件檢視器顯示MIME郵件的功能,當你使用 '以文字顯示' 功能項目"
 "時,它可以透過一個腳本達成"
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:180
+#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:172
 #: src/prefs_message.c:362
 msgid "Message View"
 msgstr "郵件檢視"
 
-#: src/prefs_ext_prog.c:283
+#: src/prefs_ext_prog.c:274
 msgid "External Programs"
 msgstr "外部程式"
 
-#: src/prefs_filtering_action.c:171
+#: src/prefs_filtering_action.c:169
 msgid "Move"
 msgstr "移動"
 
-#: src/prefs_filtering_action.c:174
+#: src/prefs_filtering_action.c:172
 msgid "Hide"
 msgstr "隱藏"
 
+#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:174
 #: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
 #: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
-#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
 msgid "Message flags"
 msgstr "郵件旗標"
 
-#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
-#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr "標示"
 
-#: src/prefs_filtering_action.c:179
+#: src/prefs_filtering_action.c:177
 msgid "Mark as read"
 msgstr "標示為已讀"
 
-#: src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:178
 msgid "Mark as unread"
 msgstr "標示為未讀"
 
-#: src/prefs_filtering_action.c:181
+#: src/prefs_filtering_action.c:179
 msgid "Mark as spam"
 msgstr "標示為垃圾郵件"
 
-#: src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:180
 msgid "Mark as ham"
 msgstr "標示為一般郵件"
 
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
+#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
+#: src/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2510
 msgid "Execute"
 msgstr "執行"
 
-#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
 msgid "Color label"
 msgstr "標籤顏色"
 
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:185
 msgid "Resend"
 msgstr "重傳"
 
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:185
 msgid "Redirect"
 msgstr "改寄"
 
-#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
-#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:640
-#: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
-#: src/summaryview.c:474
+#: 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/summaryview.c:470
 msgid "Score"
 msgstr "分數"
 
-#: src/prefs_filtering_action.c:188
+#: src/prefs_filtering_action.c:186
 msgid "Change score"
 msgstr "改變分數"
 
-#: src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:187
 msgid "Set score"
 msgstr "設定分數"
 
-#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
-#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
-#: src/prefs_summary_column.c:88 src/summaryview.c:476
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:190 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:472
 msgid "Tags"
 msgstr "標籤"
 
-#: src/prefs_filtering_action.c:190
+#: src/prefs_filtering_action.c:188
 msgid "Apply tag"
 msgstr "套用標籤"
 
-#: src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:189
 msgid "Unset tag"
 msgstr "取消標籤設定"
 
-#: src/prefs_filtering_action.c:192
+#: src/prefs_filtering_action.c:190
 msgid "Clear tags"
 msgstr "清除標籤"
 
-#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
 msgid "Threads"
 msgstr "串列"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:194
 msgid "Stop filter"
 msgstr "保止過濾"
 
-#: src/prefs_filtering_action.c:401
+#: src/prefs_filtering_action.c:399
 msgid "Action configuration"
 msgstr "動作設定"
 
-#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
-#: src/prefs_matcher.c:597
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1882
+#: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr "規則"
 
-#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:423
 msgid "Action"
 msgstr "動作"
 
@@ -15608,25 +16033,25 @@ msgstr "標籤名稱是空白的"
 msgid "No action was defined."
 msgstr "沒有定義動作"
 
-#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
-#: src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2213
+#: src/quote_fmt.c:78
 msgid "literal %"
 msgstr "字 %"
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2222
 msgid "filename (should not be modified)"
 msgstr "檔案名稱 (不能被修改)"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
-#: src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2223
+#: src/quote_fmt.c:86
 msgid "new line"
 msgstr "新的行"
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2224
 msgid "escape character for quotes"
 msgstr "引言的跳脫字元"
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2225
 msgid "quote character"
 msgstr "引言字元"
 
@@ -15663,117 +16088,117 @@ msgstr "顏色"
 msgid "Current action list"
 msgstr "目前的動作清單"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
+#: src/prefs_filtering.c:196 src/prefs_filtering.c:359
 msgid "Filtering/Processing configuration"
 msgstr "過濾/處理 配置"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
-#: src/prefs_filtering.c:986
+#: src/prefs_filtering.c:265 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:969
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "全部"
 
-#: src/prefs_filtering.c:412
+#: src/prefs_filtering.c:405
 msgid "Condition"
 msgstr "條件"
 
-#: src/prefs_filtering.c:425
+#: src/prefs_filtering.c:416
 msgid " Def_ine... "
 msgstr " 定義(_i)..."
 
-#: src/prefs_filtering.c:447
+#: src/prefs_filtering.c:434
 msgid " De_fine... "
 msgstr " 定義(_f)..."
 
-#: src/prefs_filtering.c:476
+#: src/prefs_filtering.c:461
 msgid "Append the new rule above to the list"
 msgstr "加入一個新規則到清單的上方"
 
-#: src/prefs_filtering.c:485
+#: src/prefs_filtering.c:470
 msgid "Replace the selected rule in list with the rule above"
 msgstr "以上方的規則取代清單內選擇的規則"
 
-#: src/prefs_filtering.c:494
+#: src/prefs_filtering.c:477
 msgid "Delete the selected rule from the list"
 msgstr "從清單中刪除選擇的規則"
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:516
 msgid "Move the selected rule to the top"
 msgstr "將選擇的規則移至最頂端"
 
-#: src/prefs_filtering.c:538
+#: src/prefs_filtering.c:519
 msgid "Page u_p"
 msgstr "上一頁(_p)"
 
-#: src/prefs_filtering.c:546
+#: src/prefs_filtering.c:527
 msgid "Move the selected rule one page up"
 msgstr "移動選擇的規則至上一頁"
 
-#: src/prefs_filtering.c:555
+#: src/prefs_filtering.c:536
 msgid "Move the selected rule up"
 msgstr "向上移動選擇的規則"
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:544
 msgid "Move the selected rule down"
 msgstr "向下移動選擇的規則"
 
-#: src/prefs_filtering.c:566
+#: src/prefs_filtering.c:547
 msgid "Page dow_n"
 msgstr "下一頁(_n)"
 
-#: src/prefs_filtering.c:574
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule one page down"
 msgstr "移動選擇的規則至下一頁"
 
-#: src/prefs_filtering.c:583
+#: src/prefs_filtering.c:564
 msgid "Move the selected rule to the bottom"
 msgstr "移動選擇的規則至底部"
 
-#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
+#: src/prefs_filtering.c:1026 src/prefs_filtering.c:1112
 msgid "Condition string is not valid."
 msgstr "條件字串是無效的"
 
-#: src/prefs_filtering.c:1116
+#: src/prefs_filtering.c:1099
 msgid "Condition string is empty."
 msgstr "條件字串是空白的"
 
-#: src/prefs_filtering.c:1122
+#: src/prefs_filtering.c:1105
 msgid "Action string is empty."
 msgstr "動作字串是空白的"
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1194
 msgid "Delete rule"
 msgstr "刪除規則"
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1195
 msgid "Do you really want to delete this rule?"
 msgstr "你確定要刪除這個規則嗎?"
 
-#: src/prefs_filtering.c:1230
+#: src/prefs_filtering.c:1214
 msgid "Delete all rules"
 msgstr "刪除所有的規則"
 
-#: src/prefs_filtering.c:1231
+#: src/prefs_filtering.c:1215
 msgid "Do you really want to delete all the rules?"
 msgstr "你確定要刪除所有的規則"
 
-#: src/prefs_filtering.c:1482
+#: src/prefs_filtering.c:1467
 msgid "Filtering rules not saved"
 msgstr "過濾規格尚未儲存"
 
-#: src/prefs_filtering.c:1483
+#: src/prefs_filtering.c:1468
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "此過濾規則清單已被修改,仍然要關閉嗎?"
 
-#: src/prefs_filtering.c:1705
+#: src/prefs_filtering.c:1694
 msgid "Move one page up"
 msgstr "移往上一頁"
 
-#: src/prefs_filtering.c:1706
+#: src/prefs_filtering.c:1695
 msgid "Move one page down"
 msgstr "移至下一頁"
 
-#: src/prefs_filtering.c:1863
+#: src/prefs_filtering.c:1850
 msgid "Enable"
 msgstr "啟用"
 
@@ -15793,17 +16218,17 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "隱藏行數"
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
-#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "顯示行數"
 
-#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:474
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1016
 msgid " Use default "
 msgstr "使用預設值"
 
-#: src/prefs_folder_item.c:214
+#: src/prefs_folder_item.c:216
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -15812,7 +16237,7 @@ msgstr ""
 "當此資料夾不是最上層的資料夾時,這些選項將無法被儲存,然而,你可以用 \"套用至"
 "子資料夾\" 功能將它們套用到整個 郵件箱樹狀結構上"
 
-#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
+#: src/prefs_folder_item.c:300 src/prefs_folder_item.c:936
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15820,11 +16245,11 @@ msgstr ""
 "套用至\n"
 "子資料夾"
 
-#: src/prefs_folder_item.c:318
+#: src/prefs_folder_item.c:323
 msgid "Normal"
 msgstr "一般"
 
-#: src/prefs_folder_item.c:320
+#: src/prefs_folder_item.c:325
 msgid "Outbox"
 msgstr "外寄郵件箱"
 
@@ -15832,43 +16257,43 @@ msgstr "外寄郵件箱"
 msgid "Folder type"
 msgstr "資料夾型式"
 
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:360
 msgid "Simplify Subject RegExp"
 msgstr "簡化主旨 RegExp"
 
-#: src/prefs_folder_item.c:374
+#: src/prefs_folder_item.c:387
 msgid "Test string"
 msgstr "測試字串:"
 
-#: src/prefs_folder_item.c:391
+#: src/prefs_folder_item.c:408
 msgid "Result"
 msgstr "結果:"
 
-#: src/prefs_folder_item.c:406
+#: src/prefs_folder_item.c:426
 msgid "Folder chmod"
 msgstr "資料夾權限"
 
-#: src/prefs_folder_item.c:432
+#: src/prefs_folder_item.c:454
 msgid "Folder color"
 msgstr "資料夾顏色"
 
-#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
+#: src/prefs_folder_item.c:464 src/prefs_folder_item.c:468
 msgid "Pick color for folder"
 msgstr "為資料夾選取顏色"
 
-#: src/prefs_folder_item.c:462
+#: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
 msgstr "在開始時進行規則的套用"
 
-#: src/prefs_folder_item.c:477
+#: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
 msgstr "在開啟時進行規則的套用"
 
-#: src/prefs_folder_item.c:491
+#: src/prefs_folder_item.c:505
 msgid "Scan for new mail"
 msgstr "掃描新郵件"
 
-#: src/prefs_folder_item.c:493
+#: src/prefs_folder_item.c:507
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15876,121 +16301,134 @@ msgstr ""
 "若此郵件被外部應用程式或是在 IMAP 伺服器上被過濾器直接傳送至這個資料夾, 此選"
 "項應該要開啟。"
 
-#: src/prefs_folder_item.c:513
+#: src/prefs_folder_item.c:524
 msgid "Select the HTML part of multipart messages"
 msgstr "選擇多重郵件的HTML部份"
 
-#: src/prefs_folder_item.c:530
+#: src/prefs_folder_item.c:539
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
 "\"預設\" 將會套用全域的選項 (選項可以在 /Preferences/Message View/Text 找到)"
 
-#: src/prefs_folder_item.c:540
+#: src/prefs_folder_item.c:549
+msgid "Skip folder when searching for unread or new messages"
+msgstr "顯示 \"無未讀或新郵件\" 對話框"
+
+#: src/prefs_folder_item.c:551
+msgid ""
+"Turn this option on if you want this folder to be ignored when searching for "
+"unread or new messages"
+msgstr ""
+"如果希望在搜尋未讀或新郵件時忽略此資料夾"
+"需將此選項關閉"
+
+#: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
 msgstr "離線模式下同步"
 
-#: src/prefs_folder_item.c:561
+#: src/prefs_folder_item.c:582
 msgid "Fetch message bodies from the last"
 msgstr "從最後面擷取郵件內容"
 
-#: src/prefs_folder_item.c:568
+#: src/prefs_folder_item.c:587
 msgid "0: all bodies"
 msgstr "0: 所有的內容"
 
-#: src/prefs_folder_item.c:576
+#: src/prefs_folder_item.c:594
 msgid "Remove older messages bodies"
 msgstr "移除舊郵件內容"
 
-#: src/prefs_folder_item.c:593
+#: src/prefs_folder_item.c:612
 msgid "Discard folder cache"
 msgstr "放棄資料夾快取"
 
-#: src/prefs_folder_item.c:905
+#: src/prefs_folder_item.c:943
 msgid "Request Return Receipt"
 msgstr "要求回覆回條"
 
-#: src/prefs_folder_item.c:920
+#: src/prefs_folder_item.c:954
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "用傳送儲存外寄郵件複本至這個資料夾"
 
-#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
-#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:965 src/prefs_folder_item.c:990
+#: src/prefs_folder_item.c:1040 src/prefs_folder_item.c:1065
+#: src/prefs_folder_item.c:1090
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "預設 %s"
 
-#: src/prefs_folder_item.c:960
+#: src/prefs_folder_item.c:1015
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "回信的預設 %s"
 
-#: src/prefs_folder_item.c:1063
+#: src/prefs_folder_item.c:1114
 msgid "Default account"
 msgstr "需設帳號"
 
-#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+#: src/prefs_folder_item.c:1247 src/prefs_folder_item.c:1278
 msgid "\"Default\" will follow the applicable account preference"
 msgstr "\"預設\"將依循合適的帳號設置"
 
-#: src/prefs_folder_item.c:1781
+#: src/prefs_folder_item.c:1824
 msgid "Discard cache"
 msgstr "放棄快取"
 
-#: src/prefs_folder_item.c:1782
+#: src/prefs_folder_item.c:1825
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "你確定要放棄本地資料夾的快取資料嗎?"
 
-#: src/prefs_folder_item.c:1907
+#: src/prefs_folder_item.c:1940
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_folder_item.c:1986
+#: src/prefs_folder_item.c:2019
 #, c-format
 msgid "Properties for folder %s"
 msgstr "資料夾屬性 %s"
 
-#: src/prefs_fonts.c:79
+#: src/prefs_fonts.c:78
 msgid "Folder and Message Lists"
 msgstr "資料夾與郵件清單"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
+#: src/prefs_fonts.c:96 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "郵件"
 
-#: src/prefs_fonts.c:126
+#: src/prefs_fonts.c:119
 msgid "Derive small and bold fonts from Folder and Message Lists font"
 msgstr "繼承資料夾與郵件清單的字型作為小字體與粗體"
 
-#: src/prefs_fonts.c:136
+#: src/prefs_fonts.c:127
 msgid "Small"
 msgstr "小字體"
 
-#: src/prefs_fonts.c:158
+#: src/prefs_fonts.c:147
 msgid "Bold"
 msgstr "粗體"
 
-#: src/prefs_fonts.c:180
+#: src/prefs_fonts.c:167
 msgid "Use different font for printing"
 msgstr "使用不同的字型進行列印"
 
-#: src/prefs_fonts.c:190
+#: src/prefs_fonts.c:175
 msgid "Message Printing"
 msgstr "列印郵件"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
-#: src/prefs_themes.c:422
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_themes.c:426
 msgid "Display"
 msgstr "顯示"
 
-#: src/prefs_fonts.c:269
+#: src/prefs_fonts.c:252
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:910 src/toolbar.c:260 src/toolbar.c:528
 msgid "Preferences"
 msgstr "選項"
 
@@ -15998,39 +16436,39 @@ msgstr "選項"
 msgid "Automatically display attached images"
 msgstr "自動顯示附件圖片"
 
-#: src/prefs_image_viewer.c:82
+#: src/prefs_image_viewer.c:80
 msgid "Resize attached images by default"
 msgstr "預設為改變附件圖片大小"
 
-#: src/prefs_image_viewer.c:85
+#: src/prefs_image_viewer.c:83
 msgid "Clicking image toggles scaling"
 msgstr "點擊圖片以切換縮放"
 
-#: src/prefs_image_viewer.c:96
+#: src/prefs_image_viewer.c:92
 msgid "Fit image"
 msgstr "滿版"
 
-#: src/prefs_image_viewer.c:99
+#: src/prefs_image_viewer.c:96
 msgid "Right-clicking image toggles fitting height/width"
 msgstr "在圖片上點擊右鍵以以切換寬/長滿版"
 
-#: src/prefs_image_viewer.c:102
+#: src/prefs_image_viewer.c:99
 msgid "Height"
 msgstr "高"
 
-#: src/prefs_image_viewer.c:107
+#: src/prefs_image_viewer.c:105
 msgid "Width"
 msgstr "寬"
 
-#: src/prefs_image_viewer.c:114
+#: src/prefs_image_viewer.c:110
 msgid "Display images inline"
 msgstr "在郵件內顯示影像"
 
-#: src/prefs_image_viewer.c:120
+#: src/prefs_image_viewer.c:114
 msgid "Print images"
 msgstr "列印圖片"
 
-#: src/prefs_image_viewer.c:181
+#: src/prefs_image_viewer.c:173
 msgid "Image Viewer"
 msgstr "圖片檢視器"
 
@@ -16149,7 +16587,7 @@ msgstr "錯誤郵件"
 msgid "Status messages for filtering/processing log"
 msgstr "記錄過濾/執行日誌的狀態郵件"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:143 src/prefs_other.c:785
 msgid "Other"
 msgstr "其它"
 
@@ -16157,168 +16595,168 @@ msgstr "其它"
 msgid "Logging"
 msgstr "日誌"
 
-#: src/prefs_matcher.c:335
+#: src/prefs_matcher.c:334
 msgid "more than"
 msgstr "多於"
 
-#: src/prefs_matcher.c:336
+#: src/prefs_matcher.c:335
 msgid "less than"
 msgstr "少於"
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:341
 msgid "weeks"
 msgstr "星期"
 
-#: src/prefs_matcher.c:346
+#: src/prefs_matcher.c:345
 msgid "after"
 msgstr "之後"
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:346
 msgid "before"
 msgstr "之前"
 
-#: src/prefs_matcher.c:351
+#: src/prefs_matcher.c:350
 msgid "higher than"
 msgstr "高於"
 
-#: src/prefs_matcher.c:352
+#: src/prefs_matcher.c:351
 msgid "lower than"
 msgstr "低於"
 
-#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
+#: src/prefs_matcher.c:352 src/prefs_matcher.c:358
 msgid "exactly"
 msgstr "完全正確"
 
-#: src/prefs_matcher.c:357
+#: src/prefs_matcher.c:356
 msgid "greater than"
 msgstr "大於"
 
-#: src/prefs_matcher.c:358
+#: src/prefs_matcher.c:357
 msgid "smaller than"
 msgstr "小於"
 
-#: src/prefs_matcher.c:363
+#: src/prefs_matcher.c:362
 msgid "bytes"
 msgstr "位元"
 
-#: src/prefs_matcher.c:364
-msgid "kilobytes"
+#: src/prefs_matcher.c:363
+msgid "kibibytes"
 msgstr "千位元"
 
-#: src/prefs_matcher.c:365
-msgid "megabytes"
+#: src/prefs_matcher.c:364
+msgid "mebibytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:369
+#: src/prefs_matcher.c:368
 msgid "contains"
 msgstr "包含"
 
-#: src/prefs_matcher.c:370
+#: src/prefs_matcher.c:369
 msgid "doesn't contain"
 msgstr "未包含"
 
-#: src/prefs_matcher.c:394
+#: src/prefs_matcher.c:393
 msgid "headers part"
 msgstr "郵件標頭的部份"
 
-#: src/prefs_matcher.c:395
+#: src/prefs_matcher.c:394
 msgid "headers values"
 msgstr "郵件標頭的數值"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:395
 msgid "body part"
 msgstr "內文部份"
 
-#: src/prefs_matcher.c:397
+#: src/prefs_matcher.c:396
 msgid "whole message"
 msgstr "全部郵件"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6563
+#: src/prefs_matcher.c:402 src/summaryview.c:6551
 msgid "Marked"
 msgstr "已標示"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6561
+#: src/prefs_matcher.c:403 src/summaryview.c:6549
 msgid "Deleted"
 msgstr "已刪除"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:404
 msgid "Replied"
 msgstr "已回覆"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6555
+#: src/prefs_matcher.c:405 src/summaryview.c:6543
 msgid "Forwarded"
 msgstr "已轉寄"
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2342
+#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr "垃圾郵件"
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:408
 msgid "Has attachment"
 msgstr "有附加檔額"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6581
+#: src/prefs_matcher.c:409 src/summaryview.c:6569
 msgid "Signed"
 msgstr "簽章"
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:413
 msgid "set"
 msgstr "設定"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:414
 msgid "not set"
 msgstr "未設定"
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:418
 msgid "yes"
 msgstr "是"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:419
 msgid "no"
 msgstr "否"
 
-#: src/prefs_matcher.c:424
+#: src/prefs_matcher.c:423
 msgid "Any tags"
 msgstr "任何標籤"
 
-#: src/prefs_matcher.c:425
+#: src/prefs_matcher.c:424
 msgid "Specific tag"
 msgstr "指定的標籤"
 
-#: src/prefs_matcher.c:429
+#: src/prefs_matcher.c:428
 msgid "ignored"
 msgstr "忽略"
 
-#: src/prefs_matcher.c:430
+#: src/prefs_matcher.c:429
 msgid "not ignored"
 msgstr "不忽略"
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:430
 msgid "watched"
 msgstr "已監看"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:431
 msgid "not watched"
 msgstr "未被監看"
 
-#: src/prefs_matcher.c:436
+#: src/prefs_matcher.c:435
 msgid "found"
 msgstr "找"
 
-#: src/prefs_matcher.c:437
+#: src/prefs_matcher.c:436
 msgid "not found"
 msgstr "找不到"
 
-#: src/prefs_matcher.c:441
+#: src/prefs_matcher.c:440
 msgid "0 (Passed)"
 msgstr "0 (通過)"
 
-#: src/prefs_matcher.c:442
+#: src/prefs_matcher.c:441
 msgid "non-0 (Failed)"
 msgstr "無-0 (失敗)"
 
-#: src/prefs_matcher.c:580
+#: src/prefs_matcher.c:578
 msgid "Condition configuration"
 msgstr "條件設定"
 
@@ -16326,96 +16764,96 @@ msgstr "條件設定"
 msgid "Match criteria"
 msgstr "符合條件"
 
-#: src/prefs_matcher.c:633
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr "所有郵件"
 
-#: src/prefs_matcher.c:635
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr "年齡"
 
-#: src/prefs_matcher.c:636
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr "片語"
 
-#: src/prefs_matcher.c:637
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr "旗標"
 
-#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "標籤顏色"
 
-#: src/prefs_matcher.c:639
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr "執行緒"
 
-#: src/prefs_matcher.c:642
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr "部份已下載"
 
-#: src/prefs_matcher.c:645
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr "外部程式測試"
 
-#: src/prefs_matcher.c:674
+#: src/prefs_matcher.c:672
 msgid ""
 "Use selector on the right to pick the header name. Type the name of the "
 "header if not available in the list."
 msgstr "使用右側的選擇器挑選標頭名稱,若標頭名稱不在清單中,請直接輸入名稱"
 
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1655 src/prefs_matcher.c:1670
 #: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "所有"
 
-#: src/prefs_matcher.c:753
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr "使用 regexp"
 
-#: src/prefs_matcher.c:844
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr "郵件必需滿足"
 
-#: src/prefs_matcher.c:848
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr "至少包含一個"
 
-#: src/prefs_matcher.c:849
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr "所有"
 
-#: src/prefs_matcher.c:852
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr "在上述所的規則內"
 
-#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
+#: src/prefs_matcher.c:1561 src/prefs_matcher.c:1639
 msgid "Search pattern is not set."
 msgstr "搜尋模型尚未設定"
 
-#: src/prefs_matcher.c:1578
+#: src/prefs_matcher.c:1575
 msgid "Invalid hour."
 msgstr "無效的小時"
 
-#: src/prefs_matcher.c:1587
+#: src/prefs_matcher.c:1585
 msgid "Test command is not set."
 msgstr "測試命令尚未設定"
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1656
 msgid "all addresses in all headers"
 msgstr "所有郵件標頭內的所有地址"
 
-#: src/prefs_matcher.c:1662
+#: src/prefs_matcher.c:1659
 msgid "any address in any header"
 msgstr "任何郵件標頭內的任何地址"
 
-#: src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "郵件標頭'%s'內的地址"
 
-#: src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1662
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16515,11 +16953,11 @@ msgstr ""
 "輸入內容尚未儲存\n"
 "確定要離開?"
 
-#: src/prefs_matcher.c:2233
+#: src/prefs_matcher.c:2234
 msgid "Match Type: 'Test'"
 msgstr "符合型式:'測試'"
 
-#: src/prefs_matcher.c:2234
+#: src/prefs_matcher.c:2235
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16530,7 +16968,7 @@ msgstr ""
 "\n"
 "下列的符號是可以使用的:"
 
-#: src/prefs_matcher.c:2333
+#: src/prefs_matcher.c:2334
 msgid "Current condition rules"
 msgstr "目前條件規則"
 
@@ -16646,145 +17084,149 @@ msgstr ""
 msgid "Configuration warning"
 msgstr "配置完成"
 
-#: src/prefs_msg_colors.c:155
+#: src/prefs_msg_colors.c:145
 msgid "Message view"
 msgstr "郵件檢視"
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:152
 msgid "Enable coloration of message text"
 msgstr "啟用郵件文字的著色功能"
 
-#: src/prefs_msg_colors.c:170
+#: src/prefs_msg_colors.c:160
 msgid "Quote"
 msgstr "引言"
 
-#: src/prefs_msg_colors.c:182
+#: src/prefs_msg_colors.c:172
 msgid "Cycle quote colors"
 msgstr "引言顏色循環"
 
-#: src/prefs_msg_colors.c:186
+#: src/prefs_msg_colors.c:176
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "如果超過3層引言,則這些顏色將會被重複使用"
 
-#: src/prefs_msg_colors.c:192
+#: src/prefs_msg_colors.c:182
 msgid "1st Level"
 msgstr "第一層"
 
-#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:234
+#: src/prefs_msg_colors.c:188 src/prefs_msg_colors.c:206
+#: src/prefs_msg_colors.c:224
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs_msg_colors.c:202
+#: src/prefs_msg_colors.c:192
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "為第一層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:200
 msgid "2nd Level"
 msgstr "第二層"
 
-#: src/prefs_msg_colors.c:220
+#: src/prefs_msg_colors.c:210
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "為第二層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:228
+#: src/prefs_msg_colors.c:218
 msgid "3rd Level"
 msgstr "第三層"
 
-#: src/prefs_msg_colors.c:238
+#: src/prefs_msg_colors.c:228
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "為第三層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:247
+#: src/prefs_msg_colors.c:237
 msgid "Enable coloration of text background"
 msgstr "曲用文字背景著色功能"
 
-#: src/prefs_msg_colors.c:256
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:247
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "為第一層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:269
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:261
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "為第二層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:282
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:275
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "為第三層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:294
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:288
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for links"
 msgstr "挑選連結的顏色"
 
-#: src/prefs_msg_colors.c:298
+#: src/prefs_msg_colors.c:292
 msgid "URI link"
 msgstr "URI連結"
 
-#: src/prefs_msg_colors.c:306
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:301
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for signatures"
 msgstr "挑選簽名的顏色"
 
 #. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
 #. versions of the same text file
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:311
 msgid "Patch messages and attachments"
 msgstr "郵件已成為附加檔"
 
-#: src/prefs_msg_colors.c:324
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:320
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for inserted lines"
 msgstr "挑選連結的顏色"
 
-#: src/prefs_msg_colors.c:326
+#: src/prefs_msg_colors.c:322
 msgid "Inserted lines"
 msgstr "插入檔案"
 
-#: src/prefs_msg_colors.c:333
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:330
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for removed lines"
 msgstr "挑選連結的顏色"
 
-#: src/prefs_msg_colors.c:336
+#: src/prefs_msg_colors.c:333
 msgid "Removed lines"
 msgstr "移除 feed"
 
-#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:344
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:342
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for hunk lines"
 msgstr "挑選連結的顏色"
 
 #. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:348
+#: src/prefs_msg_colors.c:346
 msgid "Hunk lines"
 msgstr "新的行"
 
-#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
 msgid "Folder list"
 msgstr "資料夾清單"
 
+#: src/prefs_msg_colors.c:356
+msgctxt "Tooltip and Dialog title"
+msgid "Pick color for Target folder."
+msgstr "挑選目的資料夾的顏色"
+
 #: src/prefs_msg_colors.c:357
+msgid "Target folder"
+msgstr "目的資料夾"
+
+#: src/prefs_msg_colors.c:359
 msgctxt "Tooltip"
 msgid ""
-"Pick color for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
+"Target folder is used when the option 'Execute immediately when moving or "
+"deleting messages' is turned off"
 msgstr ""
 "挑選目的資料夾的顏色。在'當移動或刪除郵件時立即執行'選項被關閉時,目的資料夾"
 "將會被使用"
 
-#: src/prefs_msg_colors.c:362
-msgid "Target folder"
-msgstr "目的資料夾"
-
-#: src/prefs_msg_colors.c:369
-msgctxt "Tooltip"
+#: src/prefs_msg_colors.c:370
+msgctxt "Tooltip and Dialog title"
 msgid "Pick color for folders containing new messages"
 msgstr "為包含新郵件的資料夾挑選顏色"
 
@@ -16794,7 +17236,7 @@ msgstr "包含新郵件的資料夾"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:435
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16802,155 +17244,66 @@ msgstr "為 '顏色 %d' 挑選顏色"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:439
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "為 '顏色 %d' 設定標籤"
 
-#: src/prefs_msg_colors.c:529
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text"
-msgstr "為第一層文字挑選顏色"
-
-#: src/prefs_msg_colors.c:531
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text"
-msgstr "為第二層文字挑選顏色"
-
-#: src/prefs_msg_colors.c:533
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text"
-msgstr "為第三層文字挑選顏色"
-
-#: src/prefs_msg_colors.c:535
-msgctxt "Dialog title"
-msgid "Pick color for 1st level text background"
-msgstr "為第一層文字背景挑選顏色"
-
-#: src/prefs_msg_colors.c:537
-msgctxt "Dialog title"
-msgid "Pick color for 2nd level text background"
-msgstr "為第二層文字背景挑選顏色"
-
-#: src/prefs_msg_colors.c:539
-msgctxt "Dialog title"
-msgid "Pick color for 3rd level text background"
-msgstr "為第三層文字背景挑選顏色"
-
-#: src/prefs_msg_colors.c:541
-msgctxt "Dialog title"
-msgid "Pick color for links"
-msgstr "挑選連結的顏色"
-
-#: src/prefs_msg_colors.c:543
-msgctxt "Dialog title"
-msgid "Pick color for target folder"
-msgstr "挑選目的資料夾的顏色"
-
-#: src/prefs_msg_colors.c:545
-msgctxt "Dialog title"
-msgid "Pick color for signatures"
-msgstr "挑選簽名的顏色"
-
-#: src/prefs_msg_colors.c:547
-msgctxt "Dialog title"
-msgid "Pick color for folder"
-msgstr "挑選資料夾的顏色"
-
-#: src/prefs_msg_colors.c:549
-msgctxt "Dialog title"
-msgid "Pick color for inserted lines"
-msgstr "挑選連結的顏色"
-
-#: src/prefs_msg_colors.c:551
-msgctxt "Dialog title"
-msgid "Pick color for removed lines"
-msgstr "挑選連結的顏色"
-
-#: src/prefs_msg_colors.c:553
-msgctxt "Dialog title"
-msgid "Pick color for hunk lines"
-msgstr "挑選連結的顏色"
-
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:576
+#: src/prefs_msg_colors.c:411 src/prefs_msg_colors.c:448
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "為 '顏色 %d' 挑選顏色"
 
-#: src/prefs_msg_colors.c:777
+#: src/prefs_msg_colors.c:582
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_other.c:109
+#: src/prefs_other.c:108
 msgid "Choose preset keyboard shortcuts"
 msgstr "選擇預設的快捷鍵"
 
-#: src/prefs_other.c:124
-msgid "Select preset:"
-msgstr "選擇預設:"
-
-#: src/prefs_other.c:139
-msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
-msgstr ""
-"你可以透過把滑鼠焦點放在項目上時,按下任何按鍵,\n"
-"來修改每一個功能項目的快捷鍵"
+#: src/prefs_other.c:123
+msgid "Select preset keyboard shortcuts:"
+msgstr "選擇預設的快捷鍵"
 
-#: src/prefs_other.c:497
+#: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
 msgstr "雙擊時將郵件地址加入通訊錄"
 
-#: src/prefs_other.c:500
+#: src/prefs_other.c:498
 msgid "On exit"
 msgstr "離開時"
 
-#: src/prefs_other.c:503
+#: src/prefs_other.c:501
 msgid "Confirm on exit"
 msgstr "離開時需確認"
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:508
 msgid "Empty trash on exit"
 msgstr "離開時清空回收桶"
 
-#: src/prefs_other.c:513
+#: src/prefs_other.c:511
 msgid "Warn if there are queued messages"
 msgstr "若有任何的暫存郵件時提出警示"
 
-#: src/prefs_other.c:515
+#: src/prefs_other.c:513
 msgid "Keyboard shortcuts"
 msgstr "快捷鍵"
 
-#: src/prefs_other.c:518
+#: src/prefs_other.c:516
 msgid "Enable keyboard shortcuts"
 msgstr "啟用快捷鍵"
 
-#: src/prefs_other.c:521
-msgid "Enable customisable keyboard shortcuts"
-msgstr "啟用使用者自訂的快捷鍵"
-
-#: src/prefs_other.c:524
-msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items "
-"by focusing on the menu item and pressing a key combination.\n"
-"Uncheck this option if you want to lock all existing keyboard shortcuts."
-msgstr ""
-"如果勾選,你可以透過將焦點放在功能項目並按下複合鍵,以改變絕大部份功能項目的"
-"快捷鍵設定\n"
-"若你希望保持所有已存在的快捷鍵,請取消勾選。"
-
-#: src/prefs_other.c:531
+#: src/prefs_other.c:519
 msgid " Choose preset keyboard shortcuts... "
 msgstr "選擇已設定的快捷鍵..."
 
-#: src/prefs_other.c:541
+#: src/prefs_other.c:529
 msgid "Metadata handling"
 msgstr "原始數據控制"
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:530
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16958,41 +17311,41 @@ msgstr ""
 "安全模式會要求系統將原始數據直接寫入磁碟,它將避免在任何的崩潰情況下\n"
 "遺失數據,但是這樣將會花費一些時間。"
 
-#: src/prefs_other.c:546
+#: src/prefs_other.c:535
 msgid "Safer"
 msgstr "更安全"
 
-#: src/prefs_other.c:548
+#: src/prefs_other.c:537
 msgid "Faster"
 msgstr "更快"
 
-#: src/prefs_other.c:566
+#: src/prefs_other.c:555
 msgid "Socket I/O timeout"
 msgstr "Socket I/O 超時"
 
-#: src/prefs_other.c:587
+#: src/prefs_other.c:576
 msgid "Translate header names"
 msgstr "轉換標頭名稱"
 
-#: src/prefs_other.c:589
+#: src/prefs_other.c:578
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr "標準標頭的顯示 (像是 'From:', 'Subject:') 將會 翻譯為你的語言"
 
-#: src/prefs_other.c:592
+#: src/prefs_other.c:581
 msgid "Ask before emptying trash"
 msgstr "清空回收桶前詢問"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:583
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "手動進行過濾時,詢問要使用那一個帳號使用的過濾規則"
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:588
 msgid "Use secure file deletion if possible"
 msgstr "如果可以,使用安全的檔案刪除"
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:592
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -17000,7 +17353,7 @@ msgstr ""
 "如果可以,使用安全的檔案刪除\n"
 "('shred'程式是無效的)"
 
-#: src/prefs_other.c:608
+#: src/prefs_other.c:597
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -17008,35 +17361,35 @@ msgstr ""
 "使用'shred'程式,以隨機的方式在檔案刪除前覆寫檔案,這樣將使刪除變慢。請仔細閱"
 "讀'shred'的man page,以取得更詳細的警示說明"
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:601
 msgid "Synchronise offline folders as soon as possible"
 msgstr "儘快的同步離線資料夾"
 
-#: src/prefs_other.c:615
-msgid "Master passphrase"
+#: src/prefs_other.c:604
+msgid "Primary passphrase"
 msgstr "錯誤的密碼"
 
-#: src/prefs_other.c:618
-msgid "Use a master passphrase"
+#: src/prefs_other.c:607
+msgid "Use a primary passphrase"
 msgstr "請輸入密碼:"
 
-#: src/prefs_other.c:621
+#: src/prefs_other.c:610
 msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
+"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 ""
 "如果勾選了此選項,你已儲存的帳密將會受到一個慣用詞的保護,如果沒有指定慣用"
 "詞,你將會被要求設定一個。"
 
-#: src/prefs_other.c:626
-msgid "Change master passphrase"
+#: src/prefs_other.c:615
+msgid "Change primary passphrase"
 msgstr "請輸入密碼:"
 
-#: src/prefs_other.c:816
+#: src/prefs_other.c:786
 msgid "Miscellaneous"
 msgstr "雜項"
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+#: src/prefs_proxy.c:236 src/prefs_receive.c:415 src/prefs_send.c:411
 msgid "Mail Handling"
 msgstr "郵件處理"
 
@@ -17137,447 +17490,453 @@ msgstr "發出警告!當接收者超過:"
 msgid "Outgoing encoding"
 msgstr "外寄郵件編碼"
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:248
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "如果選取'自動',則目前本地端的最佳化將被套用"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:263
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7位元  ASCII (US-ASCII)"
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:264
 msgid "Unicode (UTF-8)"
 msgstr "萬國碼 (UTF-8)"
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:266
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐 (ISO-8859-1)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:267
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐 (ISO-8859-15)"
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:269
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐 (ISO-8859-2)"
 
-#: src/prefs_send.c:275
+#: src/prefs_send.c:271
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:272
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海 (ISO-8859-4)"
 
-#: src/prefs_send.c:278
+#: src/prefs_send.c:274
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘 (ISO-8859-7)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:276
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯萊 (ISO-8859-8)"
 
-#: src/prefs_send.c:281
+#: src/prefs_send.c:277
 msgid "Hebrew (Windows-1255)"
 msgstr "希伯萊 (Windows-1255)"
 
-#: src/prefs_send.c:283
+#: src/prefs_send.c:279
 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯 (ISO-8859-6)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:280
 msgid "Arabic (Windows-1256)"
 msgstr "阿拉伯 (Windows-1256)"
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:282
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其 (ISO-8859-9)"
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:284
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里爾 (ISO-8859-5)"
 
-#: src/prefs_send.c:289
+#: src/prefs_send.c:285
 msgid "Cyrillic (KOI8-R)"
 msgstr "西里爾 (KOI8-R)"
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:286
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "西里爾 (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:291
+#: src/prefs_send.c:287
 msgid "Cyrillic (KOI8-U)"
 msgstr "西里爾 (KOI8-U)"
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:288
 msgid "Cyrillic (Windows-1251)"
 msgstr "西里爾 (Windows-1251)"
 
-#: src/prefs_send.c:294
+#: src/prefs_send.c:290
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文(ISO-2022-JP)"
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:292
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:293
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_send.c:300
+#: src/prefs_send.c:296
 msgid "Simplified Chinese (GB18030)"
 msgstr "簡體中文 (GB18030)"
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:297
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:298
 msgid "Simplified Chinese (GBK)"
 msgstr "簡體中文 (GBK)"
 
-#: src/prefs_send.c:303
+#: src/prefs_send.c:299
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:301
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_send.c:306
+#: src/prefs_send.c:302
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_send.c:309
+#: src/prefs_send.c:305
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_send.c:311
+#: src/prefs_send.c:307
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:308
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_send.c:316
+#: src/prefs_send.c:312
 msgid "Transfer encoding"
 msgstr "傳送編號"
 
-#: src/prefs_send.c:327
+#: src/prefs_send.c:321
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr "當郵件內容包含非ASCII編碼字元時需指定傳送加碼方式"
 
-#: src/prefs_send.c:420 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "傳送"
 
-#: src/prefs_spelling.c:80
-msgid "Pick color for misspelled word"
-msgstr "為拼錯的單字挑選顏色"
-
-#: src/prefs_spelling.c:128
+#: src/prefs_spelling.c:115
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查"
 
-#: src/prefs_spelling.c:133
+#: src/prefs_spelling.c:120
 msgid "Enable alternate dictionary"
 msgstr "啟用字典交互查詢"
 
-#: src/prefs_spelling.c:138
+#: src/prefs_spelling.c:125
 msgid "Faster switching with last used dictionary"
 msgstr "採用最後使用的字典以加速切換"
 
-#: src/prefs_spelling.c:140
+#: src/prefs_spelling.c:127
 msgid "Automatic spell checking"
 msgstr "自動拼字檢查"
 
-#: src/prefs_spelling.c:148
+#: src/prefs_spelling.c:135
 msgid "Re-check message when changing dictionary"
 msgstr "當改變字典時,重新檢查郵件"
 
-#: src/prefs_spelling.c:152
+#: src/prefs_spelling.c:139
 msgid "Dictionary"
 msgstr "字典"
 
-#: src/prefs_spelling.c:187
+#: src/prefs_spelling.c:168
 msgid "Check with both dictionaries"
 msgstr "用兩部字典進行檢查"
 
-#: src/prefs_spelling.c:194
+#: src/prefs_spelling.c:174
 msgid "Get more dictionaries..."
 msgstr "取得更多的字典..."
 
-#: src/prefs_spelling.c:204
+#: src/prefs_spelling.c:182
 msgid "Misspelled word color"
 msgstr "錯字的顏色"
 
-#: src/prefs_spelling.c:216
+#: src/prefs_spelling.c:192
+msgid "Pick color for misspelled word"
+msgstr "為拼錯的單字挑選顏色"
+
+#: src/prefs_spelling.c:197
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "為錯字挑選顏色,要使用黑色的底線嗎?"
 
-#: src/prefs_spelling.c:333
+#: src/prefs_spelling.c:309
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:164
 msgid "the abbreviated weekday name"
 msgstr "星期名稱縮寫"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:165
 msgid "the full weekday name"
 msgstr "星期的完整名稱"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:166
 msgid "the abbreviated month name"
 msgstr "月份名稱縮寫"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:167
 msgid "the full month name"
 msgstr "月份的完整名稱"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:168
 msgid "the preferred date and time for the current locale"
 msgstr "目前地區的最佳日期和時間"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:169
 msgid "the century number (year/100)"
 msgstr "年代數字 (年/100)"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:170
 msgid "the day of the month as a decimal number"
 msgstr "以十進制數字顯示該月的日期"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:171
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "用十進制數字以24時制顯示小時"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:172
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "用十進制數字以12時制顯示小時"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:173
 msgid "the day of the year as a decimal number"
 msgstr "以十進制數字顯示該年的日期"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:174
 msgid "the month as a decimal number"
 msgstr "以十進制數字顯示月份"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:175
 msgid "the minute as a decimal number"
 msgstr "以十進制數字顯示分"
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:176
 msgid "either AM or PM"
 msgstr "AM 或 PM"
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:177
 msgid "the second as a decimal number"
 msgstr "以十進制數字顯示秒"
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:178
 msgid "the day of the week as a decimal number"
 msgstr "以十進制數字顯示該週的日期"
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:179
 msgid "the preferred date for the current locale"
 msgstr "目前地區的最佳日期"
 
-#: src/prefs_summaries.c:183
+#: src/prefs_summaries.c:180
 msgid "the last two digits of a year"
 msgstr "年份最後兩位數字"
 
-#: src/prefs_summaries.c:184
+#: src/prefs_summaries.c:181
 msgid "the year as a decimal number"
 msgstr "以十進制數字顯示年份"
 
-#: src/prefs_summaries.c:185
+#: src/prefs_summaries.c:182
 msgid "the time zone or name or abbreviation"
 msgstr "時區或名稱或縮寫"
 
-#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
-#: src/prefs_summaries.c:486
+#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
+#: src/prefs_summaries.c:488
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_summaries.c:231
+#: src/prefs_summaries.c:228
 msgid "Specifier"
 msgstr "區分符號"
 
-#: src/prefs_summaries.c:273
+#: src/prefs_summaries.c:270
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_summaries.c:400
+#: src/prefs_summaries.c:398
 msgid "Display message count next to folder name"
 msgstr "下一個資料夾名稱所顯示的郵件數量"
 
-#: src/prefs_summaries.c:410
+#: src/prefs_summaries.c:408
 msgid "Unread messages"
 msgstr "未讀郵件"
 
-#: src/prefs_summaries.c:411
+#: src/prefs_summaries.c:409
 msgid "Unread and Total messages"
 msgstr "未讀以及所有郵件"
 
-#: src/prefs_summaries.c:417
+#: src/prefs_summaries.c:415
 msgid "Open last opened folder at start-up"
 msgstr "啟動時開啟最後一次開啟的資料夾"
 
-#: src/prefs_summaries.c:424
+#: src/prefs_summaries.c:419
+msgid ""
+"Run processing rules before marking all messages in a folder as read or "
+"unread"
+msgstr "將資料夾中所有的郵件標示為已讀或未讀時,需經過確認"
+
+#: src/prefs_summaries.c:426
 msgid "Abbreviate newsgroup names longer than"
 msgstr "新聞群組名稱超過"
 
-#: src/prefs_summaries.c:437
+#: src/prefs_summaries.c:439
 msgid "letters"
 msgstr "字元時縮寫"
 
-#: src/prefs_summaries.c:445
+#: src/prefs_summaries.c:447
 msgid "Message list"
 msgstr "郵件清單"
 
-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:464
 msgid "Lock column headers"
 msgstr "鎖定標頭列"
 
-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:470
 msgid "Displayed in From column"
 msgstr "顯示行數"
 
-#: src/prefs_summaries.c:479
+#: src/prefs_summaries.c:481
 msgid "Name and Address"
 msgstr "新連絡人"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:507
 msgid "Date format help"
 msgstr "日期格式"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:513
 msgid "Set message selection when entering a folder"
 msgstr "設定進入資料夾信件為選擇狀態"
 
-#: src/prefs_summaries.c:520
+#: src/prefs_summaries.c:522
 msgid "Open message when selected"
 msgstr "開啟選擇的郵件"
 
-#: src/prefs_summaries.c:525
+#: src/prefs_summaries.c:527
 msgid "When opening a folder"
 msgstr "當開啟一個資料夾"
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:529
 msgid "When displaying search results"
 msgstr "當顯示搜尋結果時"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:531
 msgid "When selecting next or previous message using shortcuts"
 msgstr "當選擇下一個或上一個郵件時使用捷徑"
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:533
 msgid "When deleting or moving messages"
 msgstr "當刪除或移動郵件"
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:535
 msgid "When using directional keys"
 msgstr "當使用方向鍵時"
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:537
 msgid "Mark message as read"
 msgstr "標示為已讀"
 
-#: src/prefs_summaries.c:538
+#: src/prefs_summaries.c:540
 msgid "when selected, after"
 msgstr "在選擇後過了"
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:559
 msgid "only when opened in a new window, or replied to"
 msgstr "只有當開啟了新視窗或回覆"
 
-#: src/prefs_summaries.c:567
+#: src/prefs_summaries.c:569
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "顯示 \"無未讀或新郵件\" 對話框"
 
-#: src/prefs_summaries.c:577
+#: src/prefs_summaries.c:579
 msgid "Assume 'Yes'"
 msgstr "假設 'Yes'"
 
-#: src/prefs_summaries.c:578
+#: src/prefs_summaries.c:580
 msgid "Assume 'No'"
 msgstr "假設 'No'"
 
-#: src/prefs_summaries.c:584
+#: src/prefs_summaries.c:586
 msgid "Display sender using address book"
 msgstr "以通訊錄顯示寄件者"
 
-#: src/prefs_summaries.c:588
+#: src/prefs_summaries.c:590
 msgid "Thread using subject in addition to standard headers"
 msgstr "除了標準標頭之外,執行緒將使用主旨"
 
-#: src/prefs_summaries.c:592
+#: src/prefs_summaries.c:594
 msgid "Execute immediately when moving or deleting messages"
 msgstr "當移除或刪除郵件時,立即執行"
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:596
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
 msgstr "當取消了選項,則會延後移動、複製和刪除郵件,直到你選擇 '工具/執行'"
 
-#: src/prefs_summaries.c:599
+#: src/prefs_summaries.c:601
 msgid "Confirm when marking all messages as read or unread"
 msgstr "將資料夾中所有的郵件標示為已讀或未讀時,需經過確認"
 
-#: src/prefs_summaries.c:602
+#: src/prefs_summaries.c:604
 msgid "Confirm when changing color labels"
 msgstr "覆寫郵件顏色標籤前需再次確認"
 
-#: src/prefs_summaries.c:606
+#: src/prefs_summaries.c:608
 msgid "Show tooltips"
 msgstr "顯示工具提示"
 
-#: src/prefs_summaries.c:616 src/quote_fmt.c:539
+#: src/prefs_summaries.c:618 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr "預設值"
 
-#: src/prefs_summaries.c:618
+#: src/prefs_summaries.c:620
 msgid "New folders"
 msgstr "新增資料夾"
 
-#: src/prefs_summaries.c:624
+#: src/prefs_summaries.c:626
 msgid "Sort by"
 msgstr "排序"
 
-#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr "數字"
 
-#: src/prefs_summaries.c:635
+#: src/prefs_summaries.c:637
 msgid "Thread date"
 msgstr "根據串列日期"
 
-#: src/prefs_summaries.c:646
+#: src/prefs_summaries.c:648
 msgid "Don't sort"
 msgstr "不排序"
 
-#: src/prefs_summaries.c:661
+#: src/prefs_summaries.c:663
 msgid "Thread view"
 msgstr "串列檢視"
 
-#: src/prefs_summaries.c:664
+#: src/prefs_summaries.c:666
 msgid "Collapse all threads"
 msgstr "關閉所有串列"
 
-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:672
 msgid "Hide read messages"
 msgstr "隱藏讀取郵件"
 
-#: src/prefs_summaries.c:870
+#: src/prefs_summaries.c:877
 msgid "Summaries"
 msgstr "摘要"
 
@@ -17629,148 +17988,148 @@ msgstr "最後一封新的郵件"
 msgid "newest unread email"
 msgstr "最後一封未讀的郵件"
 
-#: src/prefs_summary_open.c:189
+#: src/prefs_summary_open.c:188
 msgid "Message selection when entering a folder"
 msgstr " 當進入資料夾後選取信件"
 
-#: src/prefs_summary_open.c:234
+#: src/prefs_summary_open.c:233
 msgid "Available selections"
 msgstr "可用的選擇"
 
-#: src/prefs_summary_open.c:269
+#: src/prefs_summary_open.c:268
 msgid "Current selections"
 msgstr "目前的動作"
 
-#: src/prefs_template.c:80
+#: src/prefs_template.c:79
 msgid "This name is used as the Menu item"
 msgstr "此名稱已經作為選單項目"
 
-#: src/prefs_template.c:82
+#: src/prefs_template.c:81
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr "從郵件標頭覆寫新郵件帳號,這樣不會改變新郵件的帳號"
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:305
 msgid "Append the new template above to the list"
 msgstr "將新樣版加在清單的上方"
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:314
 msgid "Replace the selected template in list with the template above"
 msgstr "用上方的樣版將清單內所選擇的樣版置換"
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:322
 msgid "Delete the selected template from the list"
 msgstr "從清單中把選擇的板版刪除"
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:338
 msgid "Show information on configuring templates"
 msgstr "顯示所有設定的樣版資訊"
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:362
 msgid "Move the selected template to the top"
 msgstr "將選擇的樣版移至最上方"
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:372
 msgid "Move the selected template up"
 msgstr "將選擇的樣版上移"
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:380
 msgid "Move the selected template down"
 msgstr "將選擇的樣版下移"
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:390
 msgid "Move the selected template to the bottom"
 msgstr "移動已選擇的樣版到底部"
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:406
 msgid "Template configuration"
 msgstr "樣版設定"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:595
 msgid "Templates list not saved"
 msgstr "樣版尚未儲存"
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:596
 msgid "The templates list has been modified. Close anyway?"
 msgstr "樣版清單已變更,確認關閉嗎?"
 
-#: src/prefs_template.c:760
+#: src/prefs_template.c:753
 msgid "The template's name is not set."
 msgstr "樣版名稱尚未設定"
 
-#: src/prefs_template.c:803
+#: src/prefs_template.c:796
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "樣版的\"寄件者\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:809
+#: src/prefs_template.c:802
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "樣版的\"收件者\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:815
+#: src/prefs_template.c:808
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "樣版的\"副本\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:821
+#: src/prefs_template.c:814
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "樣版的\"副本\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:827
+#: src/prefs_template.c:820
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "樣版的\"回覆給\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:833
+#: src/prefs_template.c:826
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "樣版的\"主旨\"欄位無效"
 
-#: src/prefs_template.c:904
+#: src/prefs_template.c:897
 msgid "Delete template"
 msgstr "刪除樣版"
 
-#: src/prefs_template.c:905
+#: src/prefs_template.c:898
 msgid "Do you really want to delete this template?"
 msgstr "確定要刪除這個樣版嗎?"
 
-#: src/prefs_template.c:917
+#: src/prefs_template.c:910
 msgid "Delete all templates"
 msgstr "刪除所有的樣版嗎?"
 
-#: src/prefs_template.c:918
+#: src/prefs_template.c:911
 msgid "Do you really want to delete all the templates?"
 msgstr "確定要刪除所有樣版嗎?"
 
-#: src/prefs_template.c:1234
+#: src/prefs_template.c:1225
 msgid "Current templates"
 msgstr "現有的樣版"
 
-#: src/prefs_template.c:1262
+#: src/prefs_template.c:1253
 msgid "Template"
 msgstr "樣版"
 
-#: src/prefs_themes.c:401 src/prefs_themes.c:841
+#: src/prefs_themes.c:405 src/prefs_themes.c:939
 msgid "Default internal theme"
 msgstr "預設內部主題"
 
-#: src/prefs_themes.c:423
+#: src/prefs_themes.c:427
 msgid "Themes"
 msgstr "佈景主題"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:504
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "移除系統佈景主題 '%s'"
 
-#: src/prefs_themes.c:502
+#: src/prefs_themes.c:506
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "移除佈景主題 '%s'"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:511
 msgid "Are you sure you want to remove this theme?"
 msgstr "你確認要移除這個佈景主題嗎?"
 
-#: src/prefs_themes.c:517
+#: src/prefs_themes.c:521
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17779,24 +18138,24 @@ msgstr ""
 " 檔案 %s 失敗\n"
 "當移除佈景主題時"
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:525
 msgid "Removing theme directory failed."
 msgstr "移除佈景主題路徑失敗"
 
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:528
 msgid "Theme removed successfully"
 msgstr "佈景主題移除成功"
 
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:548
 msgid "Select theme folder"
 msgstr "選擇佈景主題資料夾"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:563
 #, c-format
 msgid "Install theme '%s'"
 msgstr "安裝佈景主題 '%s'"
 
-#: src/prefs_themes.c:562
+#: src/prefs_themes.c:566
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -17804,15 +18163,15 @@ msgstr ""
 "此資料夾似乎不是一個佈景主題資料夾\n"
 "仍然要安裝嗎?"
 
-#: src/prefs_themes.c:572
+#: src/prefs_themes.c:576
 msgid "Do you want to install theme for all users?"
 msgstr "你希望為所有的使用者安裝佈景主題嗎?"
 
-#: src/prefs_themes.c:592
+#: src/prefs_themes.c:596
 msgid "Theme exists"
 msgstr "佈景主題已經存在"
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:597
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17824,25 +18183,25 @@ msgstr ""
 "\n"
 "你希望覆蓋它嗎?"
 
-#: src/prefs_themes.c:600
+#: src/prefs_themes.c:604
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "無法在 %s 內刪除舊佈景主題"
 
-#: src/prefs_themes.c:609
+#: src/prefs_themes.c:613
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "無法建立目的路徑 %s"
 
-#: src/prefs_themes.c:623
+#: src/prefs_themes.c:627
 msgid "Theme installed successfully."
 msgstr "佈景主題已經成功安裝"
 
-#: src/prefs_themes.c:630
+#: src/prefs_themes.c:634
 msgid "Failed installing theme"
 msgstr "佈景主題安裝失敗"
 
-#: src/prefs_themes.c:633
+#: src/prefs_themes.c:637
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17851,74 +18210,82 @@ msgstr ""
 "檔案 %s 失敗\n"
 "當安裝佈景主題時"
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:686
+msgid "View all theme icons"
+msgstr "內鍵的佈景主題有 %d  圖示"
+
+#: src/prefs_themes.c:901
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d 個有效的佈景主題 (%d 個使用者的, %d 個系統的, 1 個內鍵的)"
 
-#: src/prefs_themes.c:844
+#: src/prefs_themes.c:942
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "內鍵的佈景主題有 %d  圖示"
 
-#: src/prefs_themes.c:850
+#: src/prefs_themes.c:948
 msgid "No info file available for this theme"
 msgstr "這個佈景主題沒有有效的資訊檔案"
 
-#: src/prefs_themes.c:868
+#: src/prefs_themes.c:966
 msgid "Error: couldn't get theme status"
 msgstr "錯誤:無法取得佈景主題狀態"
 
-#: src/prefs_themes.c:898
+#: src/prefs_themes.c:996
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d 個檔案 (%d 個圖示), 大小: %s"
 
-#: src/prefs_themes.c:956
+#: src/prefs_themes.c:1055
 msgid "Selector"
 msgstr "選擇器"
 
-#: src/prefs_themes.c:967
+#: src/prefs_themes.c:1066
 msgid "Install new..."
 msgstr "安裝..."
 
-#: src/prefs_themes.c:972
+#: src/prefs_themes.c:1071
 msgid "Get more..."
 msgstr "更多..."
 
-#: src/prefs_themes.c:983
+#: src/prefs_themes.c:1083
 msgid "Information"
 msgstr "資訊"
 
-#: src/prefs_themes.c:998
+#: src/prefs_themes.c:1098
 msgid "Author"
 msgstr "作者:"
 
-#: src/prefs_themes.c:1006
+#: src/prefs_themes.c:1104
 msgid "URL"
 msgstr "URL:"
 
-#: src/prefs_themes.c:1048
+#: src/prefs_themes.c:1142
 msgid "Preview"
 msgstr "預覽"
 
-#: src/prefs_themes.c:1105
+#: src/prefs_themes.c:1205
+msgid "View all"
+msgstr "顯示日誌(_V)"
+
+#: src/prefs_themes.c:1210
 msgid "SVG rendering"
 msgstr "SVG 渲染"
 
-#: src/prefs_themes.c:1112
+#: src/prefs_themes.c:1217
 msgid "Enable alpha channel"
 msgstr "啟用alpha頻道"
 
-#: src/prefs_themes.c:1113
+#: src/prefs_themes.c:1218
 msgid "Force scaling"
 msgstr "強制比例"
 
-#: src/prefs_themes.c:1119
+#: src/prefs_themes.c:1224
 msgid "Pixels per inch (PPI)"
 msgstr "每英吋的點數(PPI)"
 
-#: src/prefs_toolbar.c:186
+#: src/prefs_toolbar.c:187
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
@@ -17926,19 +18293,19 @@ msgstr ""
 "所選的動作已經設置完成\n"
 "請從清單中選擇其它的動作"
 
-#: src/prefs_toolbar.c:187
+#: src/prefs_toolbar.c:188
 msgid "Item has no icon defined."
 msgstr "項目沒有定義圖示"
 
-#: src/prefs_toolbar.c:188
+#: src/prefs_toolbar.c:189
 msgid "Item has no text defined."
 msgstr "項目沒有定義文字"
 
-#: src/prefs_toolbar.c:896
+#: src/prefs_toolbar.c:897
 msgid "Toolbar item"
 msgstr "工具列項目"
 
-#: src/prefs_toolbar.c:912
+#: src/prefs_toolbar.c:914
 msgid "Item type"
 msgstr "項目型式"
 
@@ -17950,51 +18317,47 @@ msgstr "內部功能"
 msgid "User Action"
 msgstr "自行動作"
 
-#: src/prefs_toolbar.c:925 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:283
 msgid "Separator"
 msgstr "間隔器"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:930
 msgid "Event executed on click"
 msgstr "按下時執行事件"
 
-#: src/prefs_toolbar.c:959
+#: src/prefs_toolbar.c:949
 msgid "Toolbar text"
 msgstr "工具列顯示字串"
 
-#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
+#: src/prefs_toolbar.c:962 src/prefs_toolbar.c:1338
 msgid "Icon"
 msgstr "圖示"
 
-#: src/prefs_toolbar.c:1010
-msgid "A_dd"
-msgstr "加入(_d)"
-
-#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
+#: src/prefs_toolbar.c:1216 src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244
 msgid "Toolbars"
 msgstr "工具列"
 
-#: src/prefs_toolbar.c:1231
+#: src/prefs_toolbar.c:1217
 msgid "Main Window"
 msgstr "主視窗"
 
-#: src/prefs_toolbar.c:1245
+#: src/prefs_toolbar.c:1231
 msgid "Message Window"
 msgstr "郵件視窗"
 
-#: src/prefs_toolbar.c:1259
+#: src/prefs_toolbar.c:1245
 msgid "Compose Window"
 msgstr "新郵件視窗"
 
-#: src/prefs_toolbar.c:1374
+#: src/prefs_toolbar.c:1361
 msgid "Icon text"
 msgstr "圖示顯示字串"
 
-#: src/prefs_toolbar.c:1383
+#: src/prefs_toolbar.c:1370
 msgid "Mapped event"
 msgstr "對應事件"
 
-#: src/prefs_toolbar.c:1690
+#: src/prefs_toolbar.c:1677
 msgid "Toolbar item icon"
 msgstr "工具列項目圖示"
 
@@ -18022,230 +18385,230 @@ msgstr "換行字串於"
 msgid "Wrapping"
 msgstr "換行"
 
-#: src/printing.c:431
+#: src/printing.c:435
 msgid "Print preview"
 msgstr "預覽列印"
 
-#: src/printing.c:474
+#: src/printing.c:479
 msgid "First page"
 msgstr "第一頁"
 
-#: src/printing.c:484
+#: src/printing.c:489
 msgid "Last page"
 msgstr "最後一頁"
 
-#: src/printing.c:490
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr "縮放 100%"
 
-#: src/printing.c:492
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr "縮放至滿版"
 
-#: src/printing.c:494
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr "放大"
 
-#: src/printing.c:496
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr "縮小"
 
-#: src/printing.c:676
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 頁"
 
-#: src/privacy.c:255 src/privacy.c:276
+#: src/privacy.c:289 src/privacy.c:293
 msgid "No information available"
 msgstr "無可用訊息"
 
-#: src/privacy.c:490
+#: src/privacy.c:507
 msgid "No recipient keys defined."
 msgstr "接收的金鑰尚未定義"
 
-#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
+#: src/procmime.c:414 src/procmime.c:416 src/procmime.c:417
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64編碼錯誤]\n"
 
-#: src/procmime.c:2758
+#: src/procmime.c:2836
 msgid "Could not decode part"
 msgstr "無法解析部份的訊息"
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:961 src/procmsg.c:964
 msgid "Already trying to send."
 msgstr "已嘗試傳送"
 
-#: src/procmsg.c:1563 src/procmsg.c:1624
+#: src/procmsg.c:1588 src/procmsg.c:1649
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "無法開啟檔案 %s"
 
-#: src/procmsg.c:1634
+#: src/procmsg.c:1659
 msgid "Queued message header is broken."
 msgstr "暫存的郵件標頭已損毀"
 
-#: src/procmsg.c:1654
+#: src/procmsg.c:1679
 msgid "An error happened during SMTP session."
 msgstr "SMTP傳送過程中發生錯誤"
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1693
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "找不到已指定的帳號進行郵件傳送,而且在 SMTP 通信時 發生錯誤"
 
-#: src/procmsg.c:1676
+#: src/procmsg.c:1701
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr "無法偵測傳送的資訊,可能是因為Claws Mail無法產生郵件 "
 
-#: src/procmsg.c:1699
+#: src/procmsg.c:1724
 msgid "Couldn't create temporary file for news sending."
 msgstr "無法為新傳送郵件建立暫存檔案"
 
-#: src/procmsg.c:1712
+#: src/procmsg.c:1737
 msgid "Error when writing temporary file for news sending."
 msgstr "為新傳送郵件建立暫存檔案時發生錯誤"
 
-#: src/procmsg.c:1726
+#: src/procmsg.c:1751
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "當發出郵件至 %s 時,發生錯誤"
 
-#: src/procmsg.c:2286
+#: src/procmsg.c:2311
 msgid "Filtering messages...\n"
 msgstr "過濾郵件...\n"
 
-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:46
 msgid "<span weight=\"bold\">symbols:</span>"
 msgstr "<span weight=\"bold\">符號:</span>"
 
-#: src/quote_fmt.c:48
+#: src/quote_fmt.c:47
 msgid "customized date format (see 'man strftime')"
 msgstr "使用者自訂的日期格式 (參考 'man strftime')"
 
-#: src/quote_fmt.c:51
+#: src/quote_fmt.c:50
 msgid "email address of sender"
 msgstr "寄件者的郵件地址"
 
-#: src/quote_fmt.c:52
+#: src/quote_fmt.c:51
 msgid "full name of sender"
 msgstr "寄件者的全名"
 
-#: src/quote_fmt.c:53
+#: src/quote_fmt.c:52
 msgid "first name of sender"
 msgstr "寄件者的 first name"
 
-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:53
 msgid "last name of sender"
 msgstr "寄件者的 last name"
 
-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:54
 msgid "initials of sender"
 msgstr "寄件者的名字字首"
 
-#: src/quote_fmt.c:62
+#: src/quote_fmt.c:61
 msgid "message body"
 msgstr "郵件內容"
 
-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:62
 msgid "quoted message body"
 msgstr "有引言的郵件"
 
-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:63
 msgid "message body without signature"
 msgstr "郵件內容沒有簽名"
 
-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:64
 msgid "quoted message body without signature"
 msgstr "有引言的郵件沒有簽名"
 
-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:65
 msgid "message tags"
 msgstr "郵件標籤"
 
-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:66
 msgid "current dictionary"
 msgstr "目前的字典"
 
-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:67
 msgid "cursor position"
 msgstr "游標位置"
 
-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:68
 msgid "account property: your name"
 msgstr "帳號屬性:你的名稱"
 
-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:69
 msgid "account property: your email address"
 msgstr "帳號屬性:你的郵件地址"
 
-#: src/quote_fmt.c:71
+#: src/quote_fmt.c:70
 msgid "account property: account name"
 msgstr "帳號屬性:帳號名稱"
 
-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:71
 msgid "account property: organization"
 msgstr "帳號屬性:組織"
 
-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:72
 msgid "account property: signature"
 msgstr "帳號屬性:簽名"
 
-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:73
 msgid "account property: signature path"
 msgstr "帳號屬性:簽名路徑"
 
-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:74
 msgid "account property: default dictionary"
 msgstr "帳號屬性:預設字典"
 
-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:75
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
 msgstr "通訊錄 <span style=\"oblique\">completion</span>: 副本"
 
-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: From"
 msgstr "通訊錄 <span style=\"oblique\">completion</span>: 寄件者"
 
-#: src/quote_fmt.c:78
+#: src/quote_fmt.c:77
 msgid "address book <span style=\"oblique\">completion</span>: To"
 msgstr "通訊錄 <span style=\"oblique\">completion</span>: 收件者"
 
-#: src/quote_fmt.c:80
+#: src/quote_fmt.c:79
 msgid "literal backslash"
 msgstr "反斜線"
 
-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:80
 msgid "literal question mark"
 msgstr "問號"
 
-#: src/quote_fmt.c:82
+#: src/quote_fmt.c:81
 msgid "literal exclamation mark"
 msgstr "驚嘆號"
 
-#: src/quote_fmt.c:83
+#: src/quote_fmt.c:82
 msgid "literal pipe"
 msgstr "管線符號"
 
-#: src/quote_fmt.c:84
+#: src/quote_fmt.c:83
 msgid "literal opening curly brace"
 msgstr "開啟大括號"
 
-#: src/quote_fmt.c:85
+#: src/quote_fmt.c:84
 msgid "literal closing curly brace"
 msgstr "關閉大括號"
 
-#: src/quote_fmt.c:86
+#: src/quote_fmt.c:85
 msgid "tab"
 msgstr "tab"
 
-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:88
 msgid "<span weight=\"bold\">commands:</span>"
 msgstr "<span weight=\"bold\">命令:</span>"
 
-#: src/quote_fmt.c:90
+#: src/quote_fmt.c:89
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
@@ -18255,7 +18618,7 @@ msgstr ""
 "[dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "當中的一個符號 (或等同他們)"
 
-#: src/quote_fmt.c:91
+#: src/quote_fmt.c:90
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
 "of\n"
@@ -18266,7 +18629,7 @@ msgstr ""
 "[dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "當中的一個符號 (或等同他們)"
 
-#: src/quote_fmt.c:92
+#: src/quote_fmt.c:91
 msgid ""
 "insert file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
@@ -18275,7 +18638,7 @@ msgstr ""
 "插入檔案:\n"
 "<span style=\"oblique\">sub_expr</span> 和插入的檔案路徑相等  "
 
-#: src/quote_fmt.c:93
+#: src/quote_fmt.c:92
 msgid ""
 "insert program output:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -18286,7 +18649,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> 和命令列取得得輸出相等,  \n"
 "此輸出來自於"
 
-#: src/quote_fmt.c:94
+#: src/quote_fmt.c:93
 msgid ""
 "insert user input:\n"
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
@@ -18296,7 +18659,7 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> 和被使用者所輸入所覆蓋的文字相等\n"
 " "
 
-#: src/quote_fmt.c:95
+#: src/quote_fmt.c:94
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
@@ -18305,7 +18668,7 @@ msgstr ""
 "附件檔:\n"
 "<span style=\"oblique\">sub_expr</span> 和附件檔案的路徑相等  "
 
-#: src/quote_fmt.c:96
+#: src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -18316,11 +18679,11 @@ msgstr ""
 "<span style=\"oblique\">sub_expr</span> 和命令列取得得輸出相等,  \n"
 "此輸出來自於"
 
-#: src/quote_fmt.c:98
+#: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
 msgstr "<span weight=\"bold\">期限的定義:</span>"
 
-#: src/quote_fmt.c:99
+#: src/quote_fmt.c:98
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
@@ -18328,7 +18691,7 @@ msgstr ""
 "文字可以包含任何上述的符號或是\n"
 "命令"
 
-#: src/quote_fmt.c:100
+#: src/quote_fmt.c:99
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
@@ -18336,7 +18699,7 @@ msgstr ""
 "文字可以包含任何上述的符號(不包含\n"
 "命令)"
 
-#: src/quote_fmt.c:101
+#: src/quote_fmt.c:100
 msgid ""
 "completion from address book only works with the first\n"
 "address of the header, it outputs the full name\n"
@@ -18348,19 +18711,19 @@ msgstr ""
 "人的全名\n"
 " "
 
-#: src/quote_fmt.c:110
+#: src/quote_fmt.c:109
 msgid "Description of symbols"
 msgstr "符號的描述"
 
-#: src/quote_fmt.c:111
+#: src/quote_fmt.c:110
 msgid "The following symbols and commands can be used:"
 msgstr "可以使用以下的符號和命令:"
 
-#: src/quote_fmt.c:174
+#: src/quote_fmt.c:173
 msgid "Use template when composing new messages"
 msgstr "寄新郵件時使用樣版"
 
-#: src/quote_fmt.c:197
+#: src/quote_fmt.c:196
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -18374,33 +18737,33 @@ msgstr "當回覆時使用樣版"
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr "覆寫寄件人標頭。此功能不能改變用來回覆郵件的帳號 "
 
-#: src/quote_fmt.c:331 src/quote_fmt.c:459
+#: src/quote_fmt.c:331 src/quote_fmt.c:460
 msgid "Quotation mark"
 msgstr "引言標示"
 
-#: src/quote_fmt.c:425
+#: src/quote_fmt.c:426
 msgid "Use template when forwarding messages"
 msgstr "轉寄郵件時使用樣版"
 
-#: src/quote_fmt.c:448
+#: src/quote_fmt.c:449
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr "覆寫寄件者標頭。這個動作不會改變使用的轉寄帳號"
 
-#: src/quote_fmt.c:557
+#: src/quote_fmt.c:559
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr "此 \"新郵件\" 樣版的 \"寄件者\" 欄位包含了無效的郵件地地"
 
-#: src/quote_fmt.c:560
+#: src/quote_fmt.c:562
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr "此 \"新郵件\" 樣版的 \"主旨\" 欄位是無效的"
 
-#: src/quote_fmt.c:577
+#: src/quote_fmt.c:579
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr "此 \"回覆\" 樣版的 \"引言標示\" 欄位是無效的"
 
-#: src/quote_fmt.c:597
+#: src/quote_fmt.c:599
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "此 \"轉寄\" 樣版的 \"引言標示\" 欄位是無效的"
 
@@ -18413,88 +18776,88 @@ msgstr "輸入文字以覆蓋 '%s'"
 msgid "Enter variable"
 msgstr "輸入變數"
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用此命令傳送郵件: %s\n"
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "不能執行此命令: %s"
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "當執行此命令時發生錯誤: %s"
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr "在SMTP之前執行POP..."
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr "在SMTP之前POP"
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "帳號'%s':連線到SMTP伺服器: %s:%d..."
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr "郵件傳送成功"
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr "傳送郵件..."
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr "傳送郵件來自..."
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr "傳送 RCPT 到..."
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr "傳送 DATA..."
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr "離開..."
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "傳送郵件 (%d / %d 位元)"
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr "在傳送郵件時發生錯誤"
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -18519,11 +18882,11 @@ msgstr ""
 "你可以使用現有的\n"
 "如果你不確定,選擇確定鍵"
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "郵件的來源"
 
-#: src/sourcewindow.c:161
+#: src/sourcewindow.c:162
 #, c-format
 msgid "%s - Source"
 msgstr "%s - 來源"
@@ -18533,351 +18896,351 @@ msgid "Expiry"
 msgstr "屆滿"
 
 #: src/ssl_manager.c:195
-msgid "Saved SSL/TLS certificates"
+msgid "Saved TLS certificates"
 msgstr "儲存 SSL/TLS 認證"
 
-#: src/ssl_manager.c:445
+#: src/ssl_manager.c:451
 msgid "Delete certificate"
 msgstr "刪除認證"
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:452
 msgid "Do you really want to delete this certificate?"
 msgstr "你確定要刪除這個認證嗎?"
 
-#: src/summary_search.c:290
+#: src/summary_search.c:288
 msgid "Search messages"
 msgstr "搜尋郵件"
 
-#: src/summary_search.c:313
+#: src/summary_search.c:311
 msgid "Match any of the following"
 msgstr "符合下列任何一個"
 
-#: src/summary_search.c:315
+#: src/summary_search.c:313
 msgid "Match all of the following"
 msgstr "符合下列所有的"
 
-#: src/summary_search.c:436
+#: src/summary_search.c:441
 msgid "Body:"
 msgstr "內容:"
 
-#: src/summary_search.c:443
+#: src/summary_search.c:447
 msgid "Condition:"
 msgstr "條件:"
 
-#: src/summary_search.c:477
+#: src/summary_search.c:480
 msgid "Find _all"
 msgstr "尋找全部(_a)"
 
-#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
+#: src/summary_search.c:696 src/summaryview.c:1138 src/summaryview.c:1402
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "在%s內搜尋...\n"
 
-#: src/summary_search.c:787
+#: src/summary_search.c:792
 msgid "Beginning of list reached; continue from end?"
 msgstr "已到達清單的開頭,從結尾繼續嗎?"
 
-#: src/summary_search.c:789
+#: src/summary_search.c:794
 msgid "End of list reached; continue from beginning?"
 msgstr "已到達清單的結尾,從開頭繼續嗎?"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:426
 msgid "Re-edit"
 msgstr "重新編輯(_e)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:439
 msgid "Create _filter rule"
 msgstr "建立過濾規則(_f)"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:452
 msgid "_Set displayed columns"
 msgstr "設定顯示行數(_S)"
 
-#: src/summaryview.c:461
+#: src/summaryview.c:457
 msgid "_Lock column headers"
 msgstr "鎖定標頭列(_L)"
 
-#: src/summaryview.c:598
+#: src/summaryview.c:595
 msgid "Toggle quick search bar"
 msgstr "釘住快速搜尋列"
 
-#: src/summaryview.c:635
+#: src/summaryview.c:632
 msgid "Toggle multiple selection"
 msgstr "釘住多重選擇"
 
-#: src/summaryview.c:1339
+#: src/summaryview.c:1329
 msgid "Process mark"
 msgstr "進行標示"
 
-#: src/summaryview.c:1340
+#: src/summaryview.c:1330
 msgid "Some marks are left. Process them?"
 msgstr "有一些標示已留下,要進行嗎?"
 
-#: src/summaryview.c:1390
+#: src/summaryview.c:1381
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1950 src/summaryview.c:1998
+#: src/summaryview.c:1935 src/summaryview.c:1984
 msgid "No more unread messages"
 msgstr "沒有更多的未讀郵件"
 
-#: src/summaryview.c:1951
+#: src/summaryview.c:1936
 msgid "No unread message found. Search from the end?"
 msgstr "找不到未讀郵件,從結尾開始搜尋嗎?"
 
-#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
-#: src/summaryview.c:2096 src/summaryview.c:2163
+#: src/summaryview.c:1949 src/summaryview.c:1998 src/summaryview.c:2036
+#: src/summaryview.c:2085 src/summaryview.c:2154
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "內部錯誤:無法預期的 prefs_common.next_unread_msg_dialog 數值\n"
 
-#: src/summaryview.c:1975
+#: src/summaryview.c:1961
 msgid "No unread messages."
 msgstr "沒有未讀郵件"
 
-#: src/summaryview.c:1999
+#: src/summaryview.c:1985
 msgid "No unread message found. Go to next folder?"
 msgstr "找不到未讀的郵件,到下一個資料夾嗎?"
 
-#: src/summaryview.c:2035 src/summaryview.c:2083
+#: src/summaryview.c:2022 src/summaryview.c:2071
 msgid "No more new messages"
 msgstr "沒有新郵件"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2023
 msgid "No new message found. Search from the end?"
 msgstr "找不到新郵件,從結尾開始搜尋嗎?"
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2048
 msgid "No new messages."
 msgstr "沒有新郵件"
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2072
 msgid "No new message found. Go to next folder?"
 msgstr "找不到新郵件,到下一個資料夾嗎?"
 
-#: src/summaryview.c:2117 src/summaryview.c:2150
+#: src/summaryview.c:2106 src/summaryview.c:2140
 msgid "No more marked messages"
 msgstr "沒有更多已標示的郵件"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2107
 msgid "No marked message found. Search from the end?"
 msgstr "找不到已標示郵件,從結尾再次搜尋?"
 
-#: src/summaryview.c:2127
+#: src/summaryview.c:2117
 msgid "No marked messages."
 msgstr "沒有已標示的郵件"
 
-#: src/summaryview.c:2151
+#: src/summaryview.c:2141
 msgid "No marked message found. Go to next folder?"
 msgstr "找不到已標示的郵件,到下一次資料夾嗎?"
 
-#: src/summaryview.c:2184 src/summaryview.c:2213
+#: src/summaryview.c:2175 src/summaryview.c:2205
 msgid "No more labeled messages"
 msgstr "沒有已貼標籤的郵件"
 
-#: src/summaryview.c:2185
+#: src/summaryview.c:2176
 msgid "No labeled message found. Search from the end?"
 msgstr "找不到已貼標籤的郵件,到下一次資料夾嗎?"
 
-#: src/summaryview.c:2194 src/summaryview.c:2227
+#: src/summaryview.c:2186 src/summaryview.c:2220
 msgid "No labeled messages."
 msgstr "沒有已貼標籤的郵件"
 
-#: src/summaryview.c:2214
+#: src/summaryview.c:2206
 msgid "No labeled message found. Search from the beginning?"
 msgstr "找不到已貼標籤的郵件,從開頭繼重新搜尋嗎?"
 
-#: src/summaryview.c:2537
+#: src/summaryview.c:2530
 msgid "Attracting messages by subject..."
 msgstr "從主旨取出郵件..."
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2718
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:2726
+#: src/summaryview.c:2722
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:2727 src/summaryview.c:2734
+#: src/summaryview.c:2723 src/summaryview.c:2730
 msgid ", "
 msgstr ",  "
 
-#: src/summaryview.c:2732
+#: src/summaryview.c:2728
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2742
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] "項目已選擇"
 msgstr[1] "項目已選擇"
 
-#: src/summaryview.c:2764 src/summaryview.c:2809
+#: src/summaryview.c:2760 src/summaryview.c:2805
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 新郵件, %d 未讀, %d 全部 (%s)"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2780
 msgid "Message summary"
 msgstr "郵件摘要"
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2781
 msgid "New:"
 msgstr "新郵件:"
 
-#: src/summaryview.c:2786
+#: src/summaryview.c:2782
 msgid "Unread:"
 msgstr "未讀郵件:"
 
-#: src/summaryview.c:2787
+#: src/summaryview.c:2783
 msgid "Total:"
 msgstr "全部郵件:"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2785
 msgid "Marked:"
 msgstr "已標示:"
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2786
 msgid "Replied:"
 msgstr "已回覆:"
 
-#: src/summaryview.c:2791
+#: src/summaryview.c:2787
 msgid "Forwarded:"
 msgstr "已轉寄:"
 
-#: src/summaryview.c:2792
+#: src/summaryview.c:2788
 msgid "Locked:"
 msgstr "已鎖定:"
 
-#: src/summaryview.c:2793
+#: src/summaryview.c:2789
 msgid "Ignored:"
 msgstr "忽略:"
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2790
 msgid "Watched:"
 msgstr "已監看:"
 
-#: src/summaryview.c:2804
+#: src/summaryview.c:2800
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d 已選擇 (%s/%s), %d 未讀"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3088
 msgid "Sorting summary..."
 msgstr "摘要排序..."
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3260
 msgid "Setting summary from message data..."
 msgstr "從郵件資料設定摘要..."
 
-#: src/summaryview.c:3471
+#: src/summaryview.c:3466
 msgid "(No Date)"
 msgstr "(無資料)"
 
-#: src/summaryview.c:3528
+#: src/summaryview.c:3523
 msgid "(No Recipient)"
 msgstr "(無收信者)"
 
-#: src/summaryview.c:3576
+#: src/summaryview.c:3571
 #, c-format
 msgid "From: %s, on %s"
 msgstr "寄件者: %s,  以 %s"
 
-#: src/summaryview.c:3585
+#: src/summaryview.c:3580
 #, c-format
 msgid "To: %s, on %s"
 msgstr "收件者: %s, 以 %s"
 
-#: src/summaryview.c:4484
+#: src/summaryview.c:4465
 msgid "You're not the author of the article."
 msgstr "你不是文章的作者"
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4555
 #, 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:4577
+#: src/summaryview.c:4558
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "刪除郵件"
 msgstr[1] "刪除郵件"
 
-#: src/summaryview.c:4741
+#: src/summaryview.c:4722
 msgid "Destination is same as current folder."
 msgstr "目的資料夾和目前的相同"
 
-#: src/summaryview.c:4796
+#: src/summaryview.c:4777
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "選擇路徑將選定的郵件移至該位置"
 msgstr[1] "選擇路徑將選定的郵件移至該位置"
 
-#: src/summaryview.c:4847
+#: src/summaryview.c:4828
 msgid "Destination to copy is same as current folder."
 msgstr "要複製的目的資料夾和目前的相同"
 
-#: src/summaryview.c:4881
+#: src/summaryview.c:4862
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "選擇路徑,將所有選定複製到該位置"
 msgstr[1] "選擇路徑,將所有選定複製到該位置"
 
-#: src/summaryview.c:5039
+#: src/summaryview.c:5026
 msgid "Append or Overwrite"
 msgstr "擴展或覆寫"
 
-#: src/summaryview.c:5040
+#: src/summaryview.c:5027
 msgid "Append or overwrite existing file?"
 msgstr "擴展或覆寫已存在的檔案?"
 
-#: src/summaryview.c:5041
+#: src/summaryview.c:5028
 msgid "_Append"
 msgstr "擴展(_A)"
 
-#: src/summaryview.c:5041
+#: src/summaryview.c:5028
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
+#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "無法儲存檔案 '%s'"
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5080
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "你想要列印%d封件,一封一封的印,你確定要繼續嗎?"
 
-#: src/summaryview.c:5548
+#: src/summaryview.c:5538
 msgid "Building threads..."
 msgstr "建立串列..."
 
-#: src/summaryview.c:5796
+#: src/summaryview.c:5786
 msgid "Skip these rules"
 msgstr "略過這些規則"
 
-#: src/summaryview.c:5799
+#: src/summaryview.c:5789
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "不管帳號是屬於誰的,全部套用這些規則"
 
-#: src/summaryview.c:5802
+#: src/summaryview.c:5792
 msgid "Apply these rules if they apply to the current account"
 msgstr "如果這些規則已經套用在目前的帳號,就套用吧!"
 
-#: src/summaryview.c:5831
+#: src/summaryview.c:5821
 msgid "Filtering"
 msgstr "過濾"
 
-#: src/summaryview.c:5832
+#: src/summaryview.c:5822
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18885,71 +19248,71 @@ msgstr ""
 "有一些過濾規則屬於一個特定帳號\n"
 "請選擇要使用這些規則做什麼:"
 
-#: src/summaryview.c:5864
+#: src/summaryview.c:5854
 msgid "Filtering..."
 msgstr "過濾..."
 
-#: src/summaryview.c:5947
+#: src/summaryview.c:5937
 msgid "Processing configuration"
 msgstr "處理配置"
 
-#: src/summaryview.c:6095
+#: src/summaryview.c:6087
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "你確定要重置所有已選擇郵件的顏色標籤嗎?"
 
-#: src/summaryview.c:6097
+#: src/summaryview.c:6089
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr "你確定要將顏色標籤套用到所有已選擇的郵件上嗎?"
 
-#: src/summaryview.c:6098
+#: src/summaryview.c:6090
 msgid "Reset color label"
 msgstr "重置顏色標籤"
 
-#: src/summaryview.c:6098
+#: src/summaryview.c:6090
 msgid "Set color label"
 msgstr "設定顏色標籤"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6529
 msgid "Ignored thread"
 msgstr "忽略串列"
 
-#: src/summaryview.c:6543
+#: src/summaryview.c:6531
 msgid "Watched thread"
 msgstr "關注串列"
 
-#: src/summaryview.c:6551
+#: src/summaryview.c:6539
 msgid "Replied but also forwarded - click to see reply"
 msgstr "已回覆但是也轉發了 - 點選以檢視回覆"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6541
 msgid "Replied - click to see reply"
 msgstr "已回覆 - 點選以檢視回覆"
 
-#: src/summaryview.c:6565
+#: src/summaryview.c:6553
 msgid "To be moved"
 msgstr "將被移動"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6555
 msgid "To be copied"
 msgstr "將被複製"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6567
 msgid "Signed, has attachment(s)"
 msgstr "已簽名,有附件"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6571
 msgid "Encrypted, has attachment(s)"
 msgstr "已加密,有附件"
 
-#: src/summaryview.c:6585
+#: src/summaryview.c:6573
 msgid "Encrypted"
 msgstr "已加密"
 
-#: src/summaryview.c:6587
+#: src/summaryview.c:6575
 msgid "Has attachment(s)"
 msgstr "有附件"
 
-#: src/summaryview.c:8299
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18958,45 +19321,45 @@ msgstr ""
 "正規表示式 (regexp) 發生錯誤:\n"
 "%s"
 
-#: src/summaryview.c:8402
+#: src/summaryview.c:8405
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "回到資料夾清單 (你有未讀郵件)"
 
-#: src/summaryview.c:8407
+#: src/summaryview.c:8410
 msgid "Go back to the folder list"
 msgstr "回到資料夾清單"
 
-#: src/textview.c:242
+#: src/textview.c:241
 msgid "_Open in web browser"
 msgstr "在瀏覽器中開啟(_O)"
 
-#: src/textview.c:243
+#: src/textview.c:242
 msgid "Copy this _link"
 msgstr "複製此連結(_l)"
 
-#: src/textview.c:250
+#: src/textview.c:249
 msgid "_Reply to this address"
 msgstr "回覆至此地址(_R)"
 
-#: src/textview.c:251
+#: src/textview.c:250
 msgid "Add to _Address book"
 msgstr "新增至通訊錄(_A)"
 
-#: src/textview.c:252
+#: src/textview.c:251
 msgid "Copy this add_ress"
 msgstr "複製這個地址(_r)"
 
-#: src/textview.c:702
+#: src/textview.c:708
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d 位元)]"
 
-#: src/textview.c:705
+#: src/textview.c:711
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d 位元)]"
 
-#: src/textview.c:875
+#: src/textview.c:881
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19010,67 +19373,67 @@ msgstr ""
 "\n"
 "  使用 "
 
-#: src/textview.c:880
+#: src/textview.c:886
 msgid "'Network Log'"
 msgstr "'網路日誌'"
 
-#: src/textview.c:881
+#: src/textview.c:887
 msgid " in the Tools menu for more information."
 msgstr " 在工具箱中以取得更多資訊"
 
-#: src/textview.c:947
+#: src/textview.c:953
 msgid "  The following can be performed on this part\n"
 msgstr "  以下這些可以在這個部份被執行\n"
 
-#: src/textview.c:949
+#: src/textview.c:955
 msgid "  by right-clicking the icon or list item:"
 msgstr "  在圖示或清單項目上按下右鍵"
 
-#: src/textview.c:953
+#: src/textview.c:959
 msgid "     - To save, select "
 msgstr "     - 儲存,選擇"
 
-#: src/textview.c:954
+#: src/textview.c:960
 msgid "'Save as...'"
 msgstr "'另存新檔...'"
 
-#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
+#: src/textview.c:962 src/textview.c:974 src/textview.c:986 src/textview.c:996
 msgid " (Shortcut key: '"
 msgstr " (快捷鍵: '"
 
-#: src/textview.c:964
+#: src/textview.c:970
 msgid "     - To display as text, select "
 msgstr "     - 以文字模式檢視,選擇 "
 
-#: src/textview.c:965
+#: src/textview.c:971
 msgid "'Display as text'"
 msgstr "'以文字模式檢視'"
 
-#: src/textview.c:976
+#: src/textview.c:982
 msgid "     - To open with an external program, select "
 msgstr "     - 以外部程式開啟,選擇 "
 
-#: src/textview.c:977
+#: src/textview.c:983
 msgid "'Open'"
 msgstr "'開啟'"
 
-#: src/textview.c:985
+#: src/textview.c:991
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (間隔地雙擊或按下中鍵 "
 
-#: src/textview.c:986
+#: src/textview.c:992
 msgid "mouse button)\n"
 msgstr "滑鼠鍵)\n"
 
-#: src/textview.c:988
+#: src/textview.c:994
 msgid "     - Or use "
 msgstr "     - 或是使用 "
 
-#: src/textview.c:989
+#: src/textview.c:995
 msgid "'Open with...'"
 msgstr "以...開啟"
 
-#: src/textview.c:1111
+#: src/textview.c:1118
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19081,432 +19444,468 @@ msgstr ""
 "    %s\n"
 "離開碼 %d\n"
 
-#: src/textview.c:2195
+#: src/textview.c:2229
 msgid "Tags: "
 msgstr "標籤:"
 
-#: src/textview.c:2914
+#: src/textview.c:2714
+msgid "Zoom _In"
+msgstr "放大"
+
+#: src/textview.c:2723
+msgid "Zoom _Out"
+msgstr "縮小"
+
+#: src/textview.c:2732
+msgid "Reset _zoom"
+msgstr "重送自"
+
+#: src/textview.c:3101
+msgid "Copy it anyway?"
+msgstr "確認寄出?"
+
+#: src/textview.c:3101
+msgid "Open it anyway?"
+msgstr "確認寄出?"
+
+#: src/textview.c:3102
+msgid "Co_py URL"
+msgstr "開啟URL(_O)"
+
+#: src/textview.c:3102
+msgid "_Open URL"
+msgstr "開啟URL(_O)"
+
+#: src/textview.c:3108
 msgid "The real URL is different from the displayed URL."
 msgstr "這個真實的URL和顯示的URL不同"
 
-#: src/textview.c:2915
+#: src/textview.c:3109
 msgid "Displayed URL:"
 msgstr "顯示 URL:"
 
-#: src/textview.c:2916
+#: src/textview.c:3110
 msgid "Real URL:"
 msgstr "真實 URL:"
 
-#: src/textview.c:2917
-msgid "Open it anyway?"
-msgstr "確認寄出?"
-
-#: src/textview.c:2918
+#: src/textview.c:3112
 msgid "Phishing attempt warning"
 msgstr "嘗試釣魚的警告"
 
-#: src/textview.c:2919
-msgid "_Open URL"
-msgstr "開啟URL(_O)"
-
-#: src/toolbar.c:224 src/toolbar.c:2294
+#: src/toolbar.c:227 src/toolbar.c:2336
 msgid "Receive Mail from all Accounts"
 msgstr "從所有的帳號接收郵件"
 
-#: src/toolbar.c:225 src/toolbar.c:2299
+#: src/toolbar.c:228 src/toolbar.c:2341
 msgid "Receive Mail from current Account"
 msgstr "從目前的帳號接收郵件"
 
-#: src/toolbar.c:226 src/toolbar.c:2303
+#: src/toolbar.c:229 src/toolbar.c:2345
 msgid "Send Queued Messages"
 msgstr "傳送暫存郵件"
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
+#: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Compose Email"
 msgstr "新郵件"
 
-#: src/toolbar.c:228
+#: src/toolbar.c:231
 msgid "Compose News"
 msgstr "新新聞"
 
-#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
+#: src/toolbar.c:232 src/toolbar.c:2418 src/toolbar.c:2428
 msgid "Reply to Message"
 msgstr "回覆郵件"
 
-#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
+#: src/toolbar.c:233 src/toolbar.c:2435 src/toolbar.c:2445
 msgid "Reply to Sender"
 msgstr "回覆寄件者"
 
-#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
+#: src/toolbar.c:234 src/toolbar.c:2452 src/toolbar.c:2462
 msgid "Reply to All"
 msgstr "回覆全部"
 
-#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
+#: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
 msgid "Reply to Mailing-list"
 msgstr "回覆至郵件清單"
 
-#: src/toolbar.c:233 src/toolbar.c:2315
+#: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
 msgstr "開啟郵件"
 
-#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
+#: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
 msgid "Forward Message"
 msgstr "轉寄"
 
-#: src/toolbar.c:235 src/toolbar.c:2460
+#: src/toolbar.c:238 src/toolbar.c:2502
 msgid "Trash Message"
 msgstr "垃圾郵件"
 
-#: src/toolbar.c:236 src/toolbar.c:2464
+#: src/toolbar.c:239 src/toolbar.c:2506
 msgid "Delete Message"
 msgstr "刪除郵件"
 
-#: src/toolbar.c:237
+#: src/toolbar.c:240
 msgid "Delete duplicate messages"
 msgstr "刪除重覆的郵件"
 
-#: src/toolbar.c:239 src/toolbar.c:2472
+#: src/toolbar.c:242 src/toolbar.c:2514
 msgid "Go to Previous Unread Message"
 msgstr "移動至上一個未讀郵件"
 
-#: src/toolbar.c:240 src/toolbar.c:2476
+#: src/toolbar.c:243 src/toolbar.c:2518
 msgid "Go to Next Unread Message"
 msgstr "移動至下一個未讀郵件"
 
-#: src/toolbar.c:244
+#: src/toolbar.c:247
 msgid "Mark Message"
 msgstr "標示郵件"
 
-#: src/toolbar.c:245
+#: src/toolbar.c:248
 msgid "Unmark Message"
 msgstr "移除郵件標示"
 
-#: src/toolbar.c:246
+#: src/toolbar.c:249
 msgid "Lock Message"
 msgstr "郵件鎖定"
 
-#: src/toolbar.c:247
+#: src/toolbar.c:250
 msgid "Unlock Message"
 msgstr "郵件解鎖"
 
-#: src/toolbar.c:248
+#: src/toolbar.c:251
 msgid "Mark all Messages as read"
 msgstr "所有郵件標示為已讀"
 
-#: src/toolbar.c:249
+#: src/toolbar.c:252
 msgid "Mark all Messages as unread"
 msgstr "所有郵件標示為未讀"
 
-#: src/toolbar.c:250
+#: src/toolbar.c:253
 msgid "Mark Message as read"
 msgstr "郵件標示為已讀"
 
-#: src/toolbar.c:251
+#: src/toolbar.c:254
 msgid "Mark Message as unread"
 msgstr "郵件標示為未讀"
 
-#: src/toolbar.c:253 src/toolbar.c:514
+#: src/toolbar.c:255
+msgid "Run folder processing rules"
+msgstr "執行資料夾規則(_o)"
+
+#: src/toolbar.c:257 src/toolbar.c:525
 msgid "Print"
 msgstr "列印"
 
-#: src/toolbar.c:254
+#: src/toolbar.c:258
 msgid "Learn Spam or Ham"
 msgstr "學習垃圾郵件或非垃圾郵件"
 
-#: src/toolbar.c:255
+#: src/toolbar.c:259
 msgid "Open folder/Go to folder list"
 msgstr "開啟資料夾/前往資料夾清單"
 
-#: src/toolbar.c:258 src/toolbar.c:2482
+#: src/toolbar.c:262 src/toolbar.c:2524
 msgid "Send Message"
 msgstr "傳送郵件"
 
-#: src/toolbar.c:259 src/toolbar.c:2486
+#: src/toolbar.c:263 src/toolbar.c:2528
 msgid "Put into queue folder and send later"
 msgstr "移至暫存郵件夾並稍後傳送"
 
-#: src/toolbar.c:260 src/toolbar.c:2490
+#: src/toolbar.c:264 src/toolbar.c:2532
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/toolbar.c:261 src/toolbar.c:2494
+#: src/toolbar.c:265 src/toolbar.c:2536
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/toolbar.c:262 src/toolbar.c:2498
+#: src/toolbar.c:266 src/toolbar.c:2540
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: src/toolbar.c:263 src/toolbar.c:2502
+#: src/toolbar.c:267 src/toolbar.c:2544
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/toolbar.c:264 src/toolbar.c:2506
+#: src/toolbar.c:268 src/toolbar.c:2548
 msgid "Replace signature"
 msgstr "覆蓋簽名"
 
-#: src/toolbar.c:265 src/toolbar.c:2510
+#: src/toolbar.c:269 src/toolbar.c:2552
 msgid "Edit with external editor"
 msgstr "用外部編輯器進行編輯"
 
-#: src/toolbar.c:266 src/toolbar.c:2514
+#: src/toolbar.c:270 src/toolbar.c:2556
 msgid "Wrap long lines of current paragraph"
 msgstr "將目前段落內的過長內容換行"
 
-#: src/toolbar.c:267 src/toolbar.c:2518
+#: src/toolbar.c:271 src/toolbar.c:2560
 msgid "Wrap all long lines"
 msgstr "所有過長內容換行"
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
+#: src/toolbar.c:274 src/toolbar.c:542 src/toolbar.c:2569
 msgid "Check spelling"
 msgstr "檢查拼字"
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
+#: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2574
 msgid "Sign"
 msgstr "簽核者"
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
+#: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
 msgid "Encrypt"
 msgstr "加密"
 
-#: src/toolbar.c:274
+#: src/toolbar.c:278
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Actions 功能"
 
-#: src/toolbar.c:275 src/toolbar.c:2559
+#: src/toolbar.c:279 src/toolbar.c:2601
 msgid "Cancel receiving"
 msgstr "終止收信"
 
-#: src/toolbar.c:277 src/toolbar.c:2567
+#: src/toolbar.c:281 src/toolbar.c:2609
 msgid "Cancel receiving/sending"
 msgstr "終止收信/寄信"
 
-#: src/toolbar.c:278 src/toolbar.c:2307
+#: src/toolbar.c:282 src/toolbar.c:2349
 msgid "Close window"
 msgstr "關閉視窗"
 
-#: src/toolbar.c:280
+#: src/toolbar.c:284
 msgid "Claws Mail Plugins"
 msgstr "Claws Mail 支援的外掛程式"
 
-#: src/toolbar.c:445 src/toolbar.c:496
+#: src/toolbar.c:450 src/toolbar.c:506
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "回收桶"
 
-#: src/toolbar.c:485
+#: src/toolbar.c:495
 msgid "Get Mail"
 msgstr "收信"
 
-#: src/toolbar.c:486
+#: src/toolbar.c:496
 msgid "Get"
 msgstr "擷取"
 
-#: src/toolbar.c:488 src/toolbar.c:489
+#: src/toolbar.c:498 src/toolbar.c:499
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr "新郵件"
 
-#: src/toolbar.c:491
+#: src/toolbar.c:501
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr "寄件者"
 
-#: src/toolbar.c:492
+#: src/toolbar.c:502
 msgid "All"
 msgstr "回覆所有"
 
-#: src/toolbar.c:493
+#: src/toolbar.c:503
 msgid "List"
 msgstr "清單"
 
-#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
+#: src/toolbar.c:508 src/toolbar.c:2402 src/toolbar.c:2411
 msgid "Delete duplicates"
 msgstr "刪除重覆的郵件"
 
-#: src/toolbar.c:500
+#: src/toolbar.c:510
 msgid "Prev"
 msgstr "上一封"
 
-#: src/toolbar.c:501
+#: src/toolbar.c:511
 msgid "Next"
 msgstr "下一封"
 
-#: src/toolbar.c:509
+#: src/toolbar.c:519
 msgid "All read"
 msgstr "所有為已讀"
 
-#: src/toolbar.c:510
+#: src/toolbar.c:520
 msgid "All unread"
 msgstr "所有為未讀"
 
-#: src/toolbar.c:511
+#: src/toolbar.c:521
 msgid "Read"
 msgstr "讀取"
 
-#: src/toolbar.c:516
+#: src/toolbar.c:523
+msgid "Run proc. rules"
+msgstr "立即執行規則(u)"
+
+#: src/toolbar.c:527
 msgid "Folders"
 msgstr "資料夾"
 
-#: src/toolbar.c:521
+#: src/toolbar.c:532
 msgid "Draft"
 msgstr "草稿"
 
-#: src/toolbar.c:524
+#: src/toolbar.c:535
 msgid "Insert sig."
 msgstr "插入簽名"
 
-#: src/toolbar.c:525
+#: src/toolbar.c:536
 msgid "Replace sig."
 msgstr "置換簽名"
 
-#: src/toolbar.c:526
+#: src/toolbar.c:537
 msgid "Edit"
 msgstr "編輯"
 
-#: src/toolbar.c:527
+#: src/toolbar.c:538
 msgid "Wrap para."
 msgstr "段落換行"
 
-#: src/toolbar.c:528
+#: src/toolbar.c:539
 msgid "Wrap all"
 msgstr "全部換行"
 
-#: src/toolbar.c:536 src/toolbar.c:537
+#: src/toolbar.c:547 src/toolbar.c:548
 msgid "Stop"
 msgstr "停止"
 
-#: src/toolbar.c:538
+#: src/toolbar.c:549
 msgid "Stop all"
 msgstr "全部停止"
 
-#: src/toolbar.c:951
+#: src/toolbar.c:968
 msgid "Compose News message"
 msgstr "開新郵件"
 
-#: src/toolbar.c:990
+#: src/toolbar.c:1007
 msgid "Learn spam"
 msgstr "學習垃圾郵件"
 
-#: src/toolbar.c:999
+#: src/toolbar.c:1016
 msgid "Ham"
 msgstr "非垃圾郵件"
 
-#: src/toolbar.c:1001
+#: src/toolbar.c:1018
 msgid "Learn ham"
 msgstr "學習非垃圾郵件"
 
-#: src/toolbar.c:1916
+#: src/toolbar.c:1956
 msgid "Message will be signed"
 msgstr "郵件將簽核"
 
-#: src/toolbar.c:1918
+#: src/toolbar.c:1958
 msgid "Message will not be signed"
 msgstr "郵件將不被簽核"
 
-#: src/toolbar.c:1937
+#: src/toolbar.c:1977
 msgid "Message will be encrypted"
 msgstr "郵件將加密"
 
-#: src/toolbar.c:1939
+#: src/toolbar.c:1979
 msgid "Message will not be encrypted"
 msgstr "郵件將不加密"
 
-#: src/toolbar.c:2289
+#: src/toolbar.c:2331
 msgid "Go to folder list"
 msgstr "前往資料夾清單"
 
-#: src/toolbar.c:2295
+#: src/toolbar.c:2337
 msgid "Receive Mail from selected Account"
 msgstr "從選擇的帳號收信"
 
-#: src/toolbar.c:2311
+#: src/toolbar.c:2353
 msgid "Open preferences"
 msgstr "開啟選項"
 
-#: src/toolbar.c:2322
+#: src/toolbar.c:2364
 msgid "Compose with selected Account"
 msgstr "從選擇的帳號開新郵件"
 
-#: src/toolbar.c:2343
+#: src/toolbar.c:2385
 msgid "Learn as..."
 msgstr "學習自..."
 
-#: src/toolbar.c:2353
+#: src/toolbar.c:2395
 msgid "Learn as _Spam"
 msgstr "從垃圾郵件學習"
 
-#: src/toolbar.c:2354
+#: src/toolbar.c:2396
 msgid "Learn as _Ham"
 msgstr "從非垃圾郵件學習"
 
-#: src/toolbar.c:2361
+#: src/toolbar.c:2403
 msgid "Delete duplicates options"
 msgstr "刪除重覆的選項"
 
-#: src/toolbar.c:2365
+#: src/toolbar.c:2407
 msgid "Delete duplicates in selected folder"
 msgstr "在選擇的資料夾內刪除重複的郵件"
 
-#: src/toolbar.c:2366
+#: src/toolbar.c:2408
 msgid "Delete duplicates in all folders"
 msgstr "在所有的資料夾內刪除重複的郵件"
 
-#: src/toolbar.c:2377
+#: src/toolbar.c:2419
 msgid "Reply to Message options"
 msgstr "「回覆的郵件的選項"
 
-#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
+#: src/toolbar.c:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "_Reply with quote"
 msgstr "回覆包含引言"
 
-#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
+#: src/toolbar.c:2424 src/toolbar.c:2441 src/toolbar.c:2458 src/toolbar.c:2475
 msgid "Reply without _quote"
 msgstr "回覆不包含引言"
 
-#: src/toolbar.c:2394
+#: src/toolbar.c:2436
 msgid "Reply to Sender options"
 msgstr "回覆至寄件者的選項"
 
-#: src/toolbar.c:2411
+#: src/toolbar.c:2453
 msgid "Reply to All options"
 msgstr "回覆至所有的選項"
 
-#: src/toolbar.c:2428
+#: src/toolbar.c:2470
 msgid "Reply to Mailing-list options"
 msgstr "回覆至郵件清單的選項"
 
-#: src/toolbar.c:2445
+#: src/toolbar.c:2487
 msgid "Forward Message options"
 msgstr "轉寄郵件的選項"
 
-#: src/uri_opener.c:87
+#: src/uri_opener.c:70
+msgid "C_opy URL"
+msgstr "複製連結"
+
+#: src/uri_opener.c:101
 msgid "There are no URLs in this email."
 msgstr "郵件中找不到 URLs"
 
-#: src/uri_opener.c:115
-msgid "Available URLs:"
-msgstr "有效的 URLs:"
+#: src/uri_opener.c:129
+msgid "Included URLs:"
+msgstr "已包含 URLs"
 
-#: src/uri_opener.c:189
+#: src/uri_opener.c:209
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "開啟 URLs:"
 
-#: src/uri_opener.c:217
-msgid "Please select the URL to open."
-msgstr "請選擇一個要開啟的 URL"
-
 #: src/uri_opener.c:225
+msgid "Open in browser"
+msgstr "在瀏覽器中開啟"
+
+#: src/uri_opener.c:237
+msgid "Any phishing URLs are shown in red, followed by the actual URL."
+msgstr "任何網路釣魚的URLs都會以紅色顯示真實的URL"
+
+#: src/uri_opener.c:245
 msgid "Select All"
 msgstr "全選"
 
-#: src/wizard.c:523
+#: src/wizard.c:522
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "歡迎光臨 Claws Mail"
 
-#: src/wizard.c:546
+#: src/wizard.c:545
 #, c-format
 msgid ""
 "\n"
@@ -19594,121 +19993,125 @@ msgstr ""
 "<%s>.\n"
 "\n"
 
-#: src/wizard.c:621
+#: src/wizard.c:620
 msgid "Please enter the mailbox name."
 msgstr "請輸入郵件箱名稱"
 
-#: src/wizard.c:649
+#: src/wizard.c:648
 msgid "Please enter your name and email address."
 msgstr "請輸入你的名字和郵件地址"
 
-#: src/wizard.c:660
+#: src/wizard.c:659
 msgid "Please enter your receiving server and username."
 msgstr "請輸入你的接收伺服器和使用者名稱"
 
-#: src/wizard.c:670
+#: src/wizard.c:669
 msgid "Please enter your username."
 msgstr "請輸入你的使用者名稱"
 
-#: src/wizard.c:680
+#: src/wizard.c:679
 msgid "Please enter your SMTP server."
 msgstr "請輸入你的 SMTP 伺服器"
 
-#: src/wizard.c:691
+#: src/wizard.c:690
 msgid "Please enter your SMTP username."
 msgstr "請輸入你的 SMTP 使用者名稱"
 
-#: src/wizard.c:976
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr "你的姓名:"
 
-#: src/wizard.c:987
+#: src/wizard.c:981
 msgid "Your email address:"
 msgstr "你的郵件地址:"
 
-#: src/wizard.c:998
+#: src/wizard.c:994
 msgid "Your organization:"
 msgstr "你的組識:"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1029
 msgid "Mailbox name:"
 msgstr "郵件箱"
 
-#: src/wizard.c:1040
+#: src/wizard.c:1036
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr "你也可以指定一個絕對路徑,例如: \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1111
+#: src/wizard.c:1106
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "你可以藉由在最後加上通訊埠來指定: \"mail.example.com:25\""
 
-#: src/wizard.c:1114
+#: src/wizard.c:1109
 msgid "SMTP server address:"
 msgstr "SMTP 伺服器地址:"
 
-#: src/wizard.c:1129
+#: src/wizard.c:1124
 msgid "(empty to use the same as receive)"
 msgstr "(留下空白代表使用和接收伺服器使用一樣的設定)"
 
-#: src/wizard.c:1143
+#: src/wizard.c:1139
 msgid "SMTP username:"
 msgstr "SMTP 使用者名稱:"
 
-#: src/wizard.c:1154
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "SMTP 密碼:"
 
-#: src/wizard.c:1167
-msgid "Use SSL/TLS to connect to SMTP server"
+#: src/wizard.c:1169
+msgid "Use TLS to connect to SMTP server"
 msgstr "使用 SSL/TLS 和 SMTP 伺服器建立連線"
 
-#: src/wizard.c:1178 src/wizard.c:1598
+#: src/wizard.c:1180 src/wizard.c:1623
 msgid "Use STARTTLS command to start encryption"
 msgstr "使用 STARTTLS 命令進行加密"
 
-#: src/wizard.c:1190 src/wizard.c:1610
-msgid "Client SSL/TLS certificate (optional)"
+#: src/wizard.c:1192 src/wizard.c:1636
+msgid "Client TLS certificate (optional)"
 msgstr "客戶端的 SSL/TLS 認證 (選項)"
 
-#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
+#: src/wizard.c:1201 src/wizard.c:1646
+msgid "File:"
+msgstr "檔案"
+
+#: src/wizard.c:1274 src/wizard.c:1306 src/wizard.c:1560
 msgid "Server address:"
 msgstr "伺服器地址:"
 
-#: src/wizard.c:1322
+#: src/wizard.c:1338
 msgid "Local mailbox:"
 msgstr "本地郵件夾:"
 
-#: src/wizard.c:1491
+#: src/wizard.c:1506
 msgid "Server type:"
 msgstr "伺服器型式:"
 
-#: src/wizard.c:1500
+#: src/wizard.c:1515
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1556
+#: src/wizard.c:1573
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "你可以藉由在最後加上通訊埠來指定: \"mail.example.com:110\""
 
-#: src/wizard.c:1587
-msgid "Use SSL/TLS to connect to receiving server"
+#: src/wizard.c:1612
+msgid "Use TLS to connect to receiving server"
 msgstr "使用 SSL/TLS  和接收伺服器建立連線"
 
-#: src/wizard.c:1652
+#: src/wizard.c:1690
 msgid "IMAP server directory:"
 msgstr "IMAP 伺服器路徑"
 
-#: src/wizard.c:1663
+#: src/wizard.c:1701
 msgid "Show only subscribed folders"
 msgstr "只顯示已訂閱資料夾"
 
-#: src/wizard.c:1671
+#: src/wizard.c:1709
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19716,15 +20119,15 @@ msgstr ""
 "警告:這個版本的 Clasw Mail\n"
 "已被編譯為不支援 IMAP"
 
-#: src/wizard.c:1789
+#: src/wizard.c:1828
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail 設定精靈"
 
-#: src/wizard.c:1822
+#: src/wizard.c:1862
 msgid "Welcome to Claws Mail"
 msgstr "歡迎來到 Clasw Mail"
 
-#: src/wizard.c:1829
+#: src/wizard.c:1869
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19737,31 +20140,31 @@ msgstr ""
 "我們將會從定義一些基本的資訊開始,關於你和你常用的郵件選項。如此你就可以在少"
 "於5分鐘的時間內,開始使用 Claws Mail  "
 
-#: src/wizard.c:1842
+#: src/wizard.c:1882
 msgid "About You"
 msgstr "關於你"
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: src/wizard.c:1889 src/wizard.c:1903 src/wizard.c:1917 src/wizard.c:1932
 msgid "Bold fields must be completed"
 msgstr "粗體欄位需要被完成"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1896
 msgid "Receiving mail"
 msgstr "接收郵件"
 
-#: src/wizard.c:1872
+#: src/wizard.c:1910
 msgid "Sending mail"
 msgstr "傳送郵件"
 
-#: src/wizard.c:1888
+#: src/wizard.c:1925
 msgid "Saving mail on disk"
 msgstr "儲存郵件在磁碟上"
 
-#: src/wizard.c:1904
+#: src/wizard.c:1940
 msgid "Configuration finished"
 msgstr "配置完成"
 
-#: src/wizard.c:1911
+#: src/wizard.c:1947
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -19769,5 +20172,155 @@ 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