[Commits] [SCM] claws branch, gtk2, updated. 3.19.0-85-gf0b3aeaab

paul at claws-mail.org paul at claws-mail.org
Wed Oct 19 15:33:57 UTC 2022


The branch, gtk2 has been updated
       via  f0b3aeaab1ad958ec46f02f38f446998040b4d78 (commit)
      from  2d367c3b19234b36a14cf47d35cdfe5cc898358d (commit)

Summary of changes:
 po/ca.po    | 2074 ++++++++++---------
 po/cs.po    | 2101 ++++++++++---------
 po/nl.po    | 6471 +++++++++++++++++++++++++++++----------------------------
 po/pl.po    | 3270 +++++++++++++++--------------
 po/pt_BR.po |  271 ++-
 po/ru.po    | 1961 +++++++++---------
 po/sk.po    | 2024 +++++++++---------
 po/sv.po    | 6658 +++++++++++++++++++++++++++++++----------------------------
 po/tr.po    | 2092 ++++++++++---------
 9 files changed, 14171 insertions(+), 12751 deletions(-)


- Log -----------------------------------------------------------------
commit f0b3aeaab1ad958ec46f02f38f446998040b4d78
Author: paul <paul at claws-mail.org>
Date:   Wed Oct 19 16:33:51 2022 +0100

    update translations

diff --git a/po/ca.po b/po/ca.po
index a1876c1dc..7ecf583eb 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:43+0100\n"
-"PO-Revision-Date: 2022-03-28 13:41+0200\n"
+"POT-Creation-Date: 2022-10-11 10:32+0100\n"
+"PO-Revision-Date: 2022-10-13 11:08+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"
 
@@ -122,13 +122,13 @@ msgstr "\"Rep missatges\" recupera els missatges des dels comptes seleccionats"
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1851
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:385
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
 #: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
 #: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:1637 src/prefs_account.c:1271 src/prefs_account.c:5015
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -187,10 +187,10 @@ msgstr ""
 #: src/compose.c:9783 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"
 
@@ -395,7 +395,7 @@ msgid "Duplicate email addresses"
 msgstr "Adreces de correu duplicades"
 
 #: src/addrduplicates.c:443 src/addressadd.c:235
-#: 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"
@@ -456,12 +456,12 @@ msgid "_Book"
 msgstr "Lli_breta"
 
 #: src/addressbook.c:401 src/addressbook.c:431 src/addressbook.c:456
-#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:524
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
 #: src/messageview.c:213 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Edita"
 
-#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:527
+#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:525
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "E_ines"
@@ -516,7 +516,7 @@ msgid "C_ut"
 msgstr "T_alla"
 
 #: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
-#: src/compose.c:649 src/mainwindow.c:558 src/messageview.c:229
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Copia"
@@ -575,7 +575,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:411
 #: src/plugins/vcalendar/month-view.c:427 src/prefs_themes.c:917
 #: src/prefs_themes.c:949 src/prefs_themes.c:950
@@ -648,15 +648,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"
@@ -668,7 +668,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"
@@ -733,7 +733,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:332 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Suprimeix la carpeta"
 
@@ -845,7 +845,7 @@ msgid "Person"
 msgstr "Persona"
 
 #: src/addressbook.c:5019 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3470 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -970,18 +970,18 @@ msgstr "Actualització d'adreces"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Actualització fallida. Canvis no escrits al directori."
 
-#: src/alertpanel.c:141 src/compose.c:9857
+#: src/alertpanel.c:141 src/compose.c:9866 src/mimeview.c:1836
 msgid "Notice"
 msgstr "Anunci"
 
 #: src/alertpanel.c:154 src/compose.c:5895 src/compose.c:6444
-#: src/compose.c:12266 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:863 src/plugins/pgpcore/sgpgme.c:1000
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 msgid "Warning"
 msgstr "Avís"
 
-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:731
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Error"
@@ -1102,63 +1102,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"
@@ -1507,7 +1507,7 @@ msgstr "Sup_rimeix"
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: src/compose.c:619 src/mainwindow.c:526 src/messageview.c:215
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "_Missatge"
 
@@ -1519,7 +1519,7 @@ msgstr "_Ortografia"
 msgid "_Options"
 msgstr "_Opcions"
 
-#: src/compose.c:626 src/mainwindow.c:529 src/messageview.c:217
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "A_juda"
 
@@ -1579,7 +1579,7 @@ msgstr "A_justa"
 msgid "_Unwrapped"
 msgstr "Desaj_ustat"
 
-#: src/compose.c:657 src/mainwindow.c:559
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Seleccion_a-ho tot"
@@ -1689,47 +1689,47 @@ msgstr "_Sistema de privacitat"
 msgid "_Priority"
 msgstr "_Prioritat"
 
-#: src/compose.c:703 src/mainwindow.c:621 src/messageview.c:268
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Codificació d_e caràcters"
 
-#: src/compose.c:708 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:273
 msgid "Western European"
 msgstr "Europeu occidental"
 
-#: src/compose.c:709 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Bàltic"
 
-#: src/compose.c:710 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: src/compose.c:711 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Àrab"
 
-#: src/compose.c:712 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:712 src/mainwindow.c:628 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
-#: src/compose.c:713 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:713 src/mainwindow.c:629 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonès"
 
-#: src/compose.c:714 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Xinès"
 
-#: src/compose.c:715 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Coreà"
 
-#: src/compose.c:716 src/mainwindow.c:634 src/messageview.c:281
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Tailandès"
 
-#: src/compose.c:719 src/mainwindow.c:744 src/messageview.c:317
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "Llibret_a d'adreces"
 
@@ -1737,11 +1737,11 @@ msgstr "Llibret_a d'adreces"
 msgid "_Template"
 msgstr "Plan_tilla"
 
-#: src/compose.c:723 src/mainwindow.c:774 src/messageview.c:339
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Accio_ns"
 
-#: src/compose.c:727 src/mainwindow.c:828 src/messageview.c:343
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "Qu_ant a"
 
@@ -1777,12 +1777,12 @@ msgstr "Mostra el gestor de _regles"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:744 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_All"
 msgstr "_Tothom"
 
-#: src/compose.c:745 src/mainwindow.c:676 src/messageview.c:307
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
 #: src/summaryview.c:435
 msgid "_Sender"
 msgstr "_Remitent"
@@ -1807,27 +1807,27 @@ msgstr "Bai_xa"
 msgid "_Lowest"
 msgstr "Més _baixa"
 
-#: src/compose.c:760 src/mainwindow.c:893 src/messageview.c:356
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automàtic"
 
-#: src/compose.c:761 src/mainwindow.c:894 src/messageview.c:357
+#: src/compose.c:761 src/mainwindow.c:892 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:762 src/mainwindow.c:895 src/messageview.c:358
+#: src/compose.c:762 src/mainwindow.c:893 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:766 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:766 src/mainwindow.c:897 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centreeuropeu (ISO-8859-_2)"
 
-#: src/compose.c:769 src/mainwindow.c:902 src/messageview.c:365
+#: src/compose.c:769 src/mainwindow.c:900 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grec (ISO-8859-_7)"
 
-#: src/compose.c:774 src/mainwindow.c:907 src/messageview.c:370
+#: src/compose.c:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turc (ISO-8859-_9)"
 
@@ -1954,7 +1954,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "N'esteu segur?"
 
-#: src/compose.c:3717 src/compose.c:10846 src/compose.c:11746
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "_Insereix"
 
@@ -2015,7 +2015,7 @@ msgstr ""
 "L'únic destinatari és l'adreça per defecte \"%s\". Voleu enviar-lo tanmateix?"
 
 #: src/compose.c:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
-#: src/prefs_account.c:4130 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Envia"
 
@@ -2182,7 +2182,7 @@ msgstr ""
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "L'adjunt %s ja no existeix. Voleu ignorar-lo?"
 
-#: src/compose.c:6445 src/mainwindow.c:666 src/toolbar.c:280 src/toolbar.c:2604
+#: src/compose.c:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Cancel·la l'enviament"
 
@@ -2211,9 +2211,11 @@ msgstr "Useu <tab> per a l'autocompleció des de la llibreta d'adreces"
 msgid "Mime type"
 msgstr "Tipus MIME"
 
-#: src/compose.c:7517 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:473
+#: src/compose.c:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Mida"
 
@@ -2343,11 +2345,11 @@ msgstr ""
 #: src/compose.c:9742
 #, 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"
 
@@ -2356,29 +2358,39 @@ msgstr ""
 msgid "External editor stopped with an error: %s"
 msgstr "L'editor extern s'ha aturat amb un error: %s"
 
-#: src/compose.c:9854
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "Id del procés: %"
+
+#: src/compose.c:9858
+#, c-format
+msgid "process id: %d"
+msgstr "Id. del procés: %d"
+
+#: src/compose.c:9863
+#, 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:10260 src/messageview.c:1095
+#: src/compose.c:10273 src/messageview.c:1095
 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:10463
+#: src/compose.c:10476
 msgid "Could not save draft."
 msgstr "No s'ha pogut desar l'esborrany."
 
-#: src/compose.c:10467
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "No s'ha pogut desar l'esborrany"
 
-#: src/compose.c:10468
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2386,24 +2398,24 @@ msgstr ""
 "No s'ha pogut desar l'esborrany.\n"
 "Voleu cancel·lar la sortida o descartar aquest missatge?"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "_Cancel·la la sortida"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "_Descarta el missatge"
 
-#: src/compose.c:10658 src/compose.c:10672
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Selecciona un fitxer"
 
-#: src/compose.c:10686
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir el ftxer \"%s\"."
 
-#: src/compose.c:10688
+#: src/compose.c:10704
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2412,50 +2424,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:10765
+#: src/compose.c:10781
 msgid "Discard message"
 msgstr "Descarta el missatge"
 
-#: src/compose.c:10766
+#: src/compose.c:10782
 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
 
-#: src/compose.c:10767 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Descarta"
 
-#: src/compose.c:10767 src/compose.c:10772
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "De_sa a la carpeta d'esborranys"
 
-#: src/compose.c:10770 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Desa els canvis"
 
-#: src/compose.c:10771
+#: src/compose.c:10787
 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:10772
+#: src/compose.c:10788
 msgid "_Don't save"
 msgstr "No ho _desis"
 
-#: src/compose.c:10843
+#: src/compose.c:10859
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Voleu aplicar la plantilla \"%s\"?"
 
-#: src/compose.c:10845
+#: src/compose.c:10861
 msgid "Apply template"
 msgstr "Aplica la plantilla"
 
-#: src/compose.c:10846 src/prefs_actions.c:333 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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:1019
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: src/compose.c:10922
+#: src/compose.c:10938
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2464,7 +2476,7 @@ msgstr ""
 "La mida del text enganxat supera el límit (%dKiB) per enganxar.\n"
 "Adjunteu-lo com a fitxer."
 
-#: src/compose.c:11739
+#: src/compose.c:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2479,20 +2491,20 @@ msgstr[1] ""
 "Voleu inserir el contingut dels %d fitxers dins el cos del missatge o "
 "adjuntar-los al correu?"
 
-#: src/compose.c:11745
+#: src/compose.c:11761
 msgid "Insert or attach?"
 msgstr "Inserir o adjuntar?"
 
-#: src/compose.c:11746
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "_Adjunta-ho"
 
-#: src/compose.c:11964
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Error de format de la cita a la línia %d."
 
-#: src/compose.c:12260
+#: src/compose.c:12276
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2710,7 +2722,7 @@ msgid " Check File "
 msgstr " Comprova el fitxer "
 
 #: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2478
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Fitxer"
@@ -2795,13 +2807,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:173 src/editldap.c:441 src/prefs_account.c:3230
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3268
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Nom d'amfitrió"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3237
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2863,7 +2875,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:4221
+#: src/editldap.c:470 src/prefs_account.c:4277
 msgid "TLS"
 msgstr "TLS"
 
@@ -3029,8 +3041,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:739 src/prefs_account.c:1477 src/prefs_account.c:2108
-#: src/prefs_account.c:3042 src/prefs_account.c:3070 src/prefs_account.c:3275
+#: src/editldap.c:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
 #: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Mostra la contrasenya"
@@ -3054,7 +3066,7 @@ msgstr ""
 "El número mínim d'entrades que s'haurien de retornar als resultats de la "
 "cerca."
 
-#: src/editldap.c:793 src/prefs_account.c:4094
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Bàsiques"
 
@@ -3143,11 +3155,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"
 
@@ -3211,9 +3223,9 @@ msgid "Stylesheet"
 msgstr "Full d'estils"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
-#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1184
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
 #: src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
 #: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 msgid "None"
 msgstr "Cap"
@@ -3224,7 +3236,7 @@ msgstr "Cap"
 msgid "Default"
 msgstr "Per defecte"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Complet"
@@ -3453,7 +3465,7 @@ msgstr "Exporta la llibreta d'adreces a un fitxer LDIF"
 msgid "Distinguished Name"
 msgstr "Nom distingit"
 
-#: src/export.c:113 src/summaryview.c:8508
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "Exporta a fitxer de bústia"
 
@@ -3539,11 +3551,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 "
@@ -3552,13 +3572,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"
@@ -3566,7 +3586,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 "
@@ -3575,114 +3595,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"
@@ -3699,11 +3730,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"
@@ -3785,17 +3816,17 @@ msgstr "Hereta les propietats i les regles de processament de la carpeta mare"
 
 #: src/foldersel.c:585 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:302
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:239
-#: src/plugins/vcalendar/vcal_folder.c:2103
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, 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:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:251
-#: src/plugins/vcalendar/vcal_folder.c:2110
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta '%s' ja existeix."
@@ -3827,7 +3858,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:563
+#: src/folderview.c:254 src/mainwindow.c:561
 msgid "_Search folder..."
 msgstr "_Cerca a la carpeta..."
 
@@ -3880,7 +3911,7 @@ msgstr "Marca-ho tot com a llegit"
 
 #: src/folderview.c:870
 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 "
@@ -3897,7 +3928,7 @@ msgstr "Marca'ls tots com a no llegits"
 
 #: src/folderview.c:876
 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 "
@@ -3908,12 +3939,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:1074 src/imap.c:4693
+#: src/folderview.c:1074 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "S'explora la carpeta %s/%s..."
 
-#: src/folderview.c:1077 src/imap.c:4697 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Explorant la carpeta %s..."
@@ -3960,7 +3991,7 @@ msgstr "Obrint la carpeta %s..."
 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 
-#: src/folderview.c:2493 src/mainwindow.c:2901 src/mainwindow.c:2906
+#: src/folderview.c:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Buida la paperera"
 
@@ -3972,7 +4003,7 @@ msgstr "Voleu suprimir tots els missatges de la paperera?"
 msgid "_Empty trash"
 msgstr "Buida la pap_erera"
 
-#: src/folderview.c:2539 src/inc.c:1669 src/toolbar.c:3085
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 
@@ -4087,7 +4118,7 @@ msgstr "Nom de grup"
 msgid "Messages"
 msgstr "Missatges"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Tipus"
 
@@ -4142,7 +4173,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:857
+#: src/gtk/about.c:164 src/gtk/about.c:866
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4231,48 +4262,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "Afegeix suport per a connexions encriptades a servidors.\n"
 
 #: src/gtk/about.c:461
-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:472
 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:482
+#: src/gtk/about.c:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "Afegeix suport per a adreces IPv6.\n"
+
+#: src/gtk/about.c:481
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "Afegeix suport per a llibretes d'adreces de PamlOS.\n"
 
-#: src/gtk/about.c:492
+#: src/gtk/about.c:491
 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:502
+#: src/gtk/about.c:501
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "Afegeix suport per a servidors IMAP.\n"
 
-#: src/gtk/about.c:512
+#: src/gtk/about.c:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "Afegeix suport per a temes SVG.\n"
+
+#: src/gtk/about.c:521
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "Afegeix suport per a la gestió de sessions.\n"
 
-#: src/gtk/about.c:522
+#: src/gtk/about.c:531
 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:532
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "Afegeix suport per a temes SVG.\n"
+#: src/gtk/about.c:541
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "Afegeix suport per a l'autenticació d'OAuth2\n"
 
-#: src/gtk/about.c:564
+#: src/gtk/about.c:573
 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 "
@@ -4283,7 +4317,7 @@ msgstr ""
 "la Free Software Foundation; o bé la versió 3 o (segons la vostra opció) "
 "qualsevol versió posterior."
 
-#: src/gtk/about.c:571
+#: src/gtk/about.c:580
 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 "
@@ -4295,7 +4329,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:590
+#: src/gtk/about.c:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4303,73 +4337,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:723 src/main.c:2749
+#: src/gtk/about.c:732 src/main.c:2749
 msgid "Session statistics\n"
 msgstr "Estadístiques de la sessió\n"
 
-#: src/gtk/about.c:733 src/gtk/about.c:736 src/main.c:2759 src/main.c:2762
+#: src/gtk/about.c:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Iniciat: %s\n"
 
-#: src/gtk/about.c:743 src/main.c:2768
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Trànsit d'entrada\n"
 
-#: src/gtk/about.c:746 src/main.c:2771
+#: src/gtk/about.c:755 src/main.c:2771
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Missatges rebuts: %d\n"
 
-#: src/gtk/about.c:753 src/main.c:2777
+#: src/gtk/about.c:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Trànsit de sortida\n"
 
-#: src/gtk/about.c:756 src/main.c:2780
+#: src/gtk/about.c:765 src/main.c:2780
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Missatges nous / redireccionats: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2784
+#: src/gtk/about.c:770 src/main.c:2784
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Missatges resposts: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2788
+#: src/gtk/about.c:775 src/main.c:2788
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Missatges reenviats: %d\n"
 
-#: src/gtk/about.c:771 src/main.c:2792
+#: src/gtk/about.c:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Total de missatges sortints: %d\n"
 
-#: src/gtk/about.c:798
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "Quant al Claws Mail"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Autors"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Features"
 msgstr "_Característiques"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Llicència"
 
-#: src/gtk/about.c:897
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "Notes de la ve_rsió"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "E_stadístiques"
 
@@ -4845,7 +4879,7 @@ msgstr "Procedència"
 msgid "Precedence:"
 msgstr "Procedència:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1268
 msgid "Organization"
 msgstr "Organizació"
 
@@ -5058,7 +5092,7 @@ msgid "Folder contains marked messages"
 msgstr "La carpeta conté missatges marcats"
 
 #: src/gtk/icon_legend.c:92
-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:93
@@ -5222,15 +5256,15 @@ msgstr "Connectors carregats"
 msgid "Page Index"
 msgstr "Pàgina d'índex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:856
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 msgid "_Hide"
 msgstr "Ama_ga"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4093 src/prefs_account.c:4111 src/prefs_account.c:4129
 #: src/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
-#: src/prefs_account.c:4201 src/prefs_account.c:4220 src/prefs_account.c:4303
-#: src/prefs_account.c:4321 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Compte"
@@ -5685,8 +5719,7 @@ msgstr "(Sense assumpte)"
 msgid "Error:"
 msgstr "Error:"
 
-#: src/image_viewer.c:313 src/mimeview.c:2564
-#: src/plugins/att_remover/att_remover.c:305
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nom del fitxer:"
@@ -5699,195 +5732,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"
@@ -5899,7 +5932,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"
@@ -5911,7 +5944,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"
@@ -5923,7 +5956,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"
@@ -5935,7 +5968,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"
@@ -5947,7 +5980,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"
@@ -5957,36 +5990,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:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:884 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Connexió no segura"
 
-#: src/imap.c:1177 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:885 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"
@@ -6000,108 +6033,108 @@ msgstr ""
 "Voleu continuar connectant a aquest servidor? La comunicació pot no ser "
 "segura."
 
-#: src/imap.c:1183 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:891 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 "
@@ -6110,20 +6143,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"
@@ -6174,7 +6207,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..."
 
@@ -6206,21 +6239,21 @@ msgstr ""
 "i no correus, afegiu \"/\" al nom de la carpeta)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:233
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, 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:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
 #: src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/vcalendar/vcal_folder.c:2094
 msgid "Rename folder"
 msgstr "Canvia el nom de la carpeta"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:257
-#: src/plugins/vcalendar/vcal_folder.c:2116
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6228,32 +6261,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:307 src/plugins/mailmbox/plugin_gtk.c:372
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:330
+#: 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:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:209
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No es pot suprimir la carpeta \"%s\"."
@@ -6280,7 +6314,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:536 src/mainwindow.c:690
+#: src/imap_gtk.c:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Subscriviu-vos-hi"
 
@@ -6519,142 +6553,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:407 src/prefs_summaries.c:647
+#: src/inc.c:727 src/prefs_matcher.c:407 src/prefs_summaries.c:647
 #: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 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:865
+#: src/inc.c:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recuperant missatges nous"
 
-#: src/inc.c:894
+#: src/inc.c:897
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Compte \"%s\": connectant al servidor POP3: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:931
 #, 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:932
+#: src/inc.c:935
 #, 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:1012 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autenticant..."
 
-#: src/inc.c:1014
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Obtenint missatges de %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtenint el nombre de missatges nous (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtenint el nombre de missatges nous (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtenint el nombre de missatges nous (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1035
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtenint la mida dels missatges (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Sortint"
 
-#: src/inc.c:1064
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperant el missatge (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1080
 #, 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:1232
+#: src/inc.c:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "La connexió amb %s:%d ha fallat."
 
-#: src/inc.c:1237
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "S'ha produït un error mentre es processava el correu."
 
-#: src/inc.c:1243
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6663,37 +6697,37 @@ msgstr ""
 "S'ha produït un error mentre es processava el correu:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "No hi ha espai lliure al disc."
 
-#: src/inc.c:1254
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "No es pot escriure el fitxer."
 
-#: src/inc.c:1259
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "Error de sòcol"
 
-#: src/inc.c:1262
+#: src/inc.c:1265
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de sòcol connectant amb %s:%d."
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1270 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:1270
+#: src/inc.c:1273
 #, 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:1275
+#: src/inc.c:1278
 msgid "Mailbox is locked."
 msgstr "La bústia està bloquejada."
 
-#: src/inc.c:1279
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6702,11 +6736,11 @@ msgstr ""
 "La bústia està bloquejada:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autenticació fallida."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6715,7 +6749,7 @@ msgstr ""
 "L'autenticació ha fallat:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1299 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6723,46 +6757,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:1301
+#: src/inc.c:1304
 #, 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:1339
+#: src/inc.c:1342
 msgid "Incorporation cancelled\n"
 msgstr "Incorporació cancel·lada\n"
 
-#: src/inc.c:1634 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
 #: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr "segons"
 
-#: src/inc.c:1644 src/inc.c:1654
+#: src/inc.c:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: src/inc.c:1647
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: src/inc.c:1659
+#: src/inc.c:1662
 #, 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:1665
+#: src/inc.c:1668
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sEsteu treballant sense connexió. Ho anul·lo?"
 
-#: src/inc.c:1672
+#: src/inc.c:1675
 msgid "On_ly once"
 msgstr "Només _una vegada"
 
@@ -7188,834 +7222,834 @@ msgstr "NetworkManager: la xarxa està connectada.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: la xarxa està desconnectada.\n"
 
-#: src/mainwindow.c:523 src/messageview.c:212
+#: src/mainwindow.c:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Fitxer"
 
-#: src/mainwindow.c:525 src/messageview.c:214 src/summaryview.c:448
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "M_ostra"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "_Configuració"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "_Afegeix una bústia"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Canvia l'ordre de les bústies de correu..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "_Importa un fitxer de bústia..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "_Exporta a un fitxer de bústia..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "_Exporta la selecció a un fitxer de bústia..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
 msgstr "Buida _totes les papereres"
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "De_sa el missatge com a..."
 
-#: src/mainwindow.c:547 src/messageview.c:222
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "De_sa'n la secció com a..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Configuració de la pàgina..."
 
-#: src/mainwindow.c:551 src/messageview.c:224
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "Im_primeix..."
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "Sincronitza les carpetes"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "_Surt"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "Selecciona un _fil"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "_Cerca al missatge actual..."
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "_Cerca ràpida"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "Mostra o _amaga"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "_Barra d'eines"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Estableix les _columnes visibles"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "A la _llista de carpetes..."
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "A la llista de _missatges..."
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "_Disposició"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "Cla_ssifica"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "Atrau _per assumpte"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "E_xpandeix tots els fils"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "Replega tots els fi_ls"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Ves a"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Missatge anterior"
 
-#: src/mainwindow.c:588 src/messageview.c:237
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "Missatge següe_nt"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:588 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Missatge sense llegir ante_rior"
 
-#: src/mainwindow.c:591 src/messageview.c:240
+#: src/mainwindow.c:589 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Missatge sense llegir següent"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:591 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Missatge no_u anterior "
 
-#: src/mainwindow.c:594 src/messageview.c:243
+#: src/mainwindow.c:592 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Missatge nou segü_ent"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:594 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Missatge _marcat anterior"
 
-#: src/mainwindow.c:597 src/messageview.c:246
+#: src/mainwindow.c:595 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Missatge m_arcat següent"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:597 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Missatge e_tiquetat anterior"
 
-#: src/mainwindow.c:600 src/messageview.c:249
+#: src/mainwindow.c:598 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Missatge eti_quetat següent"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:600
 msgid "Previously opened message"
 msgstr "Missatge obert anterior"
 
-#: src/mainwindow.c:603 src/messageview.c:252
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Missatge obert següent "
 
-#: src/mainwindow.c:605 src/messageview.c:254
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Missatge pare"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:605 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Directori sense llegir següent"
 
-#: src/mainwindow.c:608 src/messageview.c:257
+#: src/mainwindow.c:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "Car_peta..."
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:608 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Secció següent"
 
-#: src/mainwindow.c:611 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:609 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Secció anterior"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Missatge"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Línia anterior"
 
-#: src/mainwindow.c:616 src/messageview.c:263
+#: src/mainwindow.c:614 src/messageview.c:263
 msgid "Next line"
 msgstr "Línia següent"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:476
+#: src/mainwindow.c:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Pàgina anterior"
 
-#: src/mainwindow.c:618 src/messageview.c:265 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Pàgina següent"
 
-#: src/mainwindow.c:636 src/messageview.c:283
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Descodifica"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:641
 msgid "Open in new _window"
 msgstr "Obre en una finestra _nova"
 
-#: src/mainwindow.c:644 src/messageview.c:290
+#: src/mainwindow.c:642 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Fon_t del missatge"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "Secció del missatge"
 
-#: src/mainwindow.c:647 src/messageview.c:292
+#: src/mainwindow.c:645 src/messageview.c:292
 msgid "View as text"
 msgstr "Mostra-ho com a text"
 
-#: src/mainwindow.c:648 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Obre"
 
-#: src/mainwindow.c:650 src/messageview.c:295
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "Obre amb..."
 
-#: src/mainwindow.c:654 src/messageview.c:298
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Cites"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "Act_ualitza el resum"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "_Rep"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "Obtén del compte a_ctual"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "Obtén de _tots els comptes"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "Cancel·la la re_cepció"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "Envia els mi_ssatges de la cua"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "Escriu u_n missatge de correu"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:669
 msgid "Compose a news message"
 msgstr "Escriu un missatge de notícies"
 
-#: src/mainwindow.c:673 src/messageview.c:304
+#: src/mainwindow.c:671 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "_Respon"
 
-#: src/mainwindow.c:674 src/messageview.c:305 src/summaryview.c:433
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
 msgstr "Respon _a"
 
-#: src/mainwindow.c:677 src/messageview.c:308 src/summaryview.c:436
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
 msgstr "L_lista de correu"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:676
 msgid "Follow-up and reply to"
 msgstr "Reenvia i respon"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:679 src/messageview.c:311 src/summaryview.c:438
 #: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "Reen_via"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
 #: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr "Reen_via com a adjunt"
 
-#: src/mainwindow.c:683 src/messageview.c:313 src/summaryview.c:440
+#: src/mainwindow.c:681 src/messageview.c:313 src/summaryview.c:440
 #: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "Redirigei_x"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
 msgstr "L_lista de correu"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Publicació"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "Dona-te'n de baixa"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "View archive"
 msgstr "Mostra el fitxer"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Contact owner"
 msgstr "Contacta amb el propietari"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "Des_plaça..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:700
 msgid "Move to _trash"
 msgstr "Desplaça a la _paperera"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "S_uprimeix..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
 msgstr "Desplaça el fil a la _paperera"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "S_uprimeix el fil"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Cancel·la una notícia"
 
-#: src/mainwindow.c:709 src/mainwindow.c:710 src/summaryview.c:441
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "_Marca"
 
 # RML To be consistent with previous one.
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "_Desmarca"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "Marca com a lle_git"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "Marca com a no ll_egit"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Marca-ho tot com a llegit a la carpeta"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:716
 msgid "Mark all unread in folder"
 msgstr "Marca-ho tot com a no llegit a la carpeta"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignora el fil"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Unignore thread"
 msgstr "Deixa d'ignorar el fil"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Revisa el fil"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Deixa de revisar el fil"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "Marca com a correu bro_ssa"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:725
 msgid "Mark as _ham"
 msgstr "Marca com a bo"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:177 src/toolbar.c:517
+#: src/mainwindow.c:728 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
 msgstr "Bloqueja"
 
-#: src/mainwindow.c:731 src/prefs_filtering_action.c:178 src/toolbar.c:518
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Desbloqueja"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "Eti_queta de color"
 
-#: src/mainwindow.c:734 src/summaryview.c:443
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "Eti_quetes"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "Re_edita"
 
-#: src/mainwindow.c:740 src/messageview.c:314 src/mimeview.c:1044
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "Comprova'n la signatura"
 
-#: src/mainwindow.c:745 src/messageview.c:318
+#: src/mainwindow.c:743 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Afegeix el remitent a la _llibreta d'adreces"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "C_ollect addresses"
 msgstr "Rec_opila adreces"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "De la carpeta ac_tual..."
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "dels _missatges seleccionats..."
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "_Filtra tots els missatges de la carpeta"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "_Filtra els missatges _seleccionats"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "Executa regles de pr_ocessament"
 
-#: src/mainwindow.c:756 src/messageview.c:321
+#: src/mainwindow.c:754 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "_Crea una regla de filtratge"
 
-#: src/mainwindow.c:757 src/mainwindow.c:764 src/messageview.c:322
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automàticament"
 
-#: src/mainwindow.c:758 src/mainwindow.c:765 src/mainwindow.c:873
+#: src/mainwindow.c:756 src/mainwindow.c:763 src/mainwindow.c:871
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Per _des de"
 
-#: src/mainwindow.c:759 src/mainwindow.c:766 src/mainwindow.c:874
+#: src/mainwindow.c:757 src/mainwindow.c:764 src/mainwindow.c:872
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Per _per a"
 
-#: src/mainwindow.c:760 src/mainwindow.c:767 src/messageview.c:325
+#: src/mainwindow.c:758 src/mainwindow.c:765 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Per a_ssumpte"
 
-#: src/mainwindow.c:761 src/mainwindow.c:768 src/messageview.c:326
+#: src/mainwindow.c:759 src/mainwindow.c:766 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Per remitent"
 
-#: src/mainwindow.c:763 src/messageview.c:328 src/summaryview.c:446
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "Crea una regla de processament"
 
-#: src/mainwindow.c:771 src/messageview.c:336
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Llista _URL..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "Ch_eck for new messages in all folders"
 msgstr "Comprova si hi ha missatg_es nous a totes les carpetes"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Delete du_plicated messages"
 msgstr "Suprimeix els missatges d_uplicats"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "A la carpeta seleccionada"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "A totes les carpetes"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "E_xecuta"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "S_uprimeix"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "TLS cer_tificates"
 msgstr "Cer_tificats de TLS"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Filtratge de re_gistre"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Registre de _xarxa"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "Reg_istre de depuració"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "Obli_da totes les contrasenyes de sessió"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Forget _primary passphrase"
 msgstr "Oblida la contrasenya _principal"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "_Canvia el compte actual"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "_Preferències del compte actual..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "Crea un compte _nou..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "Edita els comptes..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "P_referències..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "Prepr_ocessament..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "Postpro_cessament..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Filtratge..."
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "Plan_tilles..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "_Accions..."
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "Etiquete_s..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "Co_nnectors..."
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "PMF pr_oporcionades en línia pels usuaris"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "Text de _la icona"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Estableix com a client per defecte"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "_Mode sense connexió"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "Barra de _menú"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "Vista de _missatge"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "_Barra d'estat"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Capçaleres de columna"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "Vista pe_r fil"
 
-#: src/mainwindow.c:840 src/prefs_summaries.c:669
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Amaga els fils llegits"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "Ama_ga els missatges llegits"
 
-#: src/mainwindow.c:842 src/prefs_summaries.c:675
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Amaga els missatges suprimits"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "Pantalla c_ompleta"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Mostra totes les ca_pçaleres"
 
-#: src/mainwindow.c:845 src/messageview.c:349
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Reple_ga-ho tot"
 
-#: src/mainwindow.c:846 src/messageview.c:350
+#: src/mainwindow.c:844 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Replega des del nivell _2"
 
-#: src/mainwindow.c:847 src/messageview.c:351
+#: src/mainwindow.c:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Replega des del nivell _3"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Te_xt sota les icones"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Text del costat de les icones"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "Només _icones"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "Només _text"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "E_stàndard"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "_Tres columnes"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "Missat_ge ample"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "_Llista de missatges ampla"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "Pantalla pet_ita"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "Per _número"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "Per m_ida"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "Per _data"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "Per data del fil"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "Per ass_umpte"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "Per etiqueta de _color"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "Per etiqueta"
 
 # RML To be consistent with previous one.
-#: src/mainwindow.c:878
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "Per _marca"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "Per e_stat"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "Per adjun_t"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "Per puntuació"
 
-#: src/mainwindow.c:882
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "Per bloquejat"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "N_o classifiquis"
 
-#: src/mainwindow.c:887 src/prefs_summaries.c:656
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Ascendent"
 
-#: src/mainwindow.c:888 src/prefs_summaries.c:657
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Descendent"
 
-#: src/mainwindow.c:930 src/messageview.c:393
+#: src/mainwindow.c:928 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "Detecta _automàticament"
 
-#: src/mainwindow.c:1308 src/summaryview.c:6511
+#: src/mainwindow.c:1306 src/summaryview.c:6511
 msgid "Modify tags..."
 msgstr "Modifica les etiquetes..."
 
-#: src/mainwindow.c:1966
+#: src/mainwindow.c:1964
 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:1981
+#: src/mainwindow.c:1979
 msgid "You are online. Click the icon to go offline"
 msgstr "Esteu connectat. Cliqueu a la icona per desconnectar-vos"
 
-#: src/mainwindow.c:1984
+#: src/mainwindow.c:1982
 msgid "You are offline. Click the icon to go online"
 msgstr "Esteu desconnectat. Cliqueu a la icona per connectar-vos"
 
-#: src/mainwindow.c:1998
+#: src/mainwindow.c:1996
 msgid "Select account"
 msgstr "Selecciona un compte"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Registre de xarxa"
 
-#: src/mainwindow.c:2029
+#: src/mainwindow.c:2027
 msgid "Filtering/Processing debug log"
 msgstr "Filtratge / processament del registre de depuració"
 
-#: src/mainwindow.c:2048 src/prefs_logging.c:378
+#: src/mainwindow.c:2046 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr ""
 "registre de filtratge habilitat\n"
 "\n"
 
-#: src/mainwindow.c:2050 src/prefs_logging.c:380
+#: src/mainwindow.c:2048 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "registre de filtratge inhabilitat\n"
 
-#: src/mainwindow.c:2484 src/mainwindow.c:2491 src/mainwindow.c:2534
-#: src/mainwindow.c:2567 src/mainwindow.c:2599 src/mainwindow.c:2644
+#: src/mainwindow.c:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1149
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: src/mainwindow.c:2645 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "cap"
 
-#: src/mainwindow.c:2902 src/mainwindow.c:2907
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Voleu suprimir tots els missatges de la paperera?"
 
-#: src/mainwindow.c:2903
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "No en surtis"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Afegeix una bústia"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8029,18 +8063,18 @@ msgstr ""
 "Si s'especifica la ubicació d'una bústia de correu que ja existeix,\n"
 "s'escanejarà automàticament."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: 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:2948 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Bústia de correu"
 
-#: src/mainwindow.c:2953 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8050,54 +8084,54 @@ msgstr ""
 "Pot ser que ja existeixin els fitxers o que no tingueu els permisos per "
 "escriure-hi."
 
-#: src/mainwindow.c:3420
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Cap correu permès"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "La importació de bústia ha fallat."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "L'exportació a bústia ha fallat."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Surt"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Voleu sortir del Claws Mail?"
 
-#: src/mainwindow.c:4262
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Sincronització de carpetes"
 
-#: src/mainwindow.c:4263
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voleu sincronitzar les carpetes ara?"
 
-#: src/mainwindow.c:4264
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "_Sincronitza"
 
-#: src/mainwindow.c:4746
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Suprimint missatges duplicats..."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4754
 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:4762
+#: src/mainwindow.c:4760
 #, 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:4766
+#: src/mainwindow.c:4764
 #, 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"
@@ -8106,62 +8140,62 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han marcat %d missatges duplicats per suprimir a la carpeta seleccionada.\n"
 
-#: src/mainwindow.c:4804
+#: src/mainwindow.c:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Suprimint missatges duplicats a totes les carpetes..."
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4808
 #, 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:4815
+#: src/mainwindow.c:4813
 #, 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:4977 src/messageview.c:2648
+#: src/mainwindow.c:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Seleccioneu una carpeta per anar-hi"
 
-#: src/mainwindow.c:5080 src/summaryview.c:5952
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 msgid "Processing rules to apply before folder rules"
 msgstr "Regles de processament per aplicar abans de les regles de les carpetes"
 
-#: src/mainwindow.c:5088
+#: src/mainwindow.c:5086
 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:5096 src/summaryview.c:5963
+#: src/mainwindow.c:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Configuració del filtratge"
 
-#: src/mainwindow.c:5209
+#: src/mainwindow.c:5207
 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:5300
+#: src/mainwindow.c:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "El Claws Mail s'ha registrat com a client per defecte."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5300
 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:5316 src/setup.c:91
+#: src/mainwindow.c:5314 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Explorant la carpeta %s%c%s..."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5458
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8490,7 +8524,7 @@ msgstr ""
 "  El missatge s'ha suprimit o desplaçat a una altra carpeta."
 
 #: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4424
-#: src/summaryview.c:7314
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
 
@@ -8615,8 +8649,8 @@ msgstr "Comprovant signatura..."
 msgid "Go back to email"
 msgstr "Torna al correu"
 
-#: src/mimeview.c:1712 src/mimeview.c:1804 src/mimeview.c:2046
-#: src/mimeview.c:2082 src/mimeview.c:2194 src/plugins/fancy/fancy_viewer.c:452
+#: src/mimeview.c:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "No s'ha pogut desar la secció del missatge multisecció: %s"
@@ -8626,68 +8660,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:1815
+#: src/mimeview.c:1816
 #, 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:1818
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
 msgstr "Error desant totes les parts del missatge"
 
-#: src/mimeview.c:1819
-msgid "Skip"
-msgstr "Omet"
+#: src/mimeview.c:1820
+msgid "Ignore"
+msgstr "Ignora"
 
-#: src/mimeview.c:1819
-msgid "Skip all"
-msgstr "Omet-ho tot"
+#: src/mimeview.c:1820
+msgid "Ignore all"
+msgstr "Ignora-ho tot"
 
-#: src/mimeview.c:1829
+#: src/mimeview.c:1832
 #, 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:1837
+#: src/mimeview.c:1844
 #, 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:1842
+#: src/mimeview.c:1849
 #, 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:1875 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1886 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:1882 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1893 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "\"%s\" no és un directori."
 
-#: src/mimeview.c:1999 src/plugins/fancy/fancy_viewer.c:708
+#: src/mimeview.c:2011 src/plugins/fancy/fancy_viewer.c:708
 #: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Desa com a"
 
-#: src/mimeview.c:2129 src/mimeview.c:2136
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
 msgstr "Obre amb"
 
-#: src/mimeview.c:2130 src/mimeview.c:2137
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8696,7 +8730,7 @@ msgstr ""
 "Teclegeu l'ordre per obrir el fitxer:\n"
 "(\"%s\" es substituirà pel nom del fitxer)"
 
-#: src/mimeview.c:2232
+#: src/mimeview.c:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8707,11 +8741,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Voleu executar un binari que no és de confiança?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8723,20 +8757,20 @@ msgstr ""
 "\n"
 "Voleu executar aquest fitxer?"
 
-#: src/mimeview.c:2245
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "Executa el binari"
 
-#: src/mimeview.c:2549 src/plugins/att_remover/att_remover.c:303
+#: src/mimeview.c:2561
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/mimeview.c:2550 src/plugins/att_remover/att_remover.c:304
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2789
+#: src/mimeview.c:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 msgid "Size:"
 msgstr "Mida:"
 
-#: src/mimeview.c:2564 src/plugins/vcalendar/vcalendar.c:1243
+#: src/mimeview.c:2576 src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
@@ -8849,80 +8883,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"
@@ -9425,7 +9459,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"
 
@@ -9602,6 +9636,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:305
+msgid "Filename"
+msgstr "Nom del fitxer"
+
 #: src/plugins/att_remover/att_remover.c:336
 msgid "Remove attachments"
 msgstr "Suprimeix els adjunts"
@@ -9912,7 +9950,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:389 src/prefs_account.c:1718
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1748
 msgid "KiB"
 msgstr "KiB"
 
@@ -10445,7 +10483,7 @@ msgstr "Obre-ho al visualitzador (el contingut remot està activat)"
 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:4304
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4360
 #: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Servidor intermediari"
@@ -10498,7 +10536,7 @@ msgstr "El CSS en aquest fitxer s'aplicarà a totes les seccions d'HTML."
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: 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:2510
+#: src/prefs_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Na_vega"
@@ -10547,7 +10585,7 @@ msgstr "%s està malformat o no és un canal d'informació suportat."
 
 #: src/plugins/fancy/fancy_viewer.c:759
 msgid "Search the Web"
-msgstr "Cerca a la xarxa"
+msgstr "Carca a la xarxa"
 
 #: src/plugins/fancy/fancy_viewer.c:770
 msgid "Open in Viewer"
@@ -10826,7 +10864,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "Connector GData: intentant actualitzar l'autorització.\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 msgid "Authentication"
 msgstr "Autenticació"
 
@@ -11049,8 +11087,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: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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hores"
 
@@ -11242,15 +11280,6 @@ msgstr ""
 "Si s'especifica la bústia existent,\n"
 "s'explorarà automàticament."
 
-#: 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 ""
-"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 ""
@@ -11447,7 +11476,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Habilita el Sedàs"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1292
 msgid "Server information"
 msgstr "Informació del servidor"
 
@@ -11499,28 +11528,28 @@ msgstr "Especifiqueu l'autenticació"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1487
+#: src/prefs_account.c:2108
 msgid "User ID"
 msgstr "ID de l'usuari"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1466
-#: src/prefs_account.c:2095 src/prefs_account.c:3038 src/prefs_account.c:3066
-#: src/prefs_account.c:3263 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
 #: src/wizard.c:1635
 msgid "Password"
 msgstr "Contrasenya"
 
-#: 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
-#: 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/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Automàtic"
@@ -11537,20 +11566,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 "
@@ -11567,7 +11596,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"
 
@@ -11834,7 +11863,7 @@ msgid "Show banner"
 msgstr "Mostra la pancarta"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: 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"
@@ -12454,8 +12483,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: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/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuts"
 
@@ -12520,65 +12549,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"
@@ -13063,8 +13092,8 @@ msgstr "Mostra la consola de Python"
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3027
-#: src/prefs_account.c:3055 src/prefs_account.c:3493 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Navega"
@@ -13399,7 +13428,7 @@ msgstr "Obtén els comentaris d'articles de menys de "
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1687 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dies"
 
@@ -13550,7 +13579,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ó)"
 
@@ -13559,7 +13588,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)"
 
@@ -14258,63 +14287,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"
@@ -14323,21 +14352,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"
@@ -14350,7 +14379,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"
@@ -14361,48 +14390,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ó"
 
@@ -14878,95 +14907,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:396 src/prefs_account.c:1631 src/prefs_account.c:2955
+#: src/prefs_account.c:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2970
+#: src/prefs_account.c:416 src/prefs_account.c:1804 src/prefs_account.c:3008
 #: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Notícies (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1501
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Fitxer de bústia local"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Cap (només SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Nom del compte"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Estableix com a predeterminat"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Informació personal"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1256
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1262
 msgid "Mail address"
 msgstr "Adreça de correu"
 
-#: src/prefs_account.c:1298 src/wizard.c:1524
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Configura automàticament"
 
-#: src/prefs_account.c:1300 src/wizard.c:1525
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14974,81 +15003,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:1348
+#: src/prefs_account.c:1375
 msgid "This server requires authentication"
 msgstr "Aquest servidor requereix autenticació."
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Autentica en connectar."
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "Servidor de notícies"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Servidor de recepció"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Bústia local"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1471
 msgid "Use mail command rather than SMTP server"
 msgstr "Usa una ordre de correu enlloc del servidor SMTP."
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1480
 msgid "command to send mails"
 msgstr "ordre per enviar els correus"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Local"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 msgid "Default Inbox"
 msgstr "Bústia d'entrada per defecte"
 
-#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Els missatges sense filtrar es desaran en aquesta carpeta."
 
-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1661
 msgid "Authenticate before POP connection"
 msgstr "Autentiqueu-vos abans de la connexió POP"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
 msgid "Select"
 msgstr "_Selecciona"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1696
 msgid "Remove messages on server when received"
 msgstr "Suprimeix els missatges del servidor quan s'hagin rebut."
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1707
 msgid "Remove after"
 msgstr "Suprimeix després de"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dies i 0 hores: suprimeix immediatament"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1737
 msgid "Receive size limit"
 msgstr "Límit de la mida de recepció"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1740
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -15056,94 +15085,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:1750 src/prefs_account.c:2985
+#: src/prefs_account.c:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Nombre màxim d'articles per descarregar"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "sense límit si s'especifica 0"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Text pla"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(normalment buït)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Mostra només les carpetes subscrites."
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1864
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Mode d'ample de banda eficient (evita recuperar etiquetes remotes)"
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1866
 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:1840 src/prefs_receive.c:164
+#: src/prefs_account.c:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Verificació automàtica"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Usa els paràmetres globals"
 
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Comprova si hi ha missatges nous cada"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1921
 msgid "Filter messages on receiving"
 msgstr "Filtra els missatges durant la recepció."
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1937
 msgid "Allow filtering using plugins on receiving"
 msgstr "Permet filtrar usant connectors durant la recepció."
 
-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1941
 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:1998 src/prefs_customheader.c:210
+#: src/prefs_account.c:2031 src/prefs_customheader.c:210
 #: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Capçalera"
 
-#: src/prefs_account.c:2000
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "Genera Missatge-ID"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2036
 msgid "Send account mail address in Message-ID"
 msgstr "Envia l'adreça de correu dins l'ID del missatge"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2039
 msgid "Add user agent header"
 msgstr "Afegeix un capçalera d'agent d'usuari"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Afegeix capçaleres d'usuari"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticació SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15151,219 +15180,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:2138
+#: src/prefs_account.c:2174
 msgid "Authenticate with POP before sending"
 msgstr "Autentica amb POP abans d'enviar."
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "Esgotament del temps d'espera de l'autenticació de POP"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2270
 msgid "Authorization"
 msgstr "Autorització"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2287
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Seleccioneu el proveïdor de serveis de correu electrònic d'OAuth2"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2327
 msgid "Client ID"
 msgstr "ID del client"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2333
 msgid "Client secret"
 msgstr "Secrets del client"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2365
 msgid "Obtain authorization code"
 msgstr "Obteniu el codi d’autorització"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2369
 msgid "Open default browser with request"
 msgstr "Obre el navegador per defecte amb la sol·licitud"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2375
 msgid "Copy link"
 msgstr "Copia l'enllaç"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2387
 msgid "Authorization code"
 msgstr "Codi d'autorització"
 
-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2395
 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:2365
+#: src/prefs_account.c:2402
 msgid "Complete authorization"
 msgstr "Autorització completa"
 
-#: src/prefs_account.c:2369
+#: src/prefs_account.c:2406
 msgid "Authorize"
 msgstr "Autoritza"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2502
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "Signatura"
 
-#: src/prefs_account.c:2459
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
 msgstr "Insereix la signatura automàticament."
 
-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "Separador de signatura"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Sortida de l'ordre"
 
-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
 msgstr "Estableix les adreces següents automàticament."
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
 msgstr "Diccionaris de correcció ortogràfica"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1176
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Diccionari per defecte"
 
-#: src/prefs_account.c:2597 src/prefs_folder_item.c:1210
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Diccionari alternatiu per defecte"
 
-#: src/prefs_account.c:2683 src/prefs_account.c:4166
+#: src/prefs_account.c:2721 src/prefs_account.c:4222
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
 #: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Escriu"
 
-#: src/prefs_account.c:2698 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
+#: src/prefs_account.c:2736 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Respon"
 
-#: src/prefs_account.c:2713 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2751 src/prefs_filtering_action.c:185
 #: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Reenvia"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Sistema de privacitat per defecte"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1250
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "Sempre missatges signats"
 
-#: src/prefs_account.c:2791 src/prefs_folder_item.c:1282
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "Sempre missatges encriptats"
 
-#: src/prefs_account.c:2793
+#: src/prefs_account.c:2831
 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:2796
+#: src/prefs_account.c:2834
 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:2799
+#: src/prefs_account.c:2837
 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:2801
+#: src/prefs_account.c:2839
 msgid "Save sent encrypted messages as clear text"
 msgstr "Desa els missatges encriptats enviats com a text clar."
 
-#: src/prefs_account.c:2959 src/prefs_account.c:2974 src/prefs_account.c:2988
+#: src/prefs_account.c:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
 msgid "Don't use TLS"
 msgstr "No usis TLS"
 
-#: src/prefs_account.c:2962 src/prefs_account.c:2977 src/prefs_account.c:2997
-#: src/prefs_account.c:3008
+#: src/prefs_account.c:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: src/prefs_account.c:2965 src/prefs_account.c:2980 src/prefs_account.c:3011
+#: src/prefs_account.c:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Usa l'ordre d'STARTTLS per obrir la sessió encriptada"
 
-#: src/prefs_account.c:3001
+#: src/prefs_account.c:3039
 msgid "Send (SMTP)"
 msgstr "Envia (SMTP)"
 
-#: src/prefs_account.c:3005
+#: src/prefs_account.c:3043
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "No usis TLS (però usa STARTTLS si cal)"
 
-#: src/prefs_account.c:3016
+#: src/prefs_account.c:3054
 msgid "Client certificates"
 msgstr "Certificats del client"
 
-#: src/prefs_account.c:3024
+#: src/prefs_account.c:3062
 msgid "Certificate for receiving"
 msgstr "Certificat per a la recepció"
 
-#: src/prefs_account.c:3029 src/prefs_account.c:3031 src/prefs_account.c:3057
-#: src/prefs_account.c:3059
+#: src/prefs_account.c:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Certificat de client com a fitxer PKCS12 o PEM"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Certificate for sending"
 msgstr "Certificat per enviar"
 
-#: src/prefs_account.c:3092
+#: src/prefs_account.c:3130
 msgid "Automatically accept valid TLS certificates"
 msgstr "Accepta automàticament els certificats de TLS vàlids."
 
-#: src/prefs_account.c:3095
+#: src/prefs_account.c:3133
 msgid "Use non-blocking TLS"
 msgstr "Usa TLS sense bloqueig"
 
-#: src/prefs_account.c:3107
+#: src/prefs_account.c:3145
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Desactiveu això si teniu problemes de connexió de TLS."
 
-#: src/prefs_account.c:3199 src/prefs_proxy.c:75
+#: src/prefs_account.c:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Usa un servidor intermediari"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3246
 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:3210
+#: src/prefs_account.c:3248
 msgid "Use global proxy server settings"
 msgstr "Usa els paràmetres globals del servidor intermediari."
 
-#: src/prefs_account.c:3247 src/prefs_proxy.c:117 src/wizard.c:1119
+#: src/prefs_account.c:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Usa autenticació."
 
-#: src/prefs_account.c:3252 src/prefs_proxy.c:125
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: src/prefs_account.c:3286
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Usa el servidor intermediari per a l'enviament."
 
-#: src/prefs_account.c:3288
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15372,27 +15401,27 @@ msgstr ""
 "servidor de sortida configurat, ignorant qualsevol servidor intermediari "
 "configurat."
 
-#: src/prefs_account.c:3400
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "Port SMTP"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "Port POP"
 
-#: src/prefs_account.c:3414
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "Port IMAP"
 
-#: src/prefs_account.c:3421
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "Port NNTP"
 
-#: src/prefs_account.c:3427
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Nom del domini"
 
-#: src/prefs_account.c:3430
+#: src/prefs_account.c:3468
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15400,156 +15429,177 @@ msgstr ""
 "El nom del domini s'usarà al Message-ID generat i en connectar a servidors "
 "SMTP."
 
-#: src/prefs_account.c:3444
+#: src/prefs_account.c:3482
 msgid "Use command to communicate with server"
 msgstr "Usa una ordre per comunicar-se amb el servidor"
 
-#: src/prefs_account.c:3453
+#: src/prefs_account.c:3491
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marca els missatges creuats com a llegits i acoloreix-los:"
 
-#: src/prefs_account.c:3506
+#: src/prefs_account.c:3544
 msgid "Put sent messages in"
 msgstr "Posa els missatges enviats a"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Posa els missatges de la cua a"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Posa els esborranys a"
 
-#: src/prefs_account.c:3512
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Posa els missatges suprimits a"
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "No s'ha especificat el nom del compte."
 
-#: src/prefs_account.c:3573
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "No s'ha especificat l'adreça de correu."
 
-#: src/prefs_account.c:3581
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "No s'ha especificat el servidor SMTP."
 
-#: src/prefs_account.c:3586
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "No s'ha especificat l'usuari."
 
-#: src/prefs_account.c:3591
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "No s'ha especificat el servidor POP."
 
-#: src/prefs_account.c:3611
+#: src/prefs_account.c:3649
 msgid "The default Inbox folder doesn't exist."
 msgstr "La bústia d'entrada per defecte no existeix."
 
-#: src/prefs_account.c:3617
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "No s'ha especificat el servidor IMAP."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "No s'ha especificat el servidor NNTP."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3666
 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:3634
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "no s'ha especificat l'ordre de correu."
 
-#: src/prefs_account.c:3644
+#: src/prefs_account.c:3682
 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:3651
+#: src/prefs_account.c:3689
 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:3686
+#: src/prefs_account.c:3726
 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:3691
+#: src/prefs_account.c:3731
 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:3783
+#: src/prefs_account.c:3826
 msgid "domain is not specified."
 msgstr "no se n'ha especificat el domini."
 
-#: src/prefs_account.c:3788
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "no s'ha seleccionat la capeta d'enviats."
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de cua."
 
-#: src/prefs_account.c:3798
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "no s'ha seleccionat la carpeta d'esborranys."
 
-#: src/prefs_account.c:3803
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "no s'ha seleccionat la carpeta de paperera."
 
-#: src/prefs_account.c:4112
+#: src/prefs_account.c:4166
 msgid "Receive"
 msgstr "Rep"
 
-#: src/prefs_account.c:4148
+#: src/prefs_account.c:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Envia"
+
+#: src/prefs_account.c:4203
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4184 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Plantilles"
 
-#: src/prefs_account.c:4202
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Privacitat"
 
-#: src/prefs_account.c:4322
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/prefs_account.c:4682
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Preferències per a un compte nou"
 
-#: src/prefs_account.c:4684
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferències del compte"
 
-#: src/prefs_account.c:4803 src/wizard.c:1389
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Ha fallat (adreça incorrecta)"
 
-#: src/prefs_account.c:4888
+#: src/prefs_account.c:4946
 msgid "Select signature file"
 msgstr "Selecciona un fitxer de signatura"
 
-#: src/prefs_account.c:4906 src/prefs_account.c:4923 src/wizard.c:1066
+#: src/prefs_account.c:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Selecciona un fitxer de certificat"
 
-#: src/prefs_account.c:5019
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:5336
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (mòdul no carregat)"
 
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Autorització completada"
+
+#: src/prefs_account.c:6278
+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:6281
+msgid "Authorisation NOT completed"
+msgstr "Autorització NO completada"
+
+#: src/prefs_account.c:6282
+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:227
 msgid "Actions configuration"
 msgstr "Configuració d'accions"
@@ -15677,15 +15727,15 @@ msgid "Entry not saved"
 msgstr "Entrada no desada"
 
 #: src/prefs_actions.c:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
-#: src/prefs_filtering.c:1531 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
-msgstr "L'entrada no s'ha desat. Voleu sortir tanmateix?"
+msgstr "L'entrada no s'ha desat. Voleu tancar-ho tanmateix?"
 
 #: src/prefs_actions.c:922 src/prefs_actions.c:927 src/prefs_actions.c:953
-#: src/prefs_actions.c:1324 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1510 src/prefs_filtering.c:1532
-#: src/prefs_matcher.c:2173 src/prefs_template.c:574 src/prefs_template.c:599
-#: src/prefs_template.c:604
+#: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
+#: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Continua editant"
 
@@ -15887,7 +15937,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:208
-msgid "KiB into message body "
+msgid "KiB into message body"
 msgstr "KiB al cos del missatge"
 
 #: src/prefs_compose_writing.c:214
@@ -15945,63 +15995,67 @@ msgid "Header name is not set."
 msgstr "No s'ha establert el nom de la capçalera."
 
 #: src/prefs_customheader.c:514
+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:519
 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:561
+#: src/prefs_customheader.c:566
 msgid "Choose a PNG file"
 msgstr "Trieu un fitxer PNG"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Trieu un fitxer XBM"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Trieu un fitxer de text"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Aquest fitxer no és una imatge"
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 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:589
+#: src/prefs_customheader.c:594
 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:594
+#: src/prefs_customheader.c:599
 msgid "The image isn't in the correct format (PNG)."
 msgstr "La imatge no té el format correcte (PNG)."
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:608
 msgid "The image isn't in the correct format (XBM)."
 msgstr "La imatge no té el format correcte (XBM)."
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:617
 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:618
+#: src/prefs_customheader.c:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "Error de Compface: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Aquest fitxer conté salts de línia."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Suprimeix la capçalera"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 msgid "Do you really want to delete this header?"
 msgstr "Realment voleu suprimir aquesta capçalera?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:880
 msgid "Current custom headers"
 msgstr "Capçaleres d'usuari actuals"
 
@@ -17148,14 +17202,6 @@ msgstr "el tipus és"
 msgid "Program returns"
 msgstr "El programa retorna"
 
-#: src/prefs_matcher.c:2171
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"L'entrada no s'ha desat.\n"
-"Voleu sortir tanmateix?"
-
 #: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Tipus de coincidència: \"Prova\""
@@ -17348,17 +17394,17 @@ msgstr "Permet color al fons del missatge."
 #: src/prefs_msg_colors.c:256
 msgctxt "Tooltip"
 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:269
 msgctxt "Tooltip"
 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:282
 msgctxt "Tooltip"
 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:294
 msgctxt "Tooltip"
@@ -17419,7 +17465,7 @@ msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Trieu un color per a la carpeta de destinació. La carpeta de destinació "
+"Trieu el color per a la carpeta de destinació. La carpeta de destinació "
 "s'usa quan l'opció \"Executa immediatament quan es desplacin o se "
 "suprimeixin missatges\" està desactivada."
 
@@ -17469,17 +17515,17 @@ msgstr "Trieu un color per al text de 3r nivell."
 #: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
-msgstr "Trieu un color per al fons del text de 1r nivell."
+msgstr "Trieu el color per al fons del text de 1r nivell."
 
 #: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
-msgstr "Trieu un color per al fons del text de 2n nivell."
+msgstr "Trieu el color per al fons del text de 2n nivell."
 
 #: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
-msgstr "Trieu un color per al fons del text de 3r nivell."
+msgstr "Trieu el color per al fons del text de 3r nivell."
 
 #: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
@@ -17574,7 +17620,7 @@ msgstr "Habilita les draceres del teclat"
 
 #: src/prefs_other.c:521
 msgid "Enable customisable keyboard shortcuts"
-msgstr "Habilita les dreceres de teclat personalitzables"
+msgstr "Habilita les dreceres de teclat personalitzables."
 
 #: src/prefs_other.c:524
 msgid ""
@@ -17582,10 +17628,10 @@ msgid ""
 "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 es marca, podreu canviar les dreceres del teclat de la majoria dels "
-"elements del menú seleccionant l'element del menú i prement una combinació "
-"de tecles.\n"
-"Desmarqueu aquesta opció si voleu bloquejar totes les dreceres de teclat "
+"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."
 
 #: src/prefs_other.c:531
@@ -17929,8 +17975,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:420 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:420 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Enviant"
 
@@ -19114,88 +19160,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"
@@ -19659,7 +19705,7 @@ msgstr "Encriptat"
 msgid "Has attachment(s)"
 msgstr "Té adjunt(s)"
 
-#: src/summaryview.c:8321
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19668,11 +19714,11 @@ msgstr ""
 "Error de l'expressió regular (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8424
+#: src/summaryview.c:8428
 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:8429
+#: src/summaryview.c:8433
 msgid "Go back to the folder list"
 msgstr "Torna a la llista de carpetes"
 
@@ -20524,3 +20570,105 @@ msgid ""
 msgstr ""
 "El Claws Mail ja està a punt.\n"
 "Feu clic a Desa per començar."
+
+#~ msgid "_New"
+#~ msgstr "_Nou"
+
+#~ msgid "_Down"
+#~ msgstr "A_vall"
+
+#~ msgid "_Up"
+#~ msgstr "Am_unt"
+
+#~ msgid "_Execute"
+#~ msgstr "_Executa"
+
+#~ msgid "_Stop"
+#~ msgstr "Atu_ra"
+
+#~ msgid "_Yes"
+#~ msgstr "_Sí"
+
+#~ msgid "_Add"
+#~ msgstr "_Afegeix"
+
+#~ msgid "_Previous"
+#~ msgstr "An_terior"
+
+#~ msgid "_Next"
+#~ msgstr "Següe_nt"
+
+#, 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"
+
+#~ msgid "_Refresh"
+#~ msgstr "_Refresca"
+
+#~ 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"
+
+#~ msgid "_Apply"
+#~ msgstr "_Aplica"
+
+#, 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 "_Quit"
+#~ msgstr "_Surt"
+
+#~ msgid "Skip"
+#~ msgstr "Omet"
+
+#~ msgid "Skip all"
+#~ msgstr "Omet-ho tot"
+
+#~ msgid "Find and _Replace"
+#~ msgstr "Troba i _reemplaça"
+
+#, 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?"
+
+#~ msgid "_Rename"
+#~ msgstr "_Canvia'n el nom"
+
+#~ msgid "_Top"
+#~ msgstr "A dal_t"
+
+#~ msgid "_Bottom"
+#~ msgstr "A _baix"
+
+#~ msgid ""
+#~ "The entry was not saved.\n"
+#~ "Close anyway?"
+#~ msgstr ""
+#~ "L'entrada no s'ha desat.\n"
+#~ "Voleu sortir tanmateix?"
+
+#~ msgid "Open in browser"
+#~ msgstr "Obre-ho al navegador"
+
+#~ msgid "File:"
+#~ msgstr "Fitxer:"
diff --git a/po/cs.po b/po/cs.po
index 824da9878..cb63b85e2 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:43+0100\n"
-"PO-Revision-Date: 2022-03-28 14:30+0200\n"
+"POT-Creation-Date: 2022-10-11 10:32+0100\n"
+"PO-Revision-Date: 2022-10-11 19:51+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:403 src/account.c:470
 msgid ""
@@ -116,13 +116,13 @@ msgstr ""
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1851
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:385
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
 #: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
 #: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account.c:1637 src/prefs_account.c:1271 src/prefs_account.c:5015
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -181,10 +181,10 @@ msgstr ""
 #: src/compose.c:9783 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"
 
@@ -384,7 +384,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplikovat emailovou adresu(y)"
 
 #: src/addrduplicates.c:443 src/addressadd.c:235
-#: 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"
@@ -445,12 +445,12 @@ msgid "_Book"
 msgstr "_Kniha"
 
 #: src/addressbook.c:401 src/addressbook.c:431 src/addressbook.c:456
-#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:524
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
 #: src/messageview.c:213 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "Ú_pravy"
 
-#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:527
+#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:525
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Nástroje"
@@ -505,7 +505,7 @@ msgid "C_ut"
 msgstr "_Vyjmout"
 
 #: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
-#: src/compose.c:649 src/mainwindow.c:558 src/messageview.c:229
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovat"
@@ -564,7 +564,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:411
 #: src/plugins/vcalendar/month-view.c:427 src/prefs_themes.c:917
 #: src/prefs_themes.c:949 src/prefs_themes.c:950
@@ -721,7 +721,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:332 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Odstranit složku"
 
@@ -833,7 +833,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:5019 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3470 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Složka"
 
@@ -957,18 +957,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:141 src/compose.c:9857
+#: src/alertpanel.c:141 src/compose.c:9866 src/mimeview.c:1836
 msgid "Notice"
 msgstr "Poznámka"
 
 #: src/alertpanel.c:154 src/compose.c:5895 src/compose.c:6444
-#: src/compose.c:12266 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:863 src/plugins/pgpcore/sgpgme.c:1000
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:731
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Chyba"
@@ -1087,63 +1087,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"
@@ -1488,7 +1488,7 @@ msgstr "_Odstranit"
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:619 src/mainwindow.c:526 src/messageview.c:215
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "_Zpráva"
 
@@ -1500,7 +1500,7 @@ msgstr "_Pravopis"
 msgid "_Options"
 msgstr "Nastav_ení"
 
-#: src/compose.c:626 src/mainwindow.c:529 src/messageview.c:217
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "Nápo_věda"
 
@@ -1560,7 +1560,7 @@ msgstr "_Zalomené"
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:657 src/mainwindow.c:559
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vybrat vš_e"
@@ -1670,47 +1670,47 @@ msgstr "Systém _zabezpečení"
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: src/compose.c:703 src/mainwindow.c:621 src/messageview.c:268
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Kódování znaků"
 
-#: src/compose.c:708 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:273
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: src/compose.c:709 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltské"
 
-#: src/compose.c:710 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/compose.c:711 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/compose.c:712 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:712 src/mainwindow.c:628 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: src/compose.c:713 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:713 src/mainwindow.c:629 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/compose.c:714 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/compose.c:715 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/compose.c:716 src/mainwindow.c:634 src/messageview.c:281
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Thajština"
 
-#: src/compose.c:719 src/mainwindow.c:744 src/messageview.c:317
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Kniha adres"
 
@@ -1718,11 +1718,11 @@ msgstr "_Kniha adres"
 msgid "_Template"
 msgstr "Ša_blona"
 
-#: src/compose.c:723 src/mainwindow.c:774 src/messageview.c:339
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Ak_ce"
 
-#: src/compose.c:727 src/mainwindow.c:828 src/messageview.c:343
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "_O programu"
 
@@ -1758,12 +1758,12 @@ msgstr "Zobrazit _pravítko"
 msgid "_Normal"
 msgstr "_Normální"
 
-#: src/compose.c:744 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_All"
 msgstr "_Všem"
 
-#: src/compose.c:745 src/mainwindow.c:676 src/messageview.c:307
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
 #: src/summaryview.c:435
 msgid "_Sender"
 msgstr "_Odesílateli"
@@ -1788,27 +1788,27 @@ msgstr "Ní_zká"
 msgid "_Lowest"
 msgstr "Ne_jnižsí"
 
-#: src/compose.c:760 src/mainwindow.c:893 src/messageview.c:356
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:761 src/mainwindow.c:894 src/messageview.c:357
+#: src/compose.c:761 src/mainwindow.c:892 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bitové ASCII (US-ASC_II)"
 
-#: src/compose.c:762 src/mainwindow.c:895 src/messageview.c:358
+#: src/compose.c:762 src/mainwindow.c:893 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:766 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:766 src/mainwindow.c:897 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:769 src/mainwindow.c:902 src/messageview.c:365
+#: src/compose.c:769 src/mainwindow.c:900 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:774 src/mainwindow.c:907 src/messageview.c:370
+#: src/compose.c:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turečtina (ISO-8859-_9)"
 
@@ -1933,7 +1933,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:3717 src/compose.c:10846 src/compose.c:11746
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "_Vložit"
 
@@ -1993,7 +1993,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:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
-#: src/prefs_account.c:4130 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Odeslat"
 
@@ -2157,7 +2157,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:6445 src/mainwindow.c:666 src/toolbar.c:280 src/toolbar.c:2604
+#: src/compose.c:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Zrušit posílání"
 
@@ -2186,9 +2186,11 @@ msgstr "Použijte <tab> pro automatické dokončení podle knihy adres"
 msgid "Mime type"
 msgstr "MIME typ"
 
-#: src/compose.c:7517 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:473
+#: src/compose.c:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Délka"
 
@@ -2317,11 +2319,11 @@ msgstr "Komunikace pomocí socketu s externím editorem není ve Windows možná
 #: src/compose.c:9742
 #, 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"
 
@@ -2330,29 +2332,39 @@ msgstr ""
 msgid "External editor stopped with an error: %s"
 msgstr "Externí editor ukončen s chybou: %s"
 
-#: src/compose.c:9854
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "id procesu: %"
+
+#: src/compose.c:9858
+#, c-format
+msgid "process id: %d"
+msgstr "id procesu: %d"
+
+#: src/compose.c:9863
+#, 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:10260 src/messageview.c:1095
+#: src/compose.c:10273 src/messageview.c:1095
 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:10463
+#: src/compose.c:10476
 msgid "Could not save draft."
 msgstr "Nelze uložit koncept."
 
-#: src/compose.c:10467
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "Nelze uložit koncept"
 
-#: src/compose.c:10468
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2360,24 +2372,24 @@ msgstr ""
 "Nemohu uložit koncept.\n"
 "Chcete zrušit ukončení nebo zahodit tuto zprávu?"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "_Zrušit ukončení"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "_Zahodit zprávu"
 
-#: src/compose.c:10658 src/compose.c:10672
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Výběr souboru"
 
-#: src/compose.c:10686
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Soubor '%s' nelze číst."
 
-#: src/compose.c:10688
+#: src/compose.c:10704
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2386,50 +2398,50 @@ msgstr ""
 "Soubor '%s' obsahuje neplatné znaky\n"
 "pro nastavené kódování, vložení může obsahovat chyby."
 
-#: src/compose.c:10765
+#: src/compose.c:10781
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:10766
+#: src/compose.c:10782
 msgid "This message has been modified. Discard it?"
 msgstr "Zpráva byla modifikována. Chcete ji zahodit?"
 
-#: src/compose.c:10767 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Zahodit"
 
-#: src/compose.c:10767 src/compose.c:10772
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "Uložit jako _koncept"
 
-#: src/compose.c:10770 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: src/compose.c:10771
+#: src/compose.c:10787
 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:10772
+#: src/compose.c:10788
 msgid "_Don't save"
 msgstr "_Neukládat"
 
-#: src/compose.c:10843
+#: src/compose.c:10859
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použít šablonu '%s'?"
 
-#: src/compose.c:10845
+#: src/compose.c:10861
 msgid "Apply template"
 msgstr "Použít šablonu"
 
-#: src/compose.c:10846 src/prefs_actions.c:333 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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:1019
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: src/compose.c:10922
+#: src/compose.c:10938
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2438,7 +2450,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:11739
+#: src/compose.c:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2456,20 +2468,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:11745
+#: src/compose.c:11761
 msgid "Insert or attach?"
 msgstr "Vložit nebo připojit?"
 
-#: src/compose.c:11746
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "_Přiložit"
 
-#: src/compose.c:11964
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba formátu citace na řádku %d."
 
-#: src/compose.c:12260
+#: src/compose.c:12276
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2686,7 +2698,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2478
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Soubor"
@@ -2769,13 +2781,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:173 src/editldap.c:441 src/prefs_account.c:3230
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3268
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Název počítače"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3237
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2827,15 +2839,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:469
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:4221
+#: src/editldap.c:470 src/prefs_account.c:4277
 msgid "TLS"
 msgstr "TLS"
 
@@ -2963,11 +2975,11 @@ msgstr "Hledat pomocí 'obsahuje'"
 
 #: src/editldap.c:647
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"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\", "
@@ -2998,11 +3010,11 @@ msgstr "Připojovací heslo"
 #: src/editldap.c:736
 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:739 src/prefs_account.c:1477 src/prefs_account.c:2108
-#: src/prefs_account.c:3042 src/prefs_account.c:3070 src/prefs_account.c:3275
+#: src/editldap.c:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
 #: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Zobrazit heslo"
@@ -3024,7 +3036,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:793 src/prefs_account.c:4094
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Server"
 
@@ -3111,11 +3123,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"
 
@@ -3179,9 +3191,9 @@ msgid "Stylesheet"
 msgstr "Šablona stylu"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
-#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1184
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
 #: src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
 #: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 msgid "None"
 msgstr "Žádná"
@@ -3192,7 +3204,7 @@ msgstr "Žádná"
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Úplná"
@@ -3422,7 +3434,7 @@ msgstr "Exportovat knihu adres do LDIF souboru"
 msgid "Distinguished Name"
 msgstr "Rozlišovací jméno (dn)"
 
-#: src/export.c:113 src/summaryview.c:8508
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "Exportovat do mbox souboru"
 
@@ -3505,11 +3517,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 "
@@ -3518,13 +3538,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"
@@ -3532,7 +3552,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 "
@@ -3541,114 +3561,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"
@@ -3665,11 +3696,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"
@@ -3751,17 +3782,17 @@ msgstr "Zdědit vlastnosti a pravidla zpracování z rodičovské složky"
 
 #: src/foldersel.c:585 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:302
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:239
-#: src/plugins/vcalendar/vcal_folder.c:2103
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, 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:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:251
-#: src/plugins/vcalendar/vcal_folder.c:2110
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Složka '%s' už existuje."
@@ -3793,7 +3824,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:563
+#: src/folderview.c:254 src/mainwindow.c:561
 msgid "_Search folder..."
 msgstr "_Prohledat složku..."
 
@@ -3846,11 +3877,11 @@ msgstr "Označit všechny jako přečtené"
 
 #: src/folderview.c:870
 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:872 src/summaryview.c:4293
 msgid "Do you really want to mark all mails in this folder as read?"
@@ -3862,22 +3893,22 @@ msgstr "Označit všechny jako nepřečtené"
 
 #: src/folderview.c:876
 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:878 src/summaryview.c:4339
 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:1074 src/imap.c:4693
+#: src/folderview.c:1074 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prohledávám složku %s/%s..."
 
-#: src/folderview.c:1077 src/imap.c:4697 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prohledávám složku %s..."
@@ -3924,7 +3955,7 @@ msgstr "Otevírám složku %s..."
 msgid "Folder could not be opened."
 msgstr "Složku nelze otevřít."
 
-#: src/folderview.c:2493 src/mainwindow.c:2901 src/mainwindow.c:2906
+#: src/folderview.c:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
@@ -3936,7 +3967,7 @@ msgstr "Odstranit všechny zprávy v koši?"
 msgid "_Empty trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/folderview.c:2539 src/inc.c:1669 src/toolbar.c:3085
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Varování offline režimu"
 
@@ -4050,7 +4081,7 @@ msgstr "Název diskusní skupiny"
 msgid "Messages"
 msgstr "Zprávy"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Typ"
 
@@ -4102,7 +4133,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:857
+#: src/gtk/about.c:164 src/gtk/about.c:866
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4191,46 +4222,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:461
-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:472
 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:482
+#: src/gtk/about.c:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "přidává podporu IPv6 adres\n"
+
+#: src/gtk/about.c:481
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "práce s adresáři PalmOS\n"
 
-#: src/gtk/about.c:492
+#: src/gtk/about.c:491
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "práce s adresáři LDAP\n"
 
-#: src/gtk/about.c:502
+#: src/gtk/about.c:501
 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:512
+#: src/gtk/about.c:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "přidává podporu SVG témat\n"
+
+#: src/gtk/about.c:521
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "správa X relací\n"
 
-#: src/gtk/about.c:522
+#: src/gtk/about.c:531
 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:532
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "přidává podporu SVG témat\n"
+#: src/gtk/about.c:541
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "přidává podporu pro OAuth2 autentizaci\n"
 
-#: src/gtk/about.c:564
+#: src/gtk/about.c:573
 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 "
@@ -4241,7 +4277,7 @@ msgstr ""
 "Foundation a to ve verzi 3, nebo (podle vašeho uvážení) v jakékoliv pozdější "
 "verzi."
 
-#: src/gtk/about.c:571
+#: src/gtk/about.c:580
 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 "
@@ -4251,7 +4287,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:590
+#: src/gtk/about.c:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4259,73 +4295,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:723 src/main.c:2749
+#: src/gtk/about.c:732 src/main.c:2749
 msgid "Session statistics\n"
 msgstr "Statistiky relace\n"
 
-#: src/gtk/about.c:733 src/gtk/about.c:736 src/main.c:2759 src/main.c:2762
+#: src/gtk/about.c:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Spuštěno: %s\n"
 
-#: src/gtk/about.c:743 src/main.c:2768
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Příchozí provoz\n"
 
-#: src/gtk/about.c:746 src/main.c:2771
+#: src/gtk/about.c:755 src/main.c:2771
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Přijaté zprávy: %d\n"
 
-#: src/gtk/about.c:753 src/main.c:2777
+#: src/gtk/about.c:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Odchozí provoz\n"
 
-#: src/gtk/about.c:756 src/main.c:2780
+#: src/gtk/about.c:765 src/main.c:2780
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/přesměrované zprávy: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2784
+#: src/gtk/about.c:770 src/main.c:2784
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Zodpovězené zprávy: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2788
+#: src/gtk/about.c:775 src/main.c:2788
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Přeposlané zprávy: %d\n"
 
-#: src/gtk/about.c:771 src/main.c:2792
+#: src/gtk/about.c:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Celkem odchozích zpráv: %d\n"
 
-#: src/gtk/about.c:798
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "_Informace"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Autoři"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Licence"
 
-#: src/gtk/about.c:897
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "_Poznámky k verzi"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "_Statistiky"
 
@@ -4799,7 +4835,7 @@ msgstr "Priorita"
 msgid "Precedence:"
 msgstr "Priorita:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1268
 msgid "Organization"
 msgstr "Organizace"
 
@@ -5012,7 +5048,7 @@ msgid "Folder contains marked messages"
 msgstr "Složka obsahuje označené zprávy"
 
 #: src/gtk/icon_legend.c:92
-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:93
@@ -5175,15 +5211,15 @@ msgstr "Zavedené moduly"
 msgid "Page Index"
 msgstr "Index stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:856
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 msgid "_Hide"
 msgstr "_Skrýt"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4093 src/prefs_account.c:4111 src/prefs_account.c:4129
 #: src/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
-#: src/prefs_account.c:4201 src/prefs_account.c:4220 src/prefs_account.c:4303
-#: src/prefs_account.c:4321 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Účet"
@@ -5630,8 +5666,7 @@ msgstr "(Žádný předmět)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:313 src/mimeview.c:2564
-#: src/plugins/att_remover/att_remover.c:305
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Název souboru:"
@@ -5644,193 +5679,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"
@@ -5842,7 +5877,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"
@@ -5854,7 +5889,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"
@@ -5866,7 +5901,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"
@@ -5878,7 +5913,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"
@@ -5890,7 +5925,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"
@@ -5900,37 +5935,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:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:884 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Nezabezpečené připojení"
 
-#: src/imap.c:1177 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:885 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"
@@ -5943,108 +5978,108 @@ msgstr ""
 "\n"
 "Chcete pokračovat v připojování k serveru? Komunikace nebude zabezpečena."
 
-#: src/imap.c:1183 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:891 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 "
@@ -6053,20 +6088,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"
@@ -6116,7 +6151,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..."
 
@@ -6148,21 +6183,21 @@ msgstr ""
 "pouze podsložky a žádné zprávy, přidejte nakonec názvu '/')"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:233
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadejte nové jméno pro '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
 #: src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/vcalendar/vcal_folder.c:2094
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:257
-#: src/plugins/vcalendar/vcal_folder.c:2116
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6170,32 +6205,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:307 src/plugins/mailmbox/plugin_gtk.c:372
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:330
+#: 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:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:209
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
@@ -6222,7 +6258,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:536 src/mainwindow.c:690
+#: src/imap_gtk.c:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Odebírat"
 
@@ -6457,32 +6493,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)"
@@ -6490,28 +6526,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:407 src/prefs_summaries.c:647
+#: src/inc.c:727 src/prefs_matcher.c:407 src/prefs_summaries.c:647
 #: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 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)"
@@ -6519,66 +6555,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:865
+#: src/inc.c:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:894
+#: src/inc.c:897
 #, 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:928
+#: src/inc.c:931
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d"
 
-#: src/inc.c:932
+#: src/inc.c:935
 #, 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:1012 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:1014
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Získávám zprávy z %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1035
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:1064
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1080
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6586,16 +6622,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:1232
+#: src/inc.c:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Připojení k %s:%d selhalo."
 
-#: src/inc.c:1237
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "Nastala chyba během zpracovávání pošty."
 
-#: src/inc.c:1243
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6604,37 +6640,37 @@ msgstr ""
 "Nastala chyba během zpracovávání pošty:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1254
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1259
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1262
+#: src/inc.c:1265
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba socketu v připojení k %s:%d."
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1270 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:1270
+#: src/inc.c:1273
 #, 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:1275
+#: src/inc.c:1278
 msgid "Mailbox is locked."
 msgstr "Schránka je zamknuta."
 
-#: src/inc.c:1279
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6643,11 +6679,11 @@ msgstr ""
 "Schránka je uzamčen:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6656,7 +6692,7 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1299 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6664,48 +6700,48 @@ msgstr ""
 "Čas relace vypršel. Můžete ji obnovit zvýšením hodnoty ve Volby/Ostatní/"
 "Různé."
 
-#: src/inc.c:1301
+#: src/inc.c:1304
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Časový limit připojení k %s:%d vypršel."
 
-#: src/inc.c:1339
+#: src/inc.c:1342
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1634 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
 #: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr "sekund"
 
-#: src/inc.c:1644 src/inc.c:1654
+#: src/inc.c:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/inc.c:1647
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodin"
 
-#: src/inc.c:1659
+#: src/inc.c:1662
 #, 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:1665
+#: src/inc.c:1668
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete v režimu offline. Přepnout?"
 
-#: src/inc.c:1672
+#: src/inc.c:1675
 msgid "On_ly once"
 msgstr "Pouze _jednou"
 
@@ -7129,831 +7165,831 @@ msgstr "NetworkManager: network is online.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: síť je odpojena.\n"
 
-#: src/mainwindow.c:523 src/messageview.c:212
+#: src/mainwindow.c:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/mainwindow.c:525 src/messageview.c:214 src/summaryview.c:448
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "Z_obrazit"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "Nastav_ení"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "_Přidat schránku"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Změnit pořadí schránek..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "_Importovat mbox soubor..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "_Exportovat do mbox souboru..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "Exportovat _vybrané do mbox souboru..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
 msgstr "Vyprázdnit všechny _koše"
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "Uložit email j_ako..."
 
-#: src/mainwindow.c:547 src/messageview.c:222
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "Uložit část j_ako..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Nastavení stránky..."
 
-#: src/mainwindow.c:551 src/messageview.c:224
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Tisk..."
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "Synchronizovat složky"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "_Konec"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "Vybrat _vlákno"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "_Rychlé vyhledávání"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "Nástrojová lišta"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Zobrazované _sloupce"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "V seznamu _složek..."
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "V seznamu _zpráv..."
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "Us_pořádání"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "_Seskupit dle předmětu"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Jít na"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Předchozí zpráva"
 
-#: src/mainwindow.c:588 src/messageview.c:237
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Další zpráva"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:588 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Pře_dchozí nepřečtenou zpráva"
 
-#: src/mainwindow.c:591 src/messageview.c:240
+#: src/mainwindow.c:589 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Da_lší nepřečtená zpráva"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:591 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Předchozí no_vá zpráva"
 
-#: src/mainwindow.c:594 src/messageview.c:243
+#: src/mainwindow.c:592 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "D_alší nová zpráva"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:594 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Předchozí _označená zpráva"
 
-#: src/mainwindow.c:597 src/messageview.c:246
+#: src/mainwindow.c:595 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Další o_značená zpráva"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:597 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Předchozí _obarvená zpráva"
 
-#: src/mainwindow.c:600 src/messageview.c:249
+#: src/mainwindow.c:598 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Další o_barvená zpráva"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:600
 msgid "Previously opened message"
 msgstr "Předchozí otevřená zpráva"
 
-#: src/mainwindow.c:603 src/messageview.c:252
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Další otevřená zpráva"
 
-#: src/mainwindow.c:605 src/messageview.c:254
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Rodičovská zpráva"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:605 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Následující nepřečtená _složka"
 
-#: src/mainwindow.c:608 src/messageview.c:257
+#: src/mainwindow.c:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "Sl_ožka..."
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:608 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Další část"
 
-#: src/mainwindow.c:611 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:609 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Předchozí část"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Rolování zpráv"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Předchozí řádek"
 
-#: src/mainwindow.c:616 src/messageview.c:263
+#: src/mainwindow.c:614 src/messageview.c:263
 msgid "Next line"
 msgstr "Další řádek"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:476
+#: src/mainwindow.c:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Předchozí stránka"
 
-#: src/mainwindow.c:618 src/messageview.c:265 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Další stránka"
 
-#: src/mainwindow.c:636 src/messageview.c:283
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Dekódovat"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:641
 msgid "Open in new _window"
 msgstr "Otevřít v _novém okně"
 
-#: src/mainwindow.c:644 src/messageview.c:290
+#: src/mainwindow.c:642 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Zd_roj zprávy"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "Část zprávy"
 
-#: src/mainwindow.c:647 src/messageview.c:292
+#: src/mainwindow.c:645 src/messageview.c:292
 msgid "View as text"
 msgstr "Zobrazit jako text"
 
-#: src/mainwindow.c:648 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/mainwindow.c:650 src/messageview.c:295
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "Otevřít čím..."
 
-#: src/mainwindow.c:654 src/messageview.c:298
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citace"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "_Aktualizace souhrnu"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "Přij_mout"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "Přijmout z _aktuálního účtu"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "Přijmout ze _všech účtů"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "Přerušit stahování zprá_v"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "_Odeslat pozdržené zprávy"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "_Napsat nový mail"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:669
 msgid "Compose a news message"
 msgstr "_Napsat news zprávu"
 
-#: src/mainwindow.c:673 src/messageview.c:304
+#: src/mainwindow.c:671 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: src/mainwindow.c:674 src/messageview.c:305 src/summaryview.c:433
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
 msgstr "Odpovědět ko_mu"
 
-#: src/mainwindow.c:677 src/messageview.c:308 src/summaryview.c:436
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:676
 msgid "Follow-up and reply to"
 msgstr "Postoupit a odpovědět"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:679 src/messageview.c:311 src/summaryview.c:438
 #: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "Pře_dat"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
 #: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr "Předat jako pří_lohu"
 
-#: src/mainwindow.c:683 src/messageview.c:313 src/summaryview.c:440
+#: src/mainwindow.c:681 src/messageview.c:313 src/summaryview.c:440
 #: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "Pře_směrovat"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
 msgstr "Kon_ference"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "View archive"
 msgstr "Zobrazit archív"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Contact owner"
 msgstr "Kontaktovat vlastníka"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "Přesunou_t..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:700
 msgid "Move to _trash"
 msgstr "Přesuno_ut do koše"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "_Odstranit..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
 msgstr "Přesunout vlákno do _koše"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "Odstranit _vlákno"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Stornovat news zprávu"
 
-#: src/mainwindow.c:709 src/mainwindow.c:710 src/summaryview.c:441
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "Označ_it"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "Odo_značit"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "Označit jako _přečtené"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "Označit jako _nepřečtené"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Označit všechny přečtené ve složce"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:716
 msgid "Mark all unread in folder"
 msgstr "Označit všechny nepřečtené ve složce"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorovat vlákno"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Unignore thread"
 msgstr "Přestat ignorovat vlákno"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Sledovat vlákno"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Nesledovat vlákno"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "Označit jako _spam"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:725
 msgid "Mark as _ham"
 msgstr "Označit jako n_e spam"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:177 src/toolbar.c:517
+#: src/mainwindow.c:728 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/mainwindow.c:731 src/prefs_filtering_action.c:178 src/toolbar.c:518
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "O_barvit"
 
-#: src/mainwindow.c:734 src/summaryview.c:443
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "Zn_ačky"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "Znovu _upravit"
 
-#: src/mainwindow.c:740 src/messageview.c:314 src/mimeview.c:1044
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "Zkontrolovat podpis"
 
-#: src/mainwindow.c:745 src/messageview.c:318
+#: src/mainwindow.c:743 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Přidat odesílatele do kni_hy adres"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "C_ollect addresses"
 msgstr "S_bírat adresy"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "Z aktuální _složky..."
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "Z vybraných _zpráv..."
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "Pře_filtrovat všechny zprávy ve složce"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "Přefiltrovat _vybrané zprávy"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustit pravidl_o zpracování složky"
 
-#: src/mainwindow.c:756 src/messageview.c:321
+#: src/mainwindow.c:754 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Vytvořit pravidlo _filtru"
 
-#: src/mainwindow.c:757 src/mainwindow.c:764 src/messageview.c:322
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:758 src/mainwindow.c:765 src/mainwindow.c:873
+#: src/mainwindow.c:756 src/mainwindow.c:763 src/mainwindow.c:871
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Podle _Od"
 
-#: src/mainwindow.c:759 src/mainwindow.c:766 src/mainwindow.c:874
+#: src/mainwindow.c:757 src/mainwindow.c:764 src/mainwindow.c:872
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Podle _Komu"
 
-#: src/mainwindow.c:760 src/mainwindow.c:767 src/messageview.c:325
+#: src/mainwindow.c:758 src/mainwindow.c:765 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Podle _Předmětu"
 
-#: src/mainwindow.c:761 src/mainwindow.c:768 src/messageview.c:326
+#: src/mainwindow.c:759 src/mainwindow.c:766 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Podle od_esílatele"
 
-#: src/mainwindow.c:763 src/messageview.c:328 src/summaryview.c:446
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "Vytvořit pravidlo zpracování"
 
-#: src/mainwindow.c:771 src/messageview.c:336
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Seznam _URLs..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "Ch_eck for new messages in all folders"
 msgstr "_Zjistit nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Delete du_plicated messages"
 msgstr "_Odstranit duplikáty zpráv"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "Ve vybrané složce"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "Ve všech složkách"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "S_pustit"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "Vy_mazat"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "TLS cer_tificates"
 msgstr "TLS cer_tifikáty"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Záznam filtrování"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Záznam o připojení"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "Debug _log"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "_Zapomenout všechna hesla relace"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Forget _primary passphrase"
 msgstr "Zapomenout _hlavní heslo"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "_Zvolit aktuální účet"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "Upravit a_ktuální účet..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "Vytvořit _nový účet..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "U_pravit účty..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "_Volby..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "Před zpracování..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "Následné zpracování..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Filtrování..."
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "Ša_blony..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "_Akce..."
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "Znač_ky..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "FAQ (online)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "_Význam ikon"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Nastavit jako výchozí klient"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "Offline _mód"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "Řádek men_u"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "_Náhled zprávy"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "_Stavový řádek"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Záhlaví sloupců"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "Zobrazit _vlákna"
 
-#: src/mainwindow.c:840 src/prefs_summaries.c:669
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Skrýt přečtená vlákna"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "Skrýt přeč_tené zprávy"
 
-#: src/mainwindow.c:842 src/prefs_summaries.c:675
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Skrýt odstraněné zprávy"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Zobrazit všechny _hlavičky"
 
-#: src/mainwindow.c:845 src/messageview.c:349
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Sbalit vše"
 
-#: src/mainwindow.c:846 src/messageview.c:350
+#: src/mainwindow.c:844 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Sbalit od úrovně _2"
 
-#: src/mainwindow.c:847 src/messageview.c:351
+#: src/mainwindow.c:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Sbalit od úrovně _3"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Text _vedle ikon"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "Jen _ikony"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "Jen _text"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "_Standartní"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "_Tři sloupce"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "Široký náhled _zpráv"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "Široký _seznam zpráv"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "Podle čí_sla"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "Podle _velikosti"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "Podle _data"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "Podle data vlákna"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "Podle _předmětu"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "Podle _barevného označení zprávy"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "Podle tag"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "Podle _značky"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "Podle _stavu"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "Podle _přílohy"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "Podle skóre"
 
-#: src/mainwindow.c:882
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "Podle zamknuto"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "N_eřadit"
 
-#: src/mainwindow.c:887 src/prefs_summaries.c:656
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: src/mainwindow.c:888 src/prefs_summaries.c:657
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Sestupně"
 
-#: src/mainwindow.c:930 src/messageview.c:393
+#: src/mainwindow.c:928 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Autodetekce"
 
-#: src/mainwindow.c:1308 src/summaryview.c:6511
+#: src/mainwindow.c:1306 src/summaryview.c:6511
 msgid "Modify tags..."
 msgstr "Upravit značky..."
 
-#: src/mainwindow.c:1966
+#: src/mainwindow.c:1964
 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:1981
+#: src/mainwindow.c:1979
 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:1984
+#: src/mainwindow.c:1982
 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:1998
+#: src/mainwindow.c:1996
 msgid "Select account"
 msgstr "Vybrat účet"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Síťový protokol"
 
-#: src/mainwindow.c:2029
+#: src/mainwindow.c:2027
 msgid "Filtering/Processing debug log"
 msgstr "Protokol filtrování zpráv a zpracování složek"
 
-#: src/mainwindow.c:2048 src/prefs_logging.c:378
+#: src/mainwindow.c:2046 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "protokolování filtrů zapnuto\n"
 
-#: src/mainwindow.c:2050 src/prefs_logging.c:380
+#: src/mainwindow.c:2048 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "protokolování filtrů vypnuto\n"
 
-#: src/mainwindow.c:2484 src/mainwindow.c:2491 src/mainwindow.c:2534
-#: src/mainwindow.c:2567 src/mainwindow.c:2599 src/mainwindow.c:2644
+#: src/mainwindow.c:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1149
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:2645 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:2902 src/mainwindow.c:2907
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Odstranit všechny zprávy ve VŠECH koších?"
 
-#: src/mainwindow.c:2903
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "Neukončit"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Přidat schránku"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7967,18 +8003,18 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka '%s' již existuje."
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2953 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7988,47 +8024,47 @@ 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:3420
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Zasílání zpráv do konference není povoleno"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Import souboru mbox se nezdařil."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "Export do mbox souboru se nezdařil."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Ukončit Claws Mail?"
 
-#: src/mainwindow.c:4262
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Synchronizace složek"
 
-#: src/mainwindow.c:4263
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete nyní synchronizovat složky?"
 
-#: src/mainwindow.c:4264
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "_Synchronizovat"
 
-#: src/mainwindow.c:4746
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4754
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Žádná duplicitní zpráva ve vybrané složce.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4760
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8036,7 +8072,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:4766
+#: src/mainwindow.c:4764
 #, 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"
@@ -8044,11 +8080,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:4804
+#: src/mainwindow.c:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Vymazávám duplikované zprávy ve všech složkách..."
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4808
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8056,47 +8092,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:4815
+#: src/mainwindow.c:4813
 #, 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:4977 src/messageview.c:2648
+#: src/mainwindow.c:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Vybrat složku pro přejití"
 
-#: src/mainwindow.c:5080 src/summaryview.c:5952
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 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:5088
+#: src/mainwindow.c:5086
 msgid "Processing rules to apply after folder rules"
 msgstr "Zpracování složky - pravidla prováděná po pravidlech složky"
 
-#: src/mainwindow.c:5096 src/summaryview.c:5963
+#: src/mainwindow.c:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Filtr pro příjem - nastavení pravidel"
 
-#: src/mainwindow.c:5209
+#: src/mainwindow.c:5207
 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:5300
+#: src/mainwindow.c:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail byl zaregistrován jako výchozí klient."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5300
 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:5316 src/setup.c:91
+#: src/mainwindow.c:5314 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prohledávám složku %s%c%s..."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5458
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8421,7 +8457,7 @@ msgstr ""
 "  Zpráva byla smazána nebo přesunuta do jiné složky"
 
 #: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4424
-#: src/summaryview.c:7314
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "Během učení došlo k chybě.\n"
 
@@ -8542,8 +8578,8 @@ msgstr "Kontroluji podpis..."
 msgid "Go back to email"
 msgstr "Zpět na zprávu"
 
-#: src/mimeview.c:1712 src/mimeview.c:1804 src/mimeview.c:2046
-#: src/mimeview.c:2082 src/mimeview.c:2194 src/plugins/fancy/fancy_viewer.c:452
+#: src/mimeview.c:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nepodařilo se uložit tuto část zprávy: %s"
@@ -8553,28 +8589,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:1815
+#: src/mimeview.c:1816
 #, 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:1818
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
 msgstr "Chyba při ukládání všech částí zprávy"
 
-#: src/mimeview.c:1819
-msgid "Skip"
-msgstr "Přeskočit"
+#: src/mimeview.c:1820
+msgid "Ignore"
+msgstr "Ignorovat"
 
-#: src/mimeview.c:1819
-msgid "Skip all"
-msgstr "Vše přeskočit"
+#: src/mimeview.c:1820
+msgid "Ignore all"
+msgstr "Ignorovat vše"
 
-#: src/mimeview.c:1829
+#: src/mimeview.c:1832
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8582,7 +8618,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:1837
+#: src/mimeview.c:1844
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8590,7 +8626,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:1842
+#: src/mimeview.c:1849
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8598,26 +8634,26 @@ msgstr[0] "%s, %d soubor selhal."
 msgstr[1] "%s, %d soubory selhaly."
 msgstr[2] "%s, %d souborů selhalo."
 
-#: src/mimeview.c:1875 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1886 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:1882 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1893 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' není adresář."
 
-#: src/mimeview.c:1999 src/plugins/fancy/fancy_viewer.c:708
+#: src/mimeview.c:2011 src/plugins/fancy/fancy_viewer.c:708
 #: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/mimeview.c:2129 src/mimeview.c:2136
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:2130 src/mimeview.c:2137
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8626,7 +8662,7 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:2232
+#: src/mimeview.c:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8637,11 +8673,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Spustit nedůvěryhodný binární soubor?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8653,20 +8689,20 @@ msgstr ""
 "\n"
 "Chcete ho spustit?"
 
-#: src/mimeview.c:2245
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "Spustit binární soubor"
 
-#: src/mimeview.c:2549 src/plugins/att_remover/att_remover.c:303
+#: src/mimeview.c:2561
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2550 src/plugins/att_remover/att_remover.c:304
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2789
+#: src/mimeview.c:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/mimeview.c:2564 src/plugins/vcalendar/vcalendar.c:1243
+#: src/mimeview.c:2576 src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
@@ -8778,77 +8814,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"
@@ -9340,7 +9376,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"
 
@@ -9512,6 +9548,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:305
+msgid "Filename"
+msgstr "Název souboru"
+
 #: src/plugins/att_remover/att_remover.c:336
 msgid "Remove attachments"
 msgstr "Odebrat přílohy"
@@ -9814,7 +9854,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:389 src/prefs_account.c:1718
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1748
 msgid "KiB"
 msgstr "KiB"
 
@@ -10329,7 +10369,7 @@ msgstr "Otevřít v prohlížeči (vzdálený obsah je povolen)"
 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:4304
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4360
 #: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Proxy"
@@ -10381,7 +10421,7 @@ msgstr "CSS z tohoto souboru bude aplikováno na všechny HTML části"
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: 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:2510
+#: src/prefs_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "_Procházet"
@@ -10704,7 +10744,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:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 msgid "Authentication"
 msgstr "Autentizace"
 
@@ -10917,8 +10957,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: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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hodin"
 
@@ -11106,15 +11146,6 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledá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 ""
-"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"
@@ -11301,7 +11332,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:1265
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1292
 msgid "Server information"
 msgstr "Informace o serveru"
 
@@ -11352,28 +11383,28 @@ msgstr "Nastavit autentizaci"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1487
+#: src/prefs_account.c:2108
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1466
-#: src/prefs_account.c:2095 src/prefs_account.c:3038 src/prefs_account.c:3066
-#: src/prefs_account.c:3263 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
 #: src/wizard.c:1635
 msgid "Password"
 msgstr "Heslo"
 
-#: 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: 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/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Automaticky"
@@ -11390,20 +11421,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 "
@@ -11420,7 +11451,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"
 
@@ -11684,7 +11715,7 @@ msgid "Show banner"
 msgstr "Zobrazovat proužek"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: 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"
@@ -12304,8 +12335,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: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/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut(y)"
 
@@ -12370,64 +12401,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"
@@ -12910,8 +12941,8 @@ msgstr "Zobrazit konzoli Pythonu..."
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3027
-#: src/prefs_account.c:3055 src/prefs_account.c:3493 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Procházet"
@@ -13232,7 +13263,7 @@ msgstr "Stahovat komentáře staré méně než"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1687 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dnech"
 
@@ -13378,7 +13409,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)"
 
@@ -13387,7 +13418,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)"
 
@@ -14074,63 +14105,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"
@@ -14139,21 +14170,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"
@@ -14166,7 +14197,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"
@@ -14177,46 +14208,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"
 
@@ -14688,95 +14719,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:396 src/prefs_account.c:1631 src/prefs_account.c:2955
+#: src/prefs_account.c:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2970
+#: src/prefs_account.c:416 src/prefs_account.c:1804 src/prefs_account.c:3008
 #: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Diskusní skupiny (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1501
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Žádný (pouze odesílání SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Název účtu"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1256
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1262
 msgid "Mail address"
 msgstr "Poštovní adresa"
 
-#: src/prefs_account.c:1298 src/wizard.c:1524
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Automatická konfigurace"
 
-#: src/prefs_account.c:1300 src/wizard.c:1525
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14784,81 +14815,81 @@ msgstr ""
 "Varování: tato verze Claws Mail byla zkompilována\n"
 "bez podpory IMAP a News."
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Autentizace při připojení"
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "Server diskuzních skupin"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Lokální schránka"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "SMTP server (odesílání)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1471
 msgid "Use mail command rather than SMTP server"
 msgstr "Použít místo SMTP serveru příkaz pro odeslání"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1480
 msgid "command to send mails"
 msgstr "příkaz pro odeslání pošty"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Lokální mbox soubor"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 msgid "Default Inbox"
 msgstr "Výchozí inbox"
 
-#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 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:1634
+#: src/prefs_account.c:1661
 msgid "Authenticate before POP connection"
 msgstr "Autentizace před POP připojením"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
 msgid "Select"
 msgstr "Vybrat"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1696
 msgid "Remove messages on server when received"
 msgstr "Odstranit zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1707
 msgid "Remove after"
 msgstr "Odstranit po"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dnů a 0 hodin: odstranit ihned"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1737
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1740
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14866,94 +14897,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:1750 src/prefs_account.c:2985
+#: src/prefs_account.c:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků pro stažení"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "(pokud je 0, je to neomezený počet)"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "Adresář pro IMAP server"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(obvykle prázdné)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Zobrazovat pouze odebírané složky"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1864
 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:1833
+#: src/prefs_account.c:1866
 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:1840 src/prefs_receive.c:164
+#: src/prefs_account.c:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatický příjem pošty"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Použít globální nastavení"
 
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Přijímat poštu každých"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1921
 msgid "Filter messages on receiving"
 msgstr "Při načítání zpracovat zprávy filtrem pro příjem"
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1937
 msgid "Allow filtering using plugins on receiving"
 msgstr "Při načítání filtrovat zprávy zásuvnými moduly"
 
-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1941
 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:1998 src/prefs_customheader.c:210
+#: src/prefs_account.c:2031 src/prefs_customheader.c:210
 #: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account.c:2000
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "Generovat číslo zprávy"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2036
 msgid "Send account mail address in Message-ID"
 msgstr "Poslat mailovou adresu účtu v Message-ID"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2039
 msgid "Add user agent header"
 msgstr "Přidat záhlaví user agent"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentizace (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14961,215 +14992,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:2138
+#: src/prefs_account.c:2174
 msgid "Authenticate with POP before sending"
 msgstr "Autentizace POP před odesláním"
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "Časový limit pro POP autentizaci"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2270
 msgid "Authorization"
 msgstr "Autentizace"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2287
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Vyberte poskytovatele OAuth2 email služby"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2327
 msgid "Client ID"
 msgstr "ID klienta"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2333
 msgid "Client secret"
 msgstr "Klientské certifikát"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2365
 msgid "Obtain authorization code"
 msgstr "Získat autorizační kód"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2369
 msgid "Open default browser with request"
 msgstr "Otevřít výchozí prohlížeč s požadavkem"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2375
 msgid "Copy link"
 msgstr "Kopírovat odkaz"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2387
 msgid "Authorization code"
 msgstr "Autorizační kód"
 
-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2395
 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:2365
+#: src/prefs_account.c:2402
 msgid "Complete authorization"
 msgstr "Dokončit autorizaci"
 
-#: src/prefs_account.c:2369
+#: src/prefs_account.c:2406
 msgid "Authorize"
 msgstr "Autorizovat"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2502
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2459
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
 msgstr "Automaticky vložit podpis"
 
-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
 msgstr "Slovníky pro kontrolu pravopisu"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1176
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Výchozí slovník"
 
-#: src/prefs_account.c:2597 src/prefs_folder_item.c:1210
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Výchozí alternativní slovník"
 
-#: src/prefs_account.c:2683 src/prefs_account.c:4166
+#: src/prefs_account.c:2721 src/prefs_account.c:4222
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
 #: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account.c:2698 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
+#: src/prefs_account.c:2736 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/prefs_account.c:2713 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2751 src/prefs_filtering_action.c:185
 #: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Předat"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Výchozí systém zabezpečení"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1250
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "Zprávy vždy digitálně podepsat"
 
-#: src/prefs_account.c:2791 src/prefs_folder_item.c:1282
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "Zprávy vždy šifrovat"
 
-#: src/prefs_account.c:2793
+#: src/prefs_account.c:2831
 msgid "Always sign messages when replying to a signed message"
 msgstr "Odpověď na podepsanou zprávu vždy podepsat"
 
-#: src/prefs_account.c:2796
+#: src/prefs_account.c:2834
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Odpověď na šifrovanou zprávu vždy šifrovat"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2837
 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:2801
+#: src/prefs_account.c:2839
 msgid "Save sent encrypted messages as clear text"
 msgstr "Odeslané šifrované zprávy uložit jako čistý text"
 
-#: src/prefs_account.c:2959 src/prefs_account.c:2974 src/prefs_account.c:2988
+#: src/prefs_account.c:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
 msgid "Don't use TLS"
 msgstr "Nepoužívat TLS"
 
-#: src/prefs_account.c:2962 src/prefs_account.c:2977 src/prefs_account.c:2997
-#: src/prefs_account.c:3008
+#: src/prefs_account.c:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: src/prefs_account.c:2965 src/prefs_account.c:2980 src/prefs_account.c:3011
+#: src/prefs_account.c:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 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:3001
+#: src/prefs_account.c:3039
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account.c:3005
+#: src/prefs_account.c:3043
 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:3016
+#: src/prefs_account.c:3054
 msgid "Client certificates"
 msgstr "Klientské certifikáty"
 
-#: src/prefs_account.c:3024
+#: src/prefs_account.c:3062
 msgid "Certificate for receiving"
 msgstr "Certifikát pro příjem"
 
-#: src/prefs_account.c:3029 src/prefs_account.c:3031 src/prefs_account.c:3057
-#: src/prefs_account.c:3059
+#: src/prefs_account.c:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 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:3052
+#: src/prefs_account.c:3090
 msgid "Certificate for sending"
 msgstr "Certifikát pro odeslání"
 
-#: src/prefs_account.c:3092
+#: src/prefs_account.c:3130
 msgid "Automatically accept valid TLS certificates"
 msgstr "Automaticky přijímat platné certifikáty TLS"
 
-#: src/prefs_account.c:3095
+#: src/prefs_account.c:3133
 msgid "Use non-blocking TLS"
 msgstr "Použít neblokující TLS"
 
-#: src/prefs_account.c:3107
+#: src/prefs_account.c:3145
 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:3199 src/prefs_proxy.c:75
+#: src/prefs_account.c:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Použít proxy server"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3246
 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:3210
+#: src/prefs_account.c:3248
 msgid "Use global proxy server settings"
 msgstr "Použít globální nastavení proxy"
 
-#: src/prefs_account.c:3247 src/prefs_proxy.c:117 src/wizard.c:1119
+#: src/prefs_account.c:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Použít autentizaci"
 
-#: src/prefs_account.c:3252 src/prefs_proxy.c:125
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account.c:3286
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Použít proxy server pro odeslání"
 
-#: src/prefs_account.c:3288
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15178,27 +15209,27 @@ msgstr ""
 "nakonfigurovanému odchozímu serveru s vynecháním libovolného "
 "nakonfigurovaného proxy serveru."
 
-#: src/prefs_account.c:3400
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3414
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3421
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3427
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Název domény"
 
-#: src/prefs_account.c:3430
+#: src/prefs_account.c:3468
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15206,156 +15237,177 @@ msgstr ""
 "Jméno domény bude použito pro generované Message-ID a při připojení SMTP "
 "serverů."
 
-#: src/prefs_account.c:3444
+#: src/prefs_account.c:3482
 msgid "Use command to communicate with server"
 msgstr "Příkaz pro komunikaci se serverem"
 
-#: src/prefs_account.c:3453
+#: src/prefs_account.c:3491
 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:3506
+#: src/prefs_account.c:3544
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Ukládat odložené zprávy do"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account.c:3512
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Ukládat odstraněné zprávy do"
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "Nebylo zadáno jméno účtu."
 
-#: src/prefs_account.c:3573
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána poštovní adresa."
 
-#: src/prefs_account.c:3581
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán SMTP server."
 
-#: src/prefs_account.c:3586
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské číslo."
 
-#: src/prefs_account.c:3591
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "Nebyl zadán POP server."
 
-#: src/prefs_account.c:3611
+#: src/prefs_account.c:3649
 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:3617
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "Nebyl zadán IMAP server."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán NNTP server."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3666
 msgid "local mailbox filename is not entered."
 msgstr "nebyl zadán název lokálního schránky."
 
-#: src/prefs_account.c:3634
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "nebyl zadán příkaz pro odeslání."
 
-#: src/prefs_account.c:3644
+#: src/prefs_account.c:3682
 msgid "User ID cannot contain a newline character."
 msgstr "User ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3651
+#: src/prefs_account.c:3689
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3686
+#: src/prefs_account.c:3726
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP user ID nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3691
+#: src/prefs_account.c:3731
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP heslo nemůže obsahovat znak nového řádku."
 
-#: src/prefs_account.c:3783
+#: src/prefs_account.c:3826
 msgid "domain is not specified."
 msgstr "doména není uvedena."
 
-#: src/prefs_account.c:3788
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "odesílaná není vybrána."
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "fronta není vybrána."
 
-#: src/prefs_account.c:3798
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "koncepty nejsou vybrány."
 
-#: src/prefs_account.c:3803
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "koš není vybrán."
 
-#: src/prefs_account.c:4112
+#: src/prefs_account.c:4166
 msgid "Receive"
 msgstr "Přijmout"
 
-#: src/prefs_account.c:4148
+#: src/prefs_account.c:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Odeslat"
+
+#: src/prefs_account.c:4203
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4184 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_account.c:4202
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Zabezpečení"
 
-#: src/prefs_account.c:4322
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/prefs_account.c:4682
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Nastavení pro nový účet"
 
-#: src/prefs_account.c:4684
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - nastavení účtu"
 
-#: src/prefs_account.c:4803 src/wizard.c:1389
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Selhalo (špatná adresa)"
 
-#: src/prefs_account.c:4888
+#: src/prefs_account.c:4946
 msgid "Select signature file"
 msgstr "Soubor s podpisem"
 
-#: src/prefs_account.c:4906 src/prefs_account.c:4923 src/wizard.c:1066
+#: src/prefs_account.c:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Vybrat soubor s certifikátem"
 
-#: src/prefs_account.c:5019
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:5336
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (modul nebyl načten)"
 
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Autorizace je kompletní"
+
+#: src/prefs_account.c:6278
+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:6281
+msgid "Authorisation NOT completed"
+msgstr "Autorizace NENÍ kompletní"
+
+#: src/prefs_account.c:6282
+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:227
 msgid "Actions configuration"
 msgstr "Nastavení akcí"
@@ -15483,15 +15535,15 @@ msgid "Entry not saved"
 msgstr "Neuložený záznam"
 
 #: src/prefs_actions.c:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
-#: src/prefs_filtering.c:1531 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebyl uložen. Chcete přesto okno zavřít?"
 
 #: src/prefs_actions.c:922 src/prefs_actions.c:927 src/prefs_actions.c:953
-#: src/prefs_actions.c:1324 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1510 src/prefs_filtering.c:1532
-#: src/prefs_matcher.c:2173 src/prefs_template.c:574 src/prefs_template.c:599
-#: src/prefs_template.c:604
+#: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
+#: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Pokračovat v úpravách"
 
@@ -15633,11 +15685,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"
@@ -15688,8 +15740,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:208
-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:214
 msgid "Replying"
@@ -15746,65 +15798,69 @@ msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
 #: src/prefs_customheader.c:514
+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:519
 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:561
+#: src/prefs_customheader.c:566
 msgid "Choose a PNG file"
 msgstr "Choose a PNG file"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Vyberte xbm soubor"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Vyberte textový soubor"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Tento soubor není obrázek."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Vybraný obrázek nemá správnou velikost (48x48)."
 
-#: src/prefs_customheader.c:589
+#: src/prefs_customheader.c:594
 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:594
+#: src/prefs_customheader.c:599
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Obrázek nemá správný formát (PNG)."
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:608
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Obrázek nemá správný formát (XBM)."
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:617
 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:618
+#: src/prefs_customheader.c:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface chyba: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Tento soubor obsahuje znak(y) \"nový řádek\"."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Odstranit záhlaví"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 msgid "Do you really want to delete this header?"
 msgstr "Opravdu chcete odstranit toto záhlaví?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:880
 msgid "Current custom headers"
 msgstr "Aktuální vlastní záhlaví"
 
@@ -16934,14 +16990,6 @@ msgstr "typ je"
 msgid "Program returns"
 msgstr "Návratové hodnoty programu"
 
-#: src/prefs_matcher.c:2171
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"Záznam nebyl uložen.\n"
-"Chcete přesto okno zavřít?"
-
 #: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Typ podmínky: 'Test'"
@@ -17710,8 +17758,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:420 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:420 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Odesílání"
 
@@ -18876,88 +18924,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"
@@ -19419,7 +19467,7 @@ msgstr "Šifrovaná zpráva"
 msgid "Has attachment(s)"
 msgstr "Má přílohu/přílohy"
 
-#: src/summaryview.c:8321
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19428,11 +19476,11 @@ msgstr ""
 "Chyba v regulárním výrazu (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8424
+#: src/summaryview.c:8428
 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:8429
+#: src/summaryview.c:8433
 msgid "Go back to the folder list"
 msgstr "Přejít zpět na seznam složek"
 
@@ -20278,3 +20326,140 @@ msgid ""
 msgstr ""
 "Claws Mail je nyní připraven.\n"
 "Stiskněte uložit a můžeme začít."
+
+#, 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"
+
+#~ 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 ""
+#~ "The entry was not saved.\n"
+#~ "Close anyway?"
+#~ msgstr ""
+#~ "Záznam nebyl uložen.\n"
+#~ "Chcete přesto okno zavřít?"
+
+#~ msgid "_Yes"
+#~ msgstr "_Ano"
+
+#~ 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 "_New"
+#~ msgstr "_Nový"
+
+#~ msgid "_Properties"
+#~ msgstr "_Vlastnosti"
+
+#~ msgid "Find and _Replace"
+#~ msgstr "Najít a na_hradit"
+
+#~ msgid "_Bottom"
+#~ msgstr "_Konec"
+
+#~ msgid "_Down"
+#~ msgstr "_Dolů"
+
+#~ msgid "_Next"
+#~ msgstr "_Další"
+
+#~ msgid "_Previous"
+#~ msgstr "_Předchozí"
+
+#~ msgid "_Top"
+#~ msgstr "_Začátek"
+
+#~ msgid "_Up"
+#~ msgstr "_Nahoru"
+
+#~ msgid "_Add"
+#~ msgstr "_Přidat"
+
+#~ msgid "_Stop"
+#~ msgstr "_Zastavit"
+
+#~ msgid "_Execute"
+#~ msgstr "_Spustit"
+
+#~ msgid "_Refresh"
+#~ msgstr "_Obnovit"
+
+#~ msgid "_Apply"
+#~ msgstr "_Použít"
+
+#~ 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 "_Quit"
+#~ msgstr "_Ukončit"
+
+#~ msgid "Attach warner"
+#~ msgstr "Kontrola příloh"
+
+#~ msgid "Warn when"
+#~ msgstr "Varovat při"
+
+#~ msgid "UIDL"
+#~ msgstr "UIDL"
+
+#~ msgid "_Rename"
+#~ msgstr "Pře_jmenovat"
+
+#~ 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 ae21ee725..27aa37009 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,17 +7,17 @@
 # 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.17.9\n"
+"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:16+0100\n"
-"PO-Revision-Date: 2021-07-09 10:39+0200\n"
+"POT-Creation-Date: 2022-10-11 10:32+0100\n"
+"PO-Revision-Date: 2022-10-14 13:07+0200\n"
 "Last-Translator: Marcel Pol <marcel at timelord.nl>\n"
 "Language-Team: translators at lists.claws-mail.org\n"
 "Language: nl\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: src/account.c:402 src/account.c:469
+#: src/account.c:403 src/account.c:470
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -36,15 +36,15 @@ msgstr ""
 "Deze moeten gesloten worden voordat je de accountinstellingen kunt "
 "veranderen."
 
-#: src/account.c:447
+#: src/account.c:448
 msgid "Can't create folder."
 msgstr "Kan map niet aanmaken."
 
-#: src/account.c:735
+#: src/account.c:738
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: src/account.c:752
+#: src/account.c:755
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -54,61 +54,85 @@ msgstr ""
 "in de kolom 'O' geeft aan voor welke accounts dit wordt gedaan. Vetgedrukte "
 "tekst geeft het standaardaccount aan."
 
-#: src/account.c:823
+#: src/account.c:789
+msgid "Create a new account"
+msgstr "Nieuw account aanmaken"
+
+#: src/account.c:797
+msgid "Edit preferences for the selected account"
+msgstr "Voorkeuren bewerken voor het geslecteerde account"
+
+#: src/account.c:805
+msgid "Delete the selected account from the list"
+msgstr "Verwijder het geselecteerde account van de lijst"
+
+#: src/account.c:813
+msgid "Create a new copy of the selected account"
+msgstr "Nieuwe kopie maken van het geselecteerde account"
+
+#: src/account.c:821
+msgid "Move the selected account down"
+msgstr "Verplaats het geselecteerde account naar onderen"
+
+#: src/account.c:829
+msgid "Move the selected account up"
+msgstr "Verplaats het geselecteerde account naar boven"
+
+#: src/account.c:836
 msgid " _Set as default account "
 msgstr " _Instellen als standaard account "
 
-#: src/account.c:915
+#: src/account.c:928
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Accounts met mappen op de server kunnen niet worden gekopieerd."
 
-#: src/account.c:922
+#: src/account.c:935
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie van %s"
 
-#: src/account.c:1126
+#: src/account.c:1139
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Wil je werkelijk het account '%s' verwijderen?"
 
-#: src/account.c:1128
+#: src/account.c:1141
 msgid "(Untitled)"
 msgstr "(Geen titel)"
 
-#: src/account.c:1129
+#: src/account.c:1142
 msgid "Delete account"
 msgstr "Verwijder account"
 
-#: src/account.c:1603
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "O"
 
-#: src/account.c:1609
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ophalen' haalt berichten op voor de aangevinkte accounts"
 
-#: 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/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7523 src/editaddress.c:1477
+#: src/editaddress.c:1506 src/editaddress.c:1522
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c: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/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
+#: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
+#: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:1632 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -148,7 +172,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"
@@ -159,36 +183,36 @@ 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:5305 src/compose.c:5310 src/compose.c:9744
+#: src/compose.c:9783 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:1390
+#: src/action.c:1223 src/action.c:1395
 msgid "Completed"
 msgstr "Voltooid"
 
-#: src/action.c:1254
+#: src/action.c:1259
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Starten: %s\n"
 
-#: src/action.c:1258
+#: src/action.c:1263
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beëindigd: %s\n"
 
-#: src/action.c:1304
+#: src/action.c:1309
 msgid "Action's input/output"
 msgstr "Invoer en uitvoer van actie"
 
-#: src/action.c:1636
+#: src/action.c:1647
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -199,11 +223,11 @@ msgstr ""
 "('%%h' zal vervangen worden door het argument)\n"
 "  %s"
 
-#: src/action.c:1641
+#: src/action.c:1652
 msgid "Action's hidden user argument"
 msgstr "Verborgen gebruikersargument van actie"
 
-#: src/action.c:1645
+#: src/action.c:1656
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -213,23 +237,23 @@ msgstr ""
 "Geef het argument van de volgende actie:\n"
 "('%%u' zal vervangen worden door het argument)  %s"
 
-#: src/action.c:1650
+#: src/action.c:1661
 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:5009
+#: src/addr_compl.c:699 src/addressbook.c:5007
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Groep"
@@ -302,15 +326,15 @@ msgstr ""
 "Wil je werkelijk alle eigenschapnamen vervangen door\n"
 "de standaard set?"
 
-#: 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
+#: src/addrcustomattr.c:217 src/addressbook.c:432 src/addressbook.c:457
+#: src/addressbook.c:474 src/edittags.c:298
+#: src/plugins/archive/archiver_gtk.c:1310 src/prefs_actions.c:1112
+#: src/prefs_filtering.c:1704 src/prefs_template.c:1112
 msgid "_Delete"
 msgstr "Ver_wijderen"
 
-#: 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:218 src/edittags.c:299 src/prefs_actions.c:1113
+#: src/prefs_filtering.c:1705 src/prefs_template.c:1113
 msgid "Delete _all"
 msgstr "_Alles verwijderen"
 
@@ -318,20 +342,20 @@ msgstr "_Alles verwijderen"
 msgid "_Reset to default"
 msgstr "_Terugzetten naar standaard"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:411
 msgid "Attribute name is not set."
 msgstr "Eigenschapnaam is niet ingesteld."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:470
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Bewerk eigenschapnamen"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:484
 msgid "New attribute name:"
 msgstr "Nieuwe eigenschapnaam:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:521
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -365,8 +389,8 @@ msgid "Duplicate email addresses"
 msgstr "Dubbele e-mailadressen"
 
 #: 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/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/toolbar.c:540
 msgid "Address"
 msgstr "Adres"
 
@@ -374,11 +398,11 @@ msgstr "Adres"
 msgid "Address book path"
 msgstr "Pad naar adresboek"
 
-#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
+#: src/addrduplicates.c:791 src/addressbook.c:1431 src/addressbook.c:1484
 msgid "Delete address(es)"
 msgstr "Verwijder adres(sen)"
 
-#: src/addrduplicates.c:792 src/addressbook.c:1490
+#: src/addrduplicates.c:792 src/addressbook.c:1485
 msgid "Really delete the address(es)?"
 msgstr "Wil je de adressen echt verwijderen?"
 
@@ -386,7 +410,7 @@ msgstr "Wil je de adressen echt verwijderen?"
 msgid "Delete address"
 msgstr "Verwijder adres"
 
-#: src/addrduplicates.c:842 src/addressbook.c:1437
+#: src/addrduplicates.c:842 src/addressbook.c:1432
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Deze adresgegevens zijn alleen-lezen en kunnen niet worden verwijderd."
 
@@ -398,8 +422,8 @@ msgstr "Toevoegen aan adresboek"
 msgid "Contact"
 msgstr "Contact"
 
-#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1302 src/editgroup.c:292
+#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1260
+#: src/editaddress.c:1304 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -407,265 +431,265 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
+#: src/addressadd.c:598 src/addressbook.c:3254 src/addressbook.c:3305
 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: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:4995 src/editaddress.c:1249
+#: src/editaddress.c:1287 src/editgroup.c:291 src/expldifdlg.c:517
+#: 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:615 src/mainwindow.c:523
-#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:401 src/addressbook.c:431 src/addressbook.c:456
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
+#: src/messageview.c:213 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
-#: src/messageview.c:215
+#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:525
+#: 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:632
+#: src/addressbook.c:421 src/compose.c:637
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
+#: src/addressbook.c:422 src/compose.c:641 src/messageview.c:226
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: 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:644 src/mainwindow.c:557 src/messageview.c:228
+#: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: 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:645 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
+#: src/compose.c:650 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: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:411
+#: src/plugins/vcalendar/month-view.c:427 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:643 src/prefs_other.c:493
-#: src/toolbar.c:268 src/toolbar.c:2522
+#: src/addressbook.c:910 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/toolbar.c:272 src/toolbar.c:2563
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:1109 src/editldap.c:794
+#: src/addressbook.c:1104 src/editldap.c:794
 msgid "Search"
 msgstr "Zoek"
 
-#: src/addressbook.c:1481
+#: src/addressbook.c:1476
 msgid "Delete group"
 msgstr "Verwijder groep"
 
-#: src/addressbook.c:1482
+#: src/addressbook.c:1477
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -673,26 +697,26 @@ msgstr ""
 "Wil je deze groep(en) echt verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2209
+#: src/addressbook.c:2204
 msgid "Cannot paste. Target address book is read-only."
 msgstr "Kan niet plakken. Bedoeld adresboek is alleen-lezen."
 
-#: src/addressbook.c:2219
+#: src/addressbook.c:2214
 msgid "Cannot paste into an address group."
 msgstr "Kan niet plakken in een adresgroep."
 
-#: src/addressbook.c:2956
+#: src/addressbook.c:2951
 #, 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: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:2954 src/addressbook.c:2980 src/addressbook.c:2987
+#: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:173
+#: src/toolbar.c:507
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: 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 "
@@ -701,20 +725,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: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:333 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:2972
+#: src/addressbook.c:2967
 msgid "Delete _folder only"
 msgstr "Verwijder alleen _map"
 
-#: src/addressbook.c:2972
+#: src/addressbook.c:2967
 msgid "Delete folder and _addresses"
 msgstr "Verwijder map en _adressen"
 
-#: src/addressbook.c:2983
+#: src/addressbook.c:2978
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -723,7 +747,7 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen niet verloren gaan."
 
-#: src/addressbook.c:2990
+#: src/addressbook.c:2985
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -732,28 +756,28 @@ msgstr ""
 "Wil je '%s' verwijderen?\n"
 "De adressen die het bevat zullen verloren gaan."
 
-#: src/addressbook.c:3104
+#: src/addressbook.c:3099
 #, c-format
 msgid "Search '%s'"
 msgstr "Zoek '%s'"
 
-#: src/addressbook.c:3242 src/addressbook.c:3291
+#: src/addressbook.c:3237 src/addressbook.c:3286
 msgid "New Contacts"
 msgstr "Nieuwe contacten"
 
-#: src/addressbook.c:4128
+#: src/addressbook.c:4125
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker, kon indexbestand niet bewaren."
 
-#: src/addressbook.c:4132
+#: src/addressbook.c:4129
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker, kon adresboekbestanden niet bewaren."
 
-#: src/addressbook.c:4142
+#: src/addressbook.c:4139
 msgid "Old address book converted successfully."
 msgstr "Oud adresboek is geconverteerd."
 
-#: src/addressbook.c:4147
+#: src/addressbook.c:4144
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -761,7 +785,7 @@ msgstr ""
 "Oud adresboek geconverteerd,\n"
 "nieuw indexbestand kon niet worden opgeslagen."
 
-#: src/addressbook.c:4160
+#: src/addressbook.c:4157
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -769,7 +793,7 @@ msgstr ""
 "Kon adresboek niet converteren, \n"
 "maar heb lege adresboekbestanden aangemaakt."
 
-#: src/addressbook.c:4166
+#: src/addressbook.c:4163
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -777,7 +801,7 @@ msgstr ""
 "Kon adresboek niet converteren,\n"
 "nieuw indexbestand kon niet worden aangemaakt."
 
-#: src/addressbook.c:4171
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -785,57 +809,57 @@ msgstr ""
 "Kon adresboek niet converteren\n"
 "en kon nieuwe adresboekbestanden niet aanmaken."
 
-#: src/addressbook.c:4178 src/addressbook.c:4184
+#: src/addressbook.c:4175 src/addressbook.c:4181
 msgid "Addressbook conversion error"
 msgstr "Conversiefout adresboek"
 
-#: src/addressbook.c:4299
+#: src/addressbook.c:4296
 msgid "Addressbook Error"
 msgstr "Adresboekfout"
 
-#: src/addressbook.c:4300
+#: src/addressbook.c:4297
 msgid "Could not read address index"
 msgstr "Kon adresindexbestand niet lezen"
 
-#: src/addressbook.c:4631
+#: src/addressbook.c:4629
 msgid "Busy searching..."
 msgstr "Bezig met zoeken..."
 
-#: src/addressbook.c:4961 src/prefs_send.c:220
+#: src/addressbook.c:4959 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:4973
+#: src/addressbook.c:4971
 msgid "Address Books"
 msgstr "Adresboeken"
 
-#: src/addressbook.c:4985
+#: src/addressbook.c:4983
 msgid "Person"
 msgstr "Persoon"
 
-#: 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:5019 src/exporthtml.c:881 src/folderview.c:362
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Map"
 
-#: src/addressbook.c:5033
+#: src/addressbook.c:5031
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5045 src/addressbook.c:5057
+#: src/addressbook.c:5043 src/addressbook.c:5055
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5069
+#: src/addressbook.c:5067
 msgid "LDAP servers"
 msgstr "LDAP-servers"
 
-#: src/addressbook.c:5081
+#: src/addressbook.c:5079
 msgid "LDAP Query"
 msgstr "LDAP-verzoek"
 
 #: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:985 src/importldif.c:541
+#: src/exporthtml.c:981 src/importldif.c:541
 msgid "Address Book"
 msgstr "Adresboek"
 
@@ -937,27 +961,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:9820
+#: src/alertpanel.c:141 src/compose.c:9866 src/mimeview.c:1836
 msgid "Notice"
 msgstr "Bericht"
 
-#: 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:154 src/compose.c:5895 src/compose.c:6444
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: 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:167 src/alertpanel.c:190 src/compose.c:5836 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:191 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Bekijk log"
 
-#: src/alertpanel.c:346
+#: src/alertpanel.c:343
 msgid "Show this message next time"
 msgstr "Deze waarschuwing volgende keer herhalen"
 
@@ -1010,14 +1034,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."
@@ -1025,24 +1049,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 "
@@ -1051,7 +1075,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."
@@ -1059,154 +1083,154 @@ 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: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:86
+#: src/gtk/sslcertwindow.c:93 src/gtk/sslcertwindow.c:108
+#: src/gtk/sslcertwindow.c:113 src/gtk/sslcertwindow.c:120
+#: src/gtk/sslcertwindow.c:135
 msgid "<not in certificate>"
 msgstr "<niet in certificaat>"
 
@@ -1214,237 +1238,237 @@ 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.%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: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:198
+#: src/compose.c:197
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1456,363 +1480,363 @@ msgstr ""
 "\n"
 "Ondertekenen en versleutelen is uitgeschakeld voor dit bericht."
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "_Add..."
 msgstr "_Toevoegen..."
 
-#: 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:610 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:360
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: src/compose.c:607 src/folderview.c:254
+#: src/compose.c:612 src/folderview.c:255
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "Be_richt"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "_Spelling"
 msgstr "_Spelling"
 
-#: src/compose.c:619 src/compose.c:686
+#: src/compose.c:624 src/compose.c:691
 msgid "_Options"
 msgstr "_Opties"
 
-#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "_Help"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "S_end"
 msgstr "_Verzenden"
 
-#: src/compose.c:624
+#: src/compose.c:629
 msgid "Send _later"
 msgstr "_Wachtrij"
 
-#: src/compose.c:627
+#: src/compose.c:632
 msgid "_Attach file"
 msgstr "Bestand _bijvoegen"
 
-#: src/compose.c:628
+#: src/compose.c:633
 msgid "_Insert file"
 msgstr "Bestand _invoegen"
 
-#: src/compose.c:629
+#: src/compose.c:634
 msgid "Insert si_gnature"
 msgstr "Ondertekening _invoegen"
 
-#: src/compose.c:630
+#: src/compose.c:635
 msgid "_Replace signature"
 msgstr "Ondertekening _vervangen"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:644 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "Op_nieuw"
 
-#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:648 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "K_nippen"
 
-#: src/compose.c:647
+#: src/compose.c:652
 msgid "_Special paste"
 msgstr "_Plakken speciaal"
 
-#: src/compose.c:648
+#: src/compose.c:653
 msgid "As _quotation"
 msgstr "Als _citaten"
 
-#: src/compose.c:649
+#: src/compose.c:654
 msgid "_Wrapped"
 msgstr "Afge_broken"
 
-#: src/compose.c:650
+#: src/compose.c:655
 msgid "_Unwrapped"
 msgstr "Niet afgeb_roken"
 
-#: src/compose.c:652 src/mainwindow.c:558
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "_Alles selecteren"
 
-#: src/compose.c:654
+#: src/compose.c:659
 msgid "A_dvanced"
 msgstr "_Geavanceerd"
 
-#: src/compose.c:655
+#: src/compose.c:660
 msgid "Move a character backward"
 msgstr "Ga een teken terug"
 
-#: src/compose.c:656
+#: src/compose.c:661
 msgid "Move a character forward"
 msgstr "Ga een teken verder"
 
-#: src/compose.c:657
+#: src/compose.c:662
 msgid "Move a word backward"
 msgstr "Ga een woord terug"
 
-#: src/compose.c:658
+#: src/compose.c:663
 msgid "Move a word forward"
 msgstr "Ga een woord verder"
 
-#: src/compose.c:659
+#: src/compose.c:664
 msgid "Move to beginning of line"
 msgstr "Ga naar begin van regel"
 
-#: src/compose.c:660
+#: src/compose.c:665
 msgid "Move to end of line"
 msgstr "Ga naar eind van regel"
 
-#: src/compose.c:661
+#: src/compose.c:666
 msgid "Move to previous line"
 msgstr "Ga een regel terug"
 
-#: src/compose.c:662
+#: src/compose.c:667
 msgid "Move to next line"
 msgstr "Ga een regel verder"
 
-#: src/compose.c:663
+#: src/compose.c:668
 msgid "Delete a character backward"
 msgstr "Verwijder vorige teken"
 
-#: src/compose.c:664
+#: src/compose.c:669
 msgid "Delete a character forward"
 msgstr "Verwijder volgende teken"
 
-#: src/compose.c:665
+#: src/compose.c:670
 msgid "Delete a word backward"
 msgstr "Verwijder vorig woord"
 
-#: src/compose.c:666
+#: src/compose.c:671
 msgid "Delete a word forward"
 msgstr "Verwijder volgend woord"
 
-#: src/compose.c:667
+#: src/compose.c:672
 msgid "Delete line"
 msgstr "Verwijder deze regel"
 
-#: src/compose.c:668
+#: src/compose.c:673
 msgid "Delete to end of line"
 msgstr "Verwijder tot eind van regel"
 
-#: src/compose.c:671 src/messageview.c:231
+#: src/compose.c:676 src/messageview.c:232
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Vinden"
 
-#: src/compose.c:674
+#: src/compose.c:679
 msgid "_Wrap current paragraph"
 msgstr "Regels afbreken in _huidige paragraaf"
 
-#: src/compose.c:675
+#: src/compose.c:680
 msgid "Wrap all long _lines"
 msgstr "Regelterugloop voor alle regels"
 
-#: src/compose.c:677
+#: src/compose.c:682
 msgid "Edit with e_xternal editor"
 msgstr "Aanpassen met e_xterne editor"
 
-#: src/compose.c:680
+#: src/compose.c:685
 msgid "_Check all or check selection"
 msgstr "_Controleer alles of selectie"
 
-#: src/compose.c:681
+#: src/compose.c:686
 msgid "_Highlight all misspelled words"
 msgstr "Toon alle _onjuist gespelde woorden"
 
-#: src/compose.c:682
+#: src/compose.c:687
 msgid "Check _backwards misspelled word"
 msgstr "Controleer _vorig onjuist gespeld woord"
 
-#: src/compose.c:683
+#: src/compose.c:688
 msgid "_Forward to next misspelled word"
 msgstr "Ga naar _volgend onjuist gespeld woord"
 
-#: src/compose.c:690
+#: src/compose.c:695
 msgid "Reply _mode"
 msgstr "_Beantwoord afzender"
 
-#: src/compose.c:692
+#: src/compose.c:697
 msgid "Privacy _System"
 msgstr "Privacy-_systeem"
 
-#: src/compose.c:696
+#: src/compose.c:701
 msgid "_Priority"
 msgstr "_Prioriteit"
 
-#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Tekenset_codering"
 
-#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:273
 msgid "Western European"
 msgstr "West-Europees"
 
-#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:712 src/mainwindow.c:628 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrillisch"
 
-#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:713 src/mainwindow.c:629 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japans"
 
-#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chinees"
 
-#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreaans"
 
-#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adresboek"
 
-#: src/compose.c:716
+#: src/compose.c:721
 msgid "_Template"
 msgstr "_Sjabloon"
 
-#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
-#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "_Over"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "Aut_o wrapping"
 msgstr "Aut_omatisch afbreken"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "Auto _indent"
 msgstr "Automatisch _inspringen"
 
-#: src/compose.c:729
+#: src/compose.c:734
 msgid "Si_gn"
 msgstr "_Ondertekenen"
 
-#: src/compose.c:730
+#: src/compose.c:735
 msgid "_Encrypt"
 msgstr "_Versleutelen"
 
-#: src/compose.c:731
+#: src/compose.c:736
 msgid "_Request Return Receipt"
 msgstr "_Ontvangstbevestiging"
 
-#: src/compose.c:732
+#: src/compose.c:737
 msgid "Remo_ve references"
 msgstr "Ver_wijder verwijzingen"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "Show _ruler"
 msgstr "_Lineaal weergeven"
 
-#: src/compose.c:738 src/compose.c:748
+#: src/compose.c:743 src/compose.c:753
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
-#: src/summaryview.c:433
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
+#: src/summaryview.c:434
 msgid "_All"
 msgstr "_Allen"
 
-#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
-#: src/summaryview.c:434
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
+#: src/summaryview.c:435
 msgid "_Sender"
 msgstr "_Afzender"
 
-#: src/compose.c:741
+#: src/compose.c:746
 msgid "_Mailing-list"
 msgstr "_Mailing-lijst"
 
-#: src/compose.c:746
+#: src/compose.c:751
 msgid "_Highest"
 msgstr "_Hoogste"
 
-#: src/compose.c:747
+#: src/compose.c:752
 msgid "Hi_gh"
 msgstr "H_oog"
 
-#: src/compose.c:749
+#: src/compose.c:754
 msgid "Lo_w"
 msgstr "Laa_g"
 
-#: src/compose.c:750
+#: src/compose.c:755
 msgid "_Lowest"
 msgstr "_Laagste"
 
-#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automatisch"
 
-#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:761 src/mainwindow.c:892 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:762 src/mainwindow.c:893 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:766 src/mainwindow.c:897 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Centraal-Europees (ISO-8859-_2)"
 
-#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:769 src/mainwindow.c:900 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grieks (ISO-8859-_7)"
 
-#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turks (ISO-8859-_9)"
 
-#: src/compose.c:1056
+#: src/compose.c:1061
 msgid "New message From format error."
 msgstr "Opmaakfout in Van-header van nieuw bericht."
 
-#: src/compose.c:1149
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Opmaakfout in onderwerp van nieuw bericht."
 
-#: src/compose.c:1181 src/quote_fmt.c:563
+#: src/compose.c:1186 src/quote_fmt.c:563
 #, 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:1450
+#: src/compose.c:1455
 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:1635 src/quote_fmt.c:580
+#: src/compose.c:1640 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
@@ -1820,12 +1844,12 @@ msgstr ""
 "Het \"Van\" veld van het \"Antwoord\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1684 src/quote_fmt.c:583
+#: src/compose.c:1689 src/quote_fmt.c:583
 #, 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:1825 src/compose.c:2026 src/quote_fmt.c:600
+#: src/compose.c:1830 src/compose.c:2031 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1833,56 +1857,56 @@ msgstr ""
 "Het \"Van\" veld van het \"Doorsturen\" sjabloon bevat een ongeldig e-"
 "mailadres."
 
-#: src/compose.c:1886 src/quote_fmt.c:603
+#: src/compose.c:1891 src/quote_fmt.c:603
 #, 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:2069
+#: src/compose.c:2074
 msgid "Fw: multiple emails"
 msgstr "Doorsturen: meerdere e-mails"
 
 # TPTD
-#: src/compose.c:2580
+#: src/compose.c:2596
 #, 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:2651 src/gtk/headers.h:14
+#: src/compose.c:2667 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/compose.c:2654 src/gtk/headers.h:15
+#: src/compose.c:2670 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/compose.c:2657 src/gtk/headers.h:12
+#: src/compose.c:2673 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
+#: src/compose.c:2676 src/compose.c:5054 src/compose.c:5056
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/compose.c:2663 src/gtk/headers.h:34
+#: src/compose.c:2679 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Followup-To:"
 
-#: src/compose.c:2666 src/gtk/headers.h:17
+#: src/compose.c:2682 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "In antwoord aan:"
 
-#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
+#: src/compose.c:2686 src/compose.c:5051 src/compose.c:5059
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Aan:"
 
-#: src/compose.c:2860
+#: src/compose.c:2876
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "Kan bestand niet bijvoegen (omzetten van de tekenset is mislukt)."
 
-#: src/compose.c:2866
+#: src/compose.c:2882
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1897,16 +1921,16 @@ msgstr[1] ""
 "De volgende bestanden zijn bijgevoegd: \n"
 "%s"
 
-#: src/compose.c:3146
+#: src/compose.c:3162
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "De \"Citatie-markering\" van het sjabloon is ongeldig."
 
-#: src/compose.c:3675
+#: src/compose.c:3695
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "Kon grootte van bestand '%s' niet opvragen."
 
-#: src/compose.c:3693
+#: src/compose.c:3713
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1915,57 +1939,57 @@ msgstr ""
 "Je staat op het punt een bestand van %s in de berichtinhoud in te voegen. "
 "Wil je doorgaan?"
 
-#: src/compose.c:3696
+#: src/compose.c:3716
 msgid "Are you sure?"
 msgstr "Wil je doorgaan?"
 
-#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: src/compose.c:3822
+#: src/compose.c:3842
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg."
 
-#: src/compose.c:3823
+#: src/compose.c:3843
 msgid "Empty file"
 msgstr "Leeg bestand"
 
-#: src/compose.c:3824
+#: src/compose.c:3844
 msgid "_Attach anyway"
 msgstr "Toch bijvoegen"
 
-#: src/compose.c:3833
+#: src/compose.c:3853
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet lezen."
 
-#: src/compose.c:3860
+#: src/compose.c:3880
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4895 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4902 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4905 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[geen onderwerp] - Bericht opstellen%s"
 
-#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4907 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Bericht opstellen"
 
-#: src/compose.c:4909 src/messageview.c:887
+#: src/compose.c:4934 src/messageview.c:892
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1973,59 +1997,62 @@ msgstr ""
 "Geen account opgegeven voor het verzenden van berichten.\n"
 "Selecteer eerst een account."
 
-#: src/compose.c:5126 src/compose.c:5163
+#: src/compose.c:5151 src/compose.c:5188
 #, 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: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:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Verzenden"
 
-#: 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:5155 src/compose.c:5192 src/compose.c:5229 src/compose.c:5272
+#: src/compose.c:5837 src/folderview.c:2553 src/messageview.c:864
+#: src/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3107
 msgid "_Send"
 msgstr "_Verzenden"
 
-#: src/compose.c:5184
+#: src/compose.c:5209
 msgid "Recipient is not specified."
 msgstr "Geen ontvanger opgegeven."
 
-#: src/compose.c:5199
+#: src/compose.c:5224
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "Het onderwerp is leeg. %s"
 
-#: src/compose.c:5200 src/compose.c:5243
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5225 src/compose.c:5268
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr "Toch verzenden?"
 
-#: src/compose.c:5201 src/compose.c:5244
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5226 src/compose.c:5269
+#: 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:5203 src/compose.c:5246 src/toolbar.c:520
+#: src/compose.c:5228 src/compose.c:5271 src/toolbar.c:531
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:5204 src/compose.c:5247
+#: src/compose.c:5229 src/compose.c:5272
 msgid "_Queue"
 msgstr "_Wachtrij"
 
-#: src/compose.c:5242
+#: src/compose.c:5267
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Verzenden aan %d ontvangers. %s"
 
-#: src/compose.c:5271
+#: src/compose.c:5296
 msgid "Could not queue message."
 msgstr "Kon bericht niet in de wachtrij zetten."
 
-#: src/compose.c:5274
+#: src/compose.c:5299
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2036,7 +2063,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5278
+#: src/compose.c:5303
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2047,7 +2074,7 @@ msgstr ""
 "\n"
 "Ondertekenen mislukt: %s"
 
-#: src/compose.c:5283
+#: src/compose.c:5308
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2058,7 +2085,7 @@ msgstr ""
 "\n"
 "Versleuteling mislukt: %s"
 
-#: src/compose.c:5288
+#: src/compose.c:5313
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2068,7 +2095,7 @@ msgstr ""
 "\n"
 "Omzetten van de tekenset mislukt."
 
-#: src/compose.c:5292
+#: src/compose.c:5317
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2078,7 +2105,7 @@ msgstr ""
 "\n"
 "Kon de sleutel van de ontvanger, nodig voor versleutelen, niet vinden."
 
-#: src/compose.c:5355 src/compose.c:5415
+#: src/compose.c:5380 src/compose.c:5440
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2087,7 +2114,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5411
+#: src/compose.c:5436
 #, c-format
 msgid ""
 "%s\n"
@@ -2097,7 +2124,7 @@ msgstr ""
 "Gebruik \"Verzend berichten uit de wachtrij\" van het hoofdvenster om het "
 "opnieuw te proberen."
 
-#: src/compose.c:5808
+#: src/compose.c:5833
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2108,7 +2135,7 @@ msgstr ""
 "naar de opgegeven tekenset '%s'.\n"
 "Verzenden met tekenset %s?"
 
-#: src/compose.c:5870
+#: src/compose.c:5891
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2121,98 +2148,100 @@ msgstr ""
 "worden.\n"
 "Toch verzenden?"
 
-#: src/compose.c:6105
+#: src/compose.c:6130
 msgid "Encryption warning"
 msgstr "Versleutel-waarschuwing"
 
-#: src/compose.c:6106
+#: src/compose.c:6131
 msgid "C_ontinue"
 msgstr "Ga _door met bewerken"
 
-#: src/compose.c:6155
+#: src/compose.c:6180
 msgid "No account for sending mails available!"
 msgstr "Geen account beschikbaar voor het verzenden."
 
-#: src/compose.c:6164
+#: src/compose.c:6189
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "Geselecteerd account is geen NNTP: Plaatsen is niet mogelijk."
 
-#: src/compose.c:6418
+#: src/compose.c:6443
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "Bijlage %s bestaat niet meer. Negeren?"
 
-#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Verzenden annuleren"
 
-#: src/compose.c:6420
+#: src/compose.c:6445
 msgid "Ignore attachment"
 msgstr "Negeer bijlage"
 
-#: src/compose.c:6476
+#: src/compose.c:6501
 #, c-format
 msgid "Original %s part"
 msgstr "Origineel %s gedeelte"
 
-#: src/compose.c:7076
+#: src/compose.c:7108
 msgid "Add to address _book"
 msgstr "Toevoegen aan adres_boek"
 
-#: src/compose.c:7243
+#: src/compose.c:7275
 msgid "Delete entry contents"
 msgstr "Verwijder inhoud"
 
-#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7279 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Gebruik <tab> om adressen automatisch af te maken"
 
-#: src/compose.c:7479
+#: src/compose.c:7511
 msgid "Mime type"
 msgstr "MIME-type"
 
-#: 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:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:7547
+#: src/compose.c:7579
 msgid "Save Message to "
 msgstr "Bericht bewaren in "
 
-#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7610 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/importpine.c:238 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
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: src/compose.c:7594
+#: src/compose.c:7626
 msgid "Select folder to save message to"
 msgstr "Selecteer map om bericht in op te slaan"
 
-#: src/compose.c:8051
+#: src/compose.c:8083
 msgid "Hea_der"
 msgstr "Hea_der"
 
-#: src/compose.c:8056
+#: src/compose.c:8088
 msgid "_Attachments"
 msgstr "_Bijlages"
 
-#: src/compose.c:8070
+#: src/compose.c:8102
 msgid "Othe_rs"
 msgstr "Anderen"
 
-#: src/compose.c:8085
+#: src/compose.c:8117
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: src/compose.c:8309
+#: src/compose.c:8341
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2221,19 +2250,19 @@ msgstr ""
 "Spellingcontrole kon niet gestart worden.\n"
 "%s"
 
-#: src/compose.c:8456
+#: src/compose.c:8488
 msgid "_From:"
 msgstr "_Van:"
 
-#: src/compose.c:8473
+#: src/compose.c:8505
 msgid "Account to use for this email"
 msgstr "Te gebruiken account voor dit bericht"
 
-#: src/compose.c:8475
+#: src/compose.c:8507
 msgid "Sender address to be used"
 msgstr "Een afzender-adres is verplicht"
 
-#: src/compose.c:8657
+#: src/compose.c:8689
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2242,50 +2271,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:8768 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8800 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
 msgstr "G_een"
 
-#: src/compose.c:8869 src/prefs_template.c:752
+#: src/compose.c:8901 src/prefs_template.c:752
 #, 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:8966
+#: src/compose.c:8998
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "Opmaakfout in '%s'-sjabloon."
 
-#: src/compose.c:9390
+#: src/compose.c:9423
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME-type."
 
-#: src/compose.c:9405
+#: src/compose.c:9438
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:9479
+#: src/compose.c:9512
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:9497
+#: src/compose.c:9530
 msgid "MIME type"
 msgstr "MIME-type"
 
-#: src/compose.c:9530
+#: src/compose.c:9563
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:9550
+#: src/compose.c:9583
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:9551
+#: src/compose.c:9584
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:9646
+#: src/compose.c:9680
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
@@ -2294,47 +2323,63 @@ msgstr ""
 "Kon de berichtinhoud niet naar bestand schrijven:\n"
 "%s"
 
-#: src/compose.c:9704
+#: src/compose.c:9709
+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:9742
 #, 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:9743
+#: src/compose.c:9782
+#, c-format
+msgid "External editor stopped with an error: %s"
+msgstr "Externe editor is gestopt met een fout: %s"
+
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "proces-id: %"
+
+#: src/compose.c:9858
 #, c-format
-msgid "External editor stopped with an error:%s"
-msgstr "Externe editor is gestopt met een fout:%s"
+msgid "process id: %d"
+msgstr "proces-id: %d"
 
-#: src/compose.c:9817
+#: src/compose.c:9863
 #, 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:10223 src/messageview.c:1088
+#: src/compose.c:10273 src/messageview.c:1095
 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:10425
+#: src/compose.c:10476
 msgid "Could not save draft."
 msgstr "Kon klad niet opslaan."
 
-#: src/compose.c:10429
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "Kon klad niet opslaan"
 
-#: src/compose.c:10430
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2342,24 +2387,24 @@ msgstr ""
 "Kon klad niet opslaan.\n"
 "Wil je deze e-mail annuleren of weggooien?"
 
-#: src/compose.c:10432
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "_Annuleren"
 
-#: src/compose.c:10432
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "E-mail _weggooien"
 
-#: src/compose.c:10621 src/compose.c:10635
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:10649
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Bestand '%s' kon niet gelezen worden."
 
-#: src/compose.c:10651
+#: src/compose.c:10704
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2368,50 +2413,59 @@ msgstr ""
 "Bestand '%s' bevat ongeldige characters\n"
 "voor de huidige codering, invoeging kan onjuist zijn."
 
-#: src/compose.c:10728
+#: src/compose.c:10781
 msgid "Discard message"
 msgstr "Bericht weggooien"
 
-#: src/compose.c:10729
+#: src/compose.c:10782
 msgid "This message has been modified. Discard it?"
 msgstr "Bericht is gewijzigd, veranderingen laten vervallen?"
 
-#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Weggooien"
 
-#: src/compose.c:10730 src/compose.c:10735
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "Opslaan als _klad"
 
-#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: src/compose.c:10734
+#: src/compose.c:10787
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bericht is gewijzigd. Veranderingen opslaan?"
 
-#: src/compose.c:10735
+#: src/compose.c:10788
 msgid "_Don't save"
 msgstr "_Niet opslaan"
 
-#: src/compose.c:10806
+#: src/compose.c:10859
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Wil je sjabloon '%s' toepassen?"
 
-#: src/compose.c:10808
+#: src/compose.c:10861
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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/prefs_toolbar.c:1019
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:11694
+#: src/compose.c:10938
+#, 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:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2426,20 +2480,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:11700
+#: src/compose.c:11761
 msgid "Insert or attach?"
 msgstr "In- of bijvoegen?"
 
-#: src/compose.c:11701
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "_Bijvoegen"
 
-#: src/compose.c:11919
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Opmaakfout in citaat op regel %d."
 
-#: src/compose.c:12215
+#: src/compose.c:12276
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2453,12 +2507,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"
@@ -2467,23 +2521,23 @@ 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/toolbar.c:539
+#: src/crash.c:255 src/toolbar.c:550
 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"
 
@@ -2552,7 +2606,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:1784
+#: src/editaddress.c:820 src/prefs_folder_item.c:1857
 msgid "Discard"
 msgstr "Weggooien"
 
@@ -2560,15 +2614,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"
@@ -2577,58 +2631,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:1050
+#: src/editaddress.c:1051
 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:1098 src/editaddress.c:1100 src/expldifdlg.c:516
+#: src/exporthtml.c:758 src/ldif.c:751
 msgid "Display Name"
 msgstr "Weergegeven naam"
 
-#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
+#: src/editaddress.c:1109 src/editaddress.c:1113 src/ldif.c:759
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
+#: src/editaddress.c:1110 src/editaddress.c:1112 src/ldif.c:755
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/editaddress.c:1115 src/editaddress.c:1117
+#: src/editaddress.c:1116 src/editaddress.c:1118
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/editaddress.c:1253 src/editaddress.c:1294
+#: src/editaddress.c:1255 src/editaddress.c:1296
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
+#: src/editaddress.c:1482 src/editaddress.c:1515 src/editaddress.c:1531
 #: src/editaddress_other_attributes_ldap.c:376
 #: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
 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"
@@ -2658,8 +2712,8 @@ msgid " Check File "
 msgstr " Controleer bestand "
 
 #: 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/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
+#: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Bestand"
 
@@ -2673,9 +2727,9 @@ msgstr "Een groepnaam is verplicht."
 
 #: src/editgroup.c:296
 msgid "Edit Group Data"
-msgstr "Bewerken Groep"
+msgstr "Bewerken groepgegevens"
 
-#: src/editgroup.c:326 src/exporthtml.c:598
+#: src/editgroup.c:326 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Groepnaam"
 
@@ -2707,13 +2761,13 @@ msgstr "Bewerken map"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam op van de  map:"
 
-#: 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:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:129
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: 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:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:130
 msgid "Input the name of new folder:"
 msgstr "Geef de naam op van de nieuwe map:"
 
@@ -2741,14 +2795,14 @@ msgstr "Nieuwe JPilot invoer"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Wijzig LDAP - Selecteer zoekbasis"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
-#: src/prefs_proxy.c:98
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3268
+#: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Hostnaam"
 
 #: 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/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
+#: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Poort"
 
@@ -2808,9 +2862,9 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:4213
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#: src/editldap.c:470 src/prefs_account.c:4277
+msgid "TLS"
+msgstr "TLS"
 
 #: src/editldap.c:474
 msgid ""
@@ -2825,13 +2879,13 @@ msgstr ""
 
 #: src/editldap.c:479
 msgid ""
-"Enable secure connection to the LDAP server via SSL/TLS. If connection "
-"fails, be sure to check the correct configuration in ldap.conf "
-"(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:491
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -2977,13 +3031,13 @@ msgstr ""
 "Het te gebruiken wachtwoord bij het maken van een verbinding als de \"Bind DN"
 "\" gebruiker."
 
-#: 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:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
+#: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Wachtwoord weergeven"
 
-#: src/editldap.c:748
+#: src/editldap.c:748 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout (secs)"
 msgstr "Tijdslimiet (sec)"
 
@@ -3002,7 +3056,7 @@ msgstr ""
 "Het maximaal aantal ingangen dat moet worden teruggegeven in een "
 "zoekresultaat."
 
-#: src/editldap.c:793 src/prefs_account.c:4086
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -3014,47 +3068,60 @@ msgstr "Uitgebreid"
 msgid "Add New LDAP Server"
 msgstr "Nieuwe LDAP-server"
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1403
-#: src/prefs_summaries.c:640
+#: src/edittags.c:136
+msgctxt "Window title"
+msgid "Tags configuration"
+msgstr "Tag-instellingen"
+
+#: src/edittags.c:141
+msgctxt "Window title"
+msgid "Modify tags"
+msgstr "Wijzig tags"
+
+#: src/edittags.c:204 src/prefs_filtering_action.c:1403
+#: src/prefs_summaries.c:642
 msgid "Tag"
 msgstr "Tag"
 
-#: src/edittags.c:221
+#: src/edittags.c:233
 msgid "Delete tag"
 msgstr "Verwijder tag"
 
-#: src/edittags.c:222
+#: src/edittags.c:234
 msgid "Do you really want to delete this tag?"
 msgstr "Wil je deze tag werkelijk verwijderen?"
 
-#: src/edittags.c:257
+#: src/edittags.c:269
 msgid "Delete all tags"
 msgstr "Verwijder alle tags"
 
-#: src/edittags.c:258
+#: src/edittags.c:270
 msgid "Do you really want to delete all tags?"
 msgstr "Wil je alle tags werkelijk verwijderen?"
 
-#: src/edittags.c:430
+#: src/edittags.c:444
 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:472
-msgid "Tag is not set."
-msgstr "Tag is niet ingesteld."
-
-#: src/edittags.c:550
-msgctxt "Dialog title"
-msgid "Apply tags"
-msgstr "Pas tags toe"
-
-#: src/edittags.c:567
+#: src/edittags.c:575
 msgid "New tag:"
 msgstr "Nieuwe tag:"
 
-#: src/edittags.c:600
-msgid "Please select tags to apply/remove. Changes are immediate."
-msgstr "Selecteer tags om onmiddelijk toe te passen of te verwijderen."
+#: src/edittags.c:587
+msgid "Add the new tag"
+msgstr "De nieuwe tag toevoegen"
+
+#: src/edittags.c:592
+msgid "Delete the selected tag"
+msgstr "Verwijder geselecteerde tag"
+
+#: src/edittags.c:611
+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:95
 msgid "File does not appear to be vCard format."
@@ -3076,11 +3143,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"
 
@@ -3143,22 +3210,22 @@ msgstr "_Bekijk"
 msgid "Stylesheet"
 msgstr "Stijlblad"
 
-#: 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:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
+#: src/plugins/archive/archiver_prefs.c:312
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 msgid "None"
 msgstr "Geen"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
-#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:529
+#: src/prefs_folder_item.c:1260 src/prefs_folder_item.c:1292
 #: src/prefs_other.c:129 src/prefs_other.c:417
 msgid "Default"
 msgstr "Standaard"
 
-#: 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:455 src/plugins/pgpcore/select-keys.c:242
+#: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Volledig"
 
@@ -3387,7 +3454,7 @@ msgstr "Exporteren Adresboek naar LDIF-bestand"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8486
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "Exporteer naar mbox-bestand"
 
@@ -3423,32 +3490,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:981
+#: src/exporthtml.c:768 src/importldif.c:981
 #: 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."
 
@@ -3471,152 +3538,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: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:607
+#: 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, but all rules are applied on user request anyway\n"
+msgstr ""
+"regel is niet gebonden aan een account, alle regels worden toegepast op "
+"aanvraag van de gebruiker\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 ""
-"regel is niet verbonden met een account, alle regels worden toegepast "
-"volgens aanvraag van de gebruiker\n"
+"regel is gebonden aan een account, alle regels worden toegepast volgens "
+"aanvraag van de gebruiker\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 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"
@@ -3633,11 +3722,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"
@@ -3646,284 +3735,284 @@ msgstr ""
 "filteren van bericht (%s%s%s)\n"
 "%sberichtbestand: %s\n"
 
-#: src/folder.c:1595 src/prefs_folder_item.c:319
+#: src/folder.c:1596 src/prefs_folder_item.c:325
 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:322
+#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:328
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:323
+#: src/folder.c:1608 src/prefs_folder_item.c:329
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:321
+#: src/folder.c:1612 src/prefs_folder_item.c:327
 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: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:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:131
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:576 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:575 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: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:585 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:302
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
+#: src/plugins/rssyl/rssyl_cb_menu.c:239
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, 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: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:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:608 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:607 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/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:562
+#: src/folderview.c:254 src/mainwindow.c:561
 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:402 src/summaryview.c:6547
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6559
 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:401 src/summaryview.c:6549
-#: src/toolbar.c:512
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6561
+#: 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:473
+#: src/folderview.c:454 src/summaryview.c:474
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:783
+#: src/folderview.c:784
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:868 src/summaryview.c:4291
+#: src/folderview.c:869 src/summaryview.c:4292
 msgid "Mark all as read"
 msgstr "Markeer alles als gelezen"
 
-#: src/folderview.c:869
+#: src/folderview.c:870
 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:871 src/summaryview.c:4292
+#: src/folderview.c:872 src/summaryview.c:4293
 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:874 src/summaryview.c:4337
+#: src/folderview.c:875 src/summaryview.c:4338
 msgid "Mark all as unread"
 msgstr "Markeer alles als ongelezen"
 
-#: src/folderview.c:875
+#: src/folderview.c:876
 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:877 src/summaryview.c:4338
+#: src/folderview.c:878 src/summaryview.c:4339
 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:1067 src/imap.c:4686
+#: src/folderview.c:1074 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Map wordt ingelezen %s/%s..."
 
-#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Map wordt ingelezen %s..."
 
-#: src/folderview.c:1101
+#: src/folderview.c:1108
 msgid "Rebuild folder tree"
 msgstr "Vernieuw mappenboom"
 
-#: src/folderview.c:1102
+#: src/folderview.c:1109
 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:1112
+#: src/folderview.c:1119
 msgid "Rebuilding folder tree..."
 msgstr "Mappenboom wordt opnieuw aangemaakt..."
 
-#: src/folderview.c:1114
+#: src/folderview.c:1121
 msgid "Scanning folder tree..."
 msgstr "Mappenboom wordt ingelezen..."
 
-#: src/folderview.c:1205
+#: src/folderview.c:1212
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "Kan map '%s' niet inlezen\n"
 
-#: src/folderview.c:1259
+#: src/folderview.c:1266
 msgid "Checking for new messages in all folders..."
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten..."
 
-#: src/folderview.c:2233
+#: src/folderview.c:2240
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Map %s wordt gesloten..."
 
-#: src/folderview.c:2328
+#: src/folderview.c:2335
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Map %s wordt geopend..."
 
-#: src/folderview.c:2346
+#: src/folderview.c:2353
 msgid "Folder could not be opened."
 msgstr "Map kon niet worden geopend."
 
-#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
+#: src/folderview.c:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2487
+#: src/folderview.c:2494
 msgid "Delete all messages in trash?"
 msgstr "Alle berichten in de prullenbak weggooien?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2495
 msgid "_Empty trash"
 msgstr "_Prullenbak legen"
 
-#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Offline waarschuwing"
 
-#: src/folderview.c:2533 src/toolbar.c:3033
+#: src/folderview.c:2540 src/toolbar.c:3086
 msgid "You're working offline. Override?"
 msgstr "Je bent momenteel niet online. Toch doorgaan?"
 
-#: src/folderview.c:2544 src/toolbar.c:3052
+#: src/folderview.c:2551 src/toolbar.c:3105
 msgid "Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/folderview.c:2545 src/toolbar.c:3053
+#: src/folderview.c:2552 src/toolbar.c:3106
 msgid "Send all queued messages?"
 msgstr "Alle berichten uit de wachtrij verzenden?"
 
-#: src/folderview.c:2554 src/toolbar.c:3072
+#: src/folderview.c:2561 src/toolbar.c:3125
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij."
 
-#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
+#: src/folderview.c:2564 src/main.c:2925 src/toolbar.c:3128
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3932,64 +4021,64 @@ msgstr ""
 "Er zijn fouten opgetreden bij het verzenden van berichten in de wachtrij:\n"
 "%s"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2645
 #, 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:2633
+#: src/folderview.c:2646
 #, 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:2635
+#: src/folderview.c:2648
 msgid "Copy folder"
 msgstr "Kopieer map"
 
-#: src/folderview.c:2635
+#: src/folderview.c:2648
 msgid "Move folder"
 msgstr "Verplaats map"
 
-#: src/folderview.c:2646
+#: src/folderview.c:2659
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Bezig %s te kopiëren naar %s..."
 
-#: src/folderview.c:2646
+#: src/folderview.c:2659
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Bezig %s te verplaatsen naar %s..."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2693
 msgid "Source and destination are the same."
 msgstr "Bron en bestemming zijn hetzelfde."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2696
 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:2684
+#: src/folderview.c:2697
 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:2687
+#: src/folderview.c:2700
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "Kan een map niet naar een ander postvak verplaatsen."
 
-#: src/folderview.c:2690
+#: src/folderview.c:2703
 msgid "Copy failed!"
 msgstr "Kopiëren mislukt."
 
-#: src/folderview.c:2690
+#: src/folderview.c:2703
 msgid "Move failed!"
 msgstr "Verplaatsen mislukt."
 
-#: src/folderview.c:2740
+#: src/folderview.c:2753
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Instellingen voor map '%s' wordt verwerkt"
 
-#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
+#: src/folderview.c:3190 src/summaryview.c:4747 src/summaryview.c:4853
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Doelmap kan alleen gebruikt worden om submappen op te slaan."
 
@@ -4017,7 +4106,7 @@ msgstr "Naam nieuwsgroep"
 msgid "Messages"
 msgstr "Berichten"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Type"
 
@@ -4026,10 +4115,10 @@ msgid "moderated"
 msgstr "gemodereerd"
 
 #: src/grouplistdialog.c:348
-msgid "readonly"
+msgid "read-only"
 msgstr "alleen-lezen"
 
-#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:301
 #: src/plugins/vcalendar/vcal_manager.c:115
 #: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
@@ -4039,7 +4128,7 @@ msgstr "onbekend"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan groeplijst niet ophalen."
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1867 src/summaryview.c:1682
 msgid "Done."
 msgstr "Klaar."
 
@@ -4048,23 +4137,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:"
@@ -4072,21 +4161,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:852
+#: src/gtk/about.c:164 src/gtk/about.c:866
 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"
@@ -4095,7 +4184,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"
@@ -4104,7 +4193,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"
@@ -4113,95 +4202,100 @@ msgstr ""
 "Taaldefinitie: %s (tekenset: %s)\n"
 "Besturingssysteem: unknown"
 
-#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
+#: src/gtk/about.c:253 src/prefs_themes.c:940 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr "Het Claws Mail Team"
 
-#: src/gtk/about.c:267
+#: src/gtk/about.c:272
 msgid "Previous team members"
 msgstr "Voormalige teamleden"
 
-#: src/gtk/about.c:286
+#: src/gtk/about.c:291
 msgid "The translation team"
 msgstr "Het vertaalteam"
 
-#: src/gtk/about.c:305
+#: src/gtk/about.c:310
 msgid "Documentation team"
 msgstr "Documentatieteam"
 
-#: src/gtk/about.c:323
+#: src/gtk/about.c:328
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:342
+#: src/gtk/about.c:347
 msgid "Icons"
 msgstr "Pictogrammen"
 
-#: src/gtk/about.c:361
+#: src/gtk/about.c:366
 msgid "Contributors"
 msgstr "Medewerkers"
 
-#: src/gtk/about.c:409
+#: src/gtk/about.c:414
 msgid "Compiled-in Features"
 msgstr "Ingebouwde eigenschappen"
 
-#: src/gtk/about.c:426
+#: src/gtk/about.c:431
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "ondersteuning voor de X-Face-header\n"
 
-#: src/gtk/about.c:436
+#: src/gtk/about.c:441
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "ondersteuning voor spellingcontrole\n"
 
-#: src/gtk/about.c:446
+#: src/gtk/about.c:451
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "ondersteuning voor beveiligde verbindingen met servers\n"
 
-#: src/gtk/about.c:456
-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:467
+#: src/gtk/about.c:461
 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:477
+#: src/gtk/about.c:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "voegt ondersteuning toe voor IPv6-addressen\n"
+
+#: src/gtk/about.c:481
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "ondersteuning voor PalmOS-adresboeken\n"
 
-#: src/gtk/about.c:487
+#: src/gtk/about.c:491
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "ondersteuning voor gedeelde LDAP-adresboeken\n"
 
-#: src/gtk/about.c:497
+#: src/gtk/about.c:501
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "ondersteuning voor IMAP en NNTP-servers\n"
 
-#: src/gtk/about.c:507
+#: src/gtk/about.c:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "ondersteuning voor SVG-thema's\n"
+
+#: src/gtk/about.c:521
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "ondersteuning voor sessiebeheer\n"
 
-#: src/gtk/about.c:517
+#: src/gtk/about.c:531
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "ondersteuning voor veranderingen in netwerkverbinding\n"
 
-#: src/gtk/about.c:527
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "ondersteuning voor SVG-thema's\n"
+#: src/gtk/about.c:541
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "voegt ondersteuning toe voor OAuth2 authenticatie\n"
 
-#: src/gtk/about.c:559
+#: src/gtk/about.c:573
 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 "
@@ -4212,7 +4306,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:566
+#: src/gtk/about.c:580
 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 "
@@ -4224,7 +4318,7 @@ msgstr ""
 "of GESCHIKTHEID VOOR ENIG DOEL. Lees de GNU General Public License voor "
 "verdere details."
 
-#: src/gtk/about.c:585
+#: src/gtk/about.c:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4232,150 +4326,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:718 src/main.c:2710
+#: src/gtk/about.c:732 src/main.c:2749
 msgid "Session statistics\n"
 msgstr "Sessie-statistieken\n"
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
+#: src/gtk/about.c:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Gestart: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2729
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Inkomend verkeer\n"
 
-#: src/gtk/about.c:741 src/main.c:2732
+#: src/gtk/about.c:755 src/main.c:2771
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Ontvangen berichten: %d\n"
 
-#: src/gtk/about.c:748 src/main.c:2738
+#: src/gtk/about.c:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Uitgaand verkeer\n"
 
-#: src/gtk/about.c:751 src/main.c:2741
+#: src/gtk/about.c:765 src/main.c:2780
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nieuwe/doorverwezen berichten: %d\n"
 
-#: src/gtk/about.c:756 src/main.c:2745
+#: src/gtk/about.c:770 src/main.c:2784
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Beantwoorde berichten: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2749
+#: src/gtk/about.c:775 src/main.c:2788
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Doorgestuurde berichten: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2753
+#: src/gtk/about.c:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totaal uitgaande berichten: %d\n"
 
-#: src/gtk/about.c:793
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "Over Claws Mail"
 
-#: src/gtk/about.c:866
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Auteurs"
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:892
 msgid "_Features"
 msgstr "_Kenmerken"
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Licentie"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "_Opmerkingen bij deze uitgave"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "_Statistieken"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:364
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:368
 msgid "Red"
 msgstr "Rood"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:372
 msgid "Pink"
 msgstr "Roze"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:376
 msgid "Sky blue"
 msgstr "Hemelsblauw"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:380
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:384
 msgid "Green"
 msgstr "Groen"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:388
 msgid "Brown"
 msgstr "Bruin"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:392
 msgid "Grey"
 msgstr "Grijs"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:396
 msgid "Light brown"
 msgstr "Lichtbruin"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:400
 msgid "Dark red"
 msgstr "Donkerrood"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:404
 msgid "Dark pink"
 msgstr "Donkerroze"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:408
 msgid "Steel blue"
 msgstr "Staalblauw"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:412
 msgid "Gold"
 msgstr "Goud"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:416
 msgid "Bright green"
 msgstr "Heldergroen"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:420
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:242
 msgid "Set mailbox order"
 msgstr "Bepaal postvakvolgorde"
 
-#: src/gtk/foldersort.c:277
+#: src/gtk/foldersort.c:278
 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:311
+#: src/gtk/foldersort.c:312
 msgid "Mailboxes"
 msgstr "Postvakken"
 
+#: src/gtk/foldersort.c:328
+msgid "Move the selected mailbox up"
+msgstr "Verplaats het geselecteerde postvak naar boven"
+
+#: src/gtk/foldersort.c:334
+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."
@@ -4398,16 +4500,16 @@ msgstr "Kon woordenboek %s niet initialiseren:"
 msgid "No misspelled word found."
 msgstr "Geen onjuist gespelde woorden gevonden."
 
-#: src/gtk/gtkaspell.c:1451
+#: src/gtk/gtkaspell.c:1452
 msgid "Replace unknown word"
 msgstr "Vervang onbekend woord"
 
-#: src/gtk/gtkaspell.c:1467
+#: src/gtk/gtkaspell.c:1468
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Vervang \"%s\" met: "
 
-#: src/gtk/gtkaspell.c:1510
+#: src/gtk/gtkaspell.c:1512
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4415,55 +4517,55 @@ msgstr ""
 "Houd Control ingedrukt en druk op Enter\n"
 "om woord te leren.\n"
 
-#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1813 src/gtk/gtkaspell.c:1951
 msgid "More..."
 msgstr "Verder..."
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1869
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" onbekend in woordenboek '%s'"
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1885
 msgid "Accept in this session"
 msgstr "Accepteren in deze sessie"
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1895
 msgid "Add to personal dictionary"
 msgstr "Toevoegen aan persoonlijk woordenboek"
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1905
 msgid "Replace with..."
 msgstr "Vervangen door..."
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1918
 #, c-format
 msgid "Check with %s"
 msgstr "Controleren met %s"
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1940
 msgid "(no suggestions)"
 msgstr "(geen suggesties)"
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2014
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Woordenboek: %s"
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2029
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Gebruik andere (%s)"
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2040
 msgid "Use both dictionaries"
 msgstr "Gebruik beide woordenlijsten"
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2056 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "Controleer tijdens typen"
 
-#: src/gtk/gtkaspell.c:2154
+#: src/gtk/gtkaspell.c:2156
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4472,7 +4574,7 @@ msgstr ""
 "De spellingcontrole kon de woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2210
+#: src/gtk/gtkaspell.c:2212
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4481,26 +4583,26 @@ msgstr ""
 "De spellingcontrole kon de alternatieve woordenlijst niet veranderen.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1872
 msgid "Failed: no service record found."
 msgstr "Mislukt: geen service ingang gevonden."
 
-#: src/gtk/gtkutils.c:1871
+#: src/gtk/gtkutils.c:1875
 msgid "Failed: network error."
 msgstr "Mislukt: netwerkfout."
 
-#: src/gtk/gtkutils.c:1874
+#: src/gtk/gtkutils.c:1878
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Mislukt: onbekende fout (%d)."
 
-#: src/gtk/gtkutils.c:1944
+#: src/gtk/gtkutils.c:1948
 msgid "Configuring..."
 msgstr "Instellen..."
 
 #: 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:646 src/prefs_matcher.c:2223 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:472
 msgid "Date"
 msgstr "Datum"
 
@@ -4509,8 +4611,8 @@ 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/prefs_matcher.c:2220 src/prefs_summaries.c:638
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:470
 msgid "From"
 msgstr "Afzender"
 
@@ -4531,13 +4633,13 @@ msgid "Reply-To"
 msgstr "Antwoord aan"
 
 #: 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/prefs_matcher.c:2221 src/prefs_summaries.c:639
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:471
 msgid "To"
 msgstr "Aan"
 
 #: 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:2222 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Cc"
 
@@ -4546,7 +4648,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #: 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:2224 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Bericht-ID"
 
@@ -4559,7 +4661,7 @@ msgid "In-Reply-To"
 msgstr "In antwoord aan"
 
 #: 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:2226 src/quote_fmt.c:60
 msgid "References"
 msgstr "Verwijzingen"
 
@@ -4568,8 +4670,8 @@ msgid "References:"
 msgstr "Verwijzingen:"
 
 #: 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/prefs_matcher.c:2219 src/prefs_summaries.c:640
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:469
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -4667,7 +4769,7 @@ msgid "Received:"
 msgstr "Ontvangen:"
 
 #: 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:2225 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
 
@@ -4692,9 +4794,9 @@ msgid "Seen:"
 msgstr "Gezien:"
 
 #: 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/sslcertwindow.c:189 src/prefs_summaries.c:644
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1133 src/ssl_manager.c:124
+#: src/summaryview.c:2899
 msgid "Status"
 msgstr "Status"
 
@@ -4738,7 +4840,7 @@ msgstr "Applicatie:"
 msgid "Content-Type"
 msgstr "Inhoud-Type"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:346
+#: src/gtk/headers.h:42 src/image_viewer.c:341
 msgid "Content-Type:"
 msgstr "Inhoud-Type:"
 
@@ -4766,7 +4868,7 @@ msgstr "Voorrang"
 msgid "Precedence:"
 msgstr "Voorrang:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1268
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -4979,7 +5081,7 @@ msgid "Folder contains marked messages"
 msgstr "Map bevat gemarkeerde berichten"
 
 #: src/gtk/icon_legend.c:92
-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:93
@@ -5080,16 +5182,17 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:791
 #: src/plugins/address_keeper/address_keeper_prefs.c:273
-#: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:229
+#: src/plugins/archive/archiver_prefs.c:105
+#: src/plugins/attachwarner/attachwarner_prefs.c:233
 #: 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/keyword_warner/keyword_warner_prefs.c:233
 #: src/plugins/libravatar/libravatar_prefs.c:563
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
@@ -5105,7 +5208,7 @@ msgstr ""
 #: 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/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:925
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -5117,7 +5220,7 @@ msgstr "_Laden..."
 msgid "_Unload"
 msgstr "_Verwijderen"
 
-#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:234
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -5142,16 +5245,16 @@ msgstr "Plugins geladen"
 msgid "Page Index"
 msgstr "Pagina Inhoudsopgave"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 msgid "_Hide"
 msgstr "_Verberg"
 
 #: 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/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Account"
 
@@ -5385,7 +5488,7 @@ msgstr "Er ging iets mis tijdens het zoeken. Controleer de logs."
 msgid "From/To/Cc/Subject/Tag"
 msgstr "Van/Aan/Cc/Onderwerp/Vlag"
 
-#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Recursief"
 
@@ -5421,63 +5524,63 @@ msgstr "_Informatie"
 msgid "E_dit"
 msgstr "_Wijzigen"
 
-#: src/gtk/quicksearch.c:836 src/gtk/quicksearch.c:860 src/prefs_actions.c:349
+#: src/gtk/quicksearch.c:836 src/gtk/quicksearch.c:860 src/prefs_actions.c:351
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "Leeg _Log"
 
-#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#: src/gtk/sslcertwindow.c:180 src/ssl_manager.c:301
 #, c-format
 msgid "Correct%s"
 msgstr "Correct%s"
 
-#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
+#: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:182
 #: src/ssl_manager.c:301 src/ssl_manager.c:305
 msgid " (expired)"
 msgstr " (verlopen)"
 
-#: src/gtk/sslcertwindow.c:188
+#: src/gtk/sslcertwindow.c:187
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: src/gtk/sslcertwindow.c:189
+#: src/gtk/sslcertwindow.c:188
 msgid "Signer"
 msgstr "Ondergetekende"
 
-#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
+#: src/gtk/sslcertwindow.c:195 src/gtk/sslcertwindow.c:219
 msgid "Name: "
 msgstr "Naam: "
 
-#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:203 src/gtk/sslcertwindow.c:227
 msgid "Organization: "
 msgstr "Organisatie: "
 
-#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
+#: src/gtk/sslcertwindow.c:211 src/gtk/sslcertwindow.c:235
 msgid "Location: "
 msgstr "Locatie: "
 
-#: src/gtk/sslcertwindow.c:244
+#: src/gtk/sslcertwindow.c:243
 msgid "Fingerprint: \n"
 msgstr "Sleutel-vingerafdruk: \n"
 
-#: src/gtk/sslcertwindow.c:254
+#: src/gtk/sslcertwindow.c:253
 msgid "Signature status: "
 msgstr "Status van ondertekening: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:260
 msgid "Expired on: "
 msgstr "Verlopen op: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:260
 msgid "Expires on: "
 msgstr "Verloopt op: "
 
-#: src/gtk/sslcertwindow.c:328
+#: src/gtk/sslcertwindow.c:327
 #, 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:344
+#: src/gtk/sslcertwindow.c:343
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5488,7 +5591,7 @@ msgstr ""
 "Mogelijk verbind je met een onbetrouwbare server.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:363
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5497,39 +5600,39 @@ msgstr ""
 "Certificaat voor %s is onbekend.\n"
 "%sWil je het accepteren?"
 
-#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
-#: src/gtk/sslcertwindow.c:488
+#: src/gtk/sslcertwindow.c:373 src/gtk/sslcertwindow.c:423
+#: src/gtk/sslcertwindow.c:487
 msgid "Correct"
 msgstr "Correct"
 
-#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
-#: src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:375 src/gtk/sslcertwindow.c:425
+#: src/gtk/sslcertwindow.c:489
 #, c-format
 msgid "Signature status: %s"
 msgstr "Status van ondertekening: %s"
 
-#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:383 src/gtk/sslcertwindow.c:433
 msgid "_View certificate"
 msgstr "_Bekijk certificaat"
 
-#: src/gtk/sslcertwindow.c:390
-msgid "SSL/TLS certificate is invalid"
-msgstr "SSL/TLS-Certificaat is ongeldig"
+#: src/gtk/sslcertwindow.c:389
+msgid "TLS certificate is invalid"
+msgstr "TLS-Certificaat is ongeldig"
 
-#: src/gtk/sslcertwindow.c:392
-msgid "SSL/TLS certificate is unknown"
-msgstr "SSL/TLS-certificaat is onbekend"
+#: src/gtk/sslcertwindow.c:391
+msgid "TLS certificate is unknown"
+msgstr "TLS-certificaat is onbekend"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
-#: src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:394 src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:506
 msgid "_Cancel connection"
 msgstr "Verbinding afbreken"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:394 src/gtk/sslcertwindow.c:506
 msgid "_Accept and save"
 msgstr "_Accepteren en opslaan"
 
-#: src/gtk/sslcertwindow.c:413
+#: src/gtk/sslcertwindow.c:412
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5538,27 +5641,27 @@ msgstr ""
 "Certificaat voor %s is verlopen.\n"
 "%sWil je doorgaan?"
 
-#: src/gtk/sslcertwindow.c:440
-msgid "SSL/TLS certificate is invalid and expired"
-msgstr "SSL/TLS-certificaat is ongeldig en verlopen"
+#: src/gtk/sslcertwindow.c:439
+msgid "TLS certificate is invalid and expired"
+msgstr "TLS-certificaat is ongeldig en verlopen"
 
-#: src/gtk/sslcertwindow.c:442
-msgid "SSL/TLS certificate is expired"
-msgstr "SSL/TLS-certificaat is verlopen"
+#: src/gtk/sslcertwindow.c:441
+msgid "TLS certificate is expired"
+msgstr "TLS-certificaat is verlopen"
 
-#: src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:444
 msgid "_Accept"
 msgstr "_Accepteren"
 
-#: src/gtk/sslcertwindow.c:465
+#: src/gtk/sslcertwindow.c:464
 msgid "New certificate:"
 msgstr "Nieuw certificaat:"
 
-#: src/gtk/sslcertwindow.c:470
+#: src/gtk/sslcertwindow.c:469
 msgid "Known certificate:"
 msgstr "Bekend certificaat:"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:476
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5567,17 +5670,17 @@ msgstr ""
 "Certificaat voor %s is veranderd.\n"
 "%sWil je het accepteren?"
 
-#: src/gtk/sslcertwindow.c:498
+#: src/gtk/sslcertwindow.c:497
 msgid "_View certificates"
 msgstr "_Bekijk certificaten"
 
-#: src/gtk/sslcertwindow.c:503
-msgid "SSL/TLS certificate changed and is invalid"
-msgstr "SSL/TLS-certificaat is veranderd en ongeldig"
+#: src/gtk/sslcertwindow.c:502
+msgid "TLS certificate changed and is invalid"
+msgstr "TLS-certificaat is veranderd en ongeldig"
 
-#: src/gtk/sslcertwindow.c:505
-msgid "SSL/TLS certificate changed"
-msgstr "SSL/TLS-certificaat is veranderd"
+#: src/gtk/sslcertwindow.c:504
+msgid "TLS certificate changed"
+msgstr "TLS-certificaat is veranderd"
 
 #: src/headerview.c:94
 msgid "Tags:"
@@ -5585,223 +5688,222 @@ msgstr "Tags:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
-#: src/summaryview.c:3517 src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3500
+#: src/summaryview.c:3518 src/summaryview.c:3557
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
-#: src/summaryview.c:3571
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3569
+#: src/summaryview.c:3572
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/image_viewer.c:128
+#: src/image_viewer.c:101
 msgid "Error:"
 msgstr "Fout:"
 
-#: src/image_viewer.c:318 src/mimeview.c:2666
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: src/image_viewer.c:325
+#: src/image_viewer.c:320
 msgid "Filesize:"
 msgstr "Bestandsgrootte:"
 
-#: src/image_viewer.c:374
+#: src/image_viewer.c:369
 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"
@@ -5813,7 +5915,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"
@@ -5825,7 +5927,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"
@@ -5837,7 +5939,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"
@@ -5849,7 +5951,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"
@@ -5861,152 +5963,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:884 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:885 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:891 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 "
@@ -6015,20 +6127,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"
@@ -6080,7 +6192,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..."
 
@@ -6111,22 +6223,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: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:252 src/news_gtk.c:293
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, 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: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:254 src/plugins/mailmbox/plugin_gtk.c:421
+#: src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 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: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:280 src/news_gtk.c:315
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6134,31 +6246,33 @@ 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:372
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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:330
+#: 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:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:172
-#: src/plugins/vcalendar/vcal_folder.c:2014
+#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
+#: src/plugins/rssyl/rssyl_cb_menu.c:209
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
@@ -6185,7 +6299,7 @@ msgstr "_Zoeken"
 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:689
+#: src/imap_gtk.c:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -6218,8 +6332,8 @@ msgstr "abonneren"
 msgid "unsubscribe"
 msgstr "afmelden"
 
-#: 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:568 src/prefs_folder_item.c:1610 src/prefs_folder_item.c:1638
+#: src/prefs_folder_item.c:1666
 msgid "Apply to subfolders"
 msgstr "Pas toe op submappen"
 
@@ -6231,7 +6345,7 @@ msgstr "_Abonneren"
 msgid "_Unsubscribe"
 msgstr "_Afmelden"
 
-#: src/import.c:113 src/import.c:209
+#: src/import.c:113 src/import.c:212
 msgid "Import mbox file"
 msgstr "Importeer mbox-bestand"
 
@@ -6243,11 +6357,11 @@ msgstr "Geef het mbox-bestand en de doelmap op."
 msgid "Destination folder:"
 msgstr "Doelmap:"
 
-#: src/import.c:204
+#: src/import.c:207
 msgid "Source mbox filename can't be left empty."
 msgstr "Het bron-mboxbestand mag niet leeg blijven."
 
-#: src/import.c:209
+#: src/import.c:213
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6255,19 +6369,19 @@ msgstr ""
 "Doelmap is niet opgegeven.\n"
 "Mbox-bestand naar de inbox-map importeren?"
 
-#: src/import.c:231
+#: src/import.c:234
 msgid "Can't find the destination folder."
 msgstr "Kan de doelmap niet vinden."
 
-#: src/import.c:236
+#: src/import.c:239
 msgid "Importing mbox file..."
 msgstr "Importeren van mbox-bestand..."
 
-#: src/import.c:258
+#: src/import.c:261
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/import.c:276
+#: src/import.c:279
 msgid "Select folder to import to"
 msgstr "Selecteer map om naar te importeren"
 
@@ -6323,7 +6437,7 @@ msgstr "Selecteer het te importeren LDIF-bestand."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:466
+#: src/importldif.c:710 src/summaryview.c:467
 msgid "S"
 msgstr "S"
 
@@ -6423,142 +6537,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: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:407 src/prefs_summaries.c:647
+#: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 msgid "Locked"
 msgstr "Op slot"
 
-#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
+#: 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:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:894
+#: src/inc.c:897
 #, 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:931
 #, 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:935
 #, 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:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Authenticatie..."
 
-#: src/inc.c:1014
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Berichten ophalen van %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1035
 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:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:1064
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1080
 #, 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:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Verbinding maken met %s:%d mislukt."
 
-#: src/inc.c:1237
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail."
 
-#: src/inc.c:1243
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6567,37 +6681,37 @@ msgstr ""
 "Fout bij het verwerken van e-mail:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "De schijf is vol."
 
-#: src/inc.c:1254
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1259
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "Socket-fout."
 
-#: src/inc.c:1262
+#: src/inc.c:1265
 #, 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:1270 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:1273
 #, 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:1278
 msgid "Mailbox is locked."
 msgstr "Postvak zit op slot."
 
-#: src/inc.c:1279
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6606,11 +6720,11 @@ msgstr ""
 "Postvak zit op slot:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6619,7 +6733,7 @@ msgstr ""
 "Authenticatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1299 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6627,46 +6741,46 @@ msgstr ""
 "Sessie verlopen. Mogelijk kun je herstellen door de tijdslimiet te verhogen "
 "in Voorkeuren/Diversen/Overige."
 
-#: src/inc.c:1301
+#: src/inc.c:1304
 #, 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:1342
 msgid "Incorporation cancelled\n"
 msgstr "Het inbedden is afgelast\n"
 
-#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
+#: src/prefs_other.c:578 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:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: src/inc.c:1644
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uur"
 msgstr[1] "uur"
 
-#: src/inc.c:1656
+#: src/inc.c:1662
 #, 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:1668
 #, 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:1675
 msgid "On_ly once"
 msgstr "_Eenmalig"
 
@@ -6675,8 +6789,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"
@@ -6699,11 +6813,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:250
+#: src/main.c:252
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6712,7 +6826,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: src/main.c:380
+#: src/main.c:382
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6721,7 +6835,7 @@ msgstr ""
 "Er is een configuratiebestand %s gevonden.\n"
 "Wil je dit configuratiebestand overzetten?"
 
-#: src/main.c:382
+#: src/main.c:386
 #, c-format
 msgid ""
 "\n"
@@ -6734,11 +6848,11 @@ msgstr ""
 "Je Sylpheed filterregels kunnen omgezet worden door\n"
 "een script beschikbaar op %s."
 
-#: src/main.c:394
+#: src/main.c:399
 msgid "Keep old configuration"
 msgstr "Oude configuratie behouden"
 
-#: src/main.c:397
+#: src/main.c:402
 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 "
@@ -6748,31 +6862,27 @@ msgstr ""
 "maar kan even duren als je veel IMAP- of Nieuwsgegevens gecached hebt, en "
 "zal wat extra schijfruimte gebruiken."
 
-#: src/main.c:405
+#: src/main.c:410
 msgid "Migration of configuration"
 msgstr "Configuratiebestand overzetten"
 
-#: src/main.c:416
+#: src/main.c:421
 msgid "Copying configuration... This may take a while..."
 msgstr "Configuratiebestand wordt gekopiëerd... Dit kan even duren..."
 
-#: src/main.c:425
+#: src/main.c:430
 msgid "Migration failed!"
 msgstr "Overzetten mislukt."
 
-#: src/main.c:434
+#: src/main.c:439
 msgid "Migrating configuration..."
 msgstr "Configuratiebestand overzetten..."
 
-#: src/main.c:1146
-msgid "g_thread is not supported by glib.\n"
-msgstr "g_thread niet ondersteund door glib.\n"
-
-#: src/main.c:1166 src/main.c:1170 src/main.c:1174
+#: src/main.c:1210 src/main.c:1214 src/main.c:1218
 msgid "(or older)"
 msgstr "(of ouder)"
 
-#: src/main.c:1515
+#: src/main.c:1556
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6791,7 +6901,7 @@ msgstr[1] ""
 "instellingen voor meer informatie:\n"
 "%s"
 
-#: src/main.c:1557
+#: src/main.c:1598
 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 "
@@ -6802,7 +6912,7 @@ msgstr ""
 "Gebruik \"Ververs mappenboom\" in het contextmenu van deze map om dit "
 "proberen te repareren."
 
-#: src/main.c:1563
+#: src/main.c:1604
 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 "
@@ -6812,76 +6922,76 @@ msgstr ""
 "laden. Het postvak komt waarschijnlijk van een oude en externe plugin. "
 "Herinstalleer alstublieft deze plugin en probeer het nogmaals."
 
-#: src/main.c:1804
+#: src/main.c:1841
 msgid "Missing filename\n"
 msgstr "Bestandsnaam mist\n"
 
-#: src/main.c:1811
+#: src/main.c:1848
 msgid "Cannot open filename for reading\n"
 msgstr "Kan bestandsnaam niet openen om te lezen\n"
 
-#: src/main.c:1822
+#: src/main.c:1859
 msgid "Malformed header\n"
 msgstr "Vervormde header\n"
 
-#: src/main.c:1829
+#: src/main.c:1866
 msgid "Duplicated 'To:' header\n"
 msgstr "Gedupliceerde 'Aan:' header\n"
 
-#: src/main.c:1840
+#: src/main.c:1877
 msgid "Missing required 'To:' header\n"
 msgstr "Benodigde header 'Aan:' mist\n"
 
-#: src/main.c:1866
+#: src/main.c:1901
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr "%s. Probeer -h of --help voor het gebruik.\n"
 
-#: src/main.c:1893 src/main.c:1956
+#: src/main.c:1930 src/main.c:1993
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Benodigd bestand-argument ontbreekt voor optie %s"
 
-#: src/main.c:1915
+#: src/main.c:1952
 #, 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:1918
+#: src/main.c:1955
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Benodigd uri-argument ontbreekt voor optie %s"
 
-#: src/main.c:1951
+#: src/main.c:1988
 #, 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:2020
+#: src/main.c:2057
 #, 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:2023
+#: src/main.c:2060
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr "Benodigde type en aanvraag-argumenten ontbreken voor optie %s"
 
-#: src/main.c:2026
+#: src/main.c:2063
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Benodigd aanvraag-argument ontbreekt voor optie %s"
 
-#: src/main.c:2042
+#: src/main.c:2079
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:2044
+#: src/main.c:2081
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:2045
+#: src/main.c:2082
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6901,11 +7011,11 @@ msgstr ""
 "                         lege regel, daarna de e-mail-inhoud tot het einde "
 "van het bestand."
 
-#: src/main.c:2050
+#: src/main.c:2087
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe uri      abonneer indien mogelijk op gegeven URI"
 
-#: src/main.c:2051
+#: src/main.c:2088
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6915,7 +7025,7 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden bijgevoegd"
 
-#: src/main.c:2054
+#: src/main.c:2091
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6925,23 +7035,23 @@ msgstr ""
 "                         open venster \"Bericht opstellen\" met gegeven "
 "bestanden ingevoegd"
 
-#: src/main.c:2057
+#: src/main.c:2094
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:2058
+#: src/main.c:2095
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          haal nieuwe berichten op van alle accounts"
 
-#: src/main.c:2059
+#: src/main.c:2096
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     annuleer het ophalen van berichten"
 
-#: src/main.c:2060
+#: src/main.c:2097
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       annuleer het verzenden van berichten"
 
-#: src/main.c:2061
+#: src/main.c:2098
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6959,29 +7069,29 @@ msgstr ""
 "                         aanvraag: zoekstring\n"
 "                         recursief: false als arg. start met 0, n, N, f or F"
 
-#: src/main.c:2068
+#: src/main.c:2105
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verzend alle berichten in de wachtrij"
 
-#: src/main.c:2069
+#: src/main.c:2106
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      geef totaal aantal berichten weer"
 
-#: src/main.c:2070
+#: src/main.c:2107
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [map]... geef status van mappen weer"
 
-#: src/main.c:2072
+#: src/main.c:2109
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           geef statistieken van de sessie weer"
 
-#: src/main.c:2073
+#: src/main.c:2110
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     sessie-statistieken terugzetten"
 
-#: src/main.c:2074
+#: src/main.c:2111
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -6991,45 +7101,45 @@ msgstr ""
 "                         folder is a folder id like 'folder/sub_folder', a "
 "file:// uri or an absolute path"
 
-#: src/main.c:2076
+#: src/main.c:2113
 msgid "  --online               switch to online mode"
 msgstr "  --online               schakel over naar online-modus"
 
-#: src/main.c:2077
+#: src/main.c:2114
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schakel over naar offline-modus"
 
-#: src/main.c:2078
+#: src/main.c:2115
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       sluit Claws Mail af"
 
-#: src/main.c:2079
+#: src/main.c:2116
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d             foutopsporingsmodus"
 
-#: src/main.c:2080
+#: src/main.c:2117
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         foutopsporingsmodus aan of uit zetten"
 
-#: src/main.c:2081
+#: src/main.c:2118
 msgid "  --help -h              display this help"
 msgstr "  --help -h              geef deze hulp weer"
 
-#: src/main.c:2082
+#: src/main.c:2119
 msgid "  --version -v           output version information"
 msgstr "  --version -v           geef versie-informatie"
 
-#: src/main.c:2083
+#: src/main.c:2120
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 "  --version-full -V      geef versie-informatie en ingebouwde mogelijkheden"
 
-#: src/main.c:2084
+#: src/main.c:2121
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           print configuratiemap"
 
-#: src/main.c:2085
+#: src/main.c:2122
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -7037,7 +7147,7 @@ msgstr ""
 "  --alternate-config-dir directory\n"
 "                         gebruik opgegeven configuratiemap"
 
-#: src/main.c:2087
+#: src/main.c:2124
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -7045,869 +7155,874 @@ msgstr ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 
-#: src/main.c:2104
+#: src/main.c:2141
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Benodigd map-argument ontbreekt voor optie %s"
 
-#: src/main.c:2112
+#: src/main.c:2149
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Benodigd geometrie-argument ontbreekt voor optie %s"
 
-#: src/main.c:2123
+#: src/main.c:2160
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr "Benodigd map-argument ontbreekt voor optie %s"
 
-#: src/main.c:2156 src/main.c:2159
+#: src/main.c:2193 src/main.c:2196
 #, c-format
 msgid "Unknown option %s"
 msgstr "Onbekende optie %s"
 
-#: src/main.c:2175
+#: src/main.c:2212
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Verwerken (%s)..."
 
-#: src/main.c:2178
+#: src/main.c:2215
 msgid "top level folder"
 msgstr "map op hoogste niveaux"
 
-#: src/main.c:2260
+#: src/main.c:2297
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:2261
+#: src/main.c:2298
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:3014
+#: src/main.c:3055
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager: netwerk is beschikbaar.\n"
 
-#: src/main.c:3020
+#: src/main.c:3061
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: netwerk is niet beschikbaar.\n"
 
-#: src/mainwindow.c:522 src/messageview.c:211
+#: src/mainwindow.c:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "Beel_d"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "_Instellingen"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "_Postvak toevoegen"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Verander postvakvolgorde..."
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "_Importeer mbox-bestand..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "_Exporteer naar mbox-bestand..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "E_xporteer selectie naar mbox-bestand..."
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
 msgstr "Alle prullenbakken _leegmaken"
 
-#: src/mainwindow.c:545 src/messageview.c:220
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Opslaan e-mail als..."
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "Opslaan _deel als..."
 
-#: src/mainwindow.c:549 src/messageview.c:222
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Pagina-instellingen..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "Synchroniseer mappen"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "Af_sluiten"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "_Discussiedraad selecteren"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "_Zoek in huidige bericht..."
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "_Snelzoeken"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "_Toon of verberg"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "_Werkbalk"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "In _mappenlijst..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "In _berichtenlijst..."
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "_Weergave"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "_Sorteer"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "Ge_lijksoortige onderwerpen bij elkaar"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "Berichtenboom _uitklappen"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "Berichtenboom _inklappen"
 
-#: src/mainwindow.c:585 src/messageview.c:234
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Ga naar"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Vorige bericht"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "V_olgende bericht"
 
-#: src/mainwindow.c:589 src/messageview.c:238
+#: src/mainwindow.c:588 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:589 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Volgende o_ngelezen bericht"
 
-#: src/mainwindow.c:592 src/messageview.c:241
+#: src/mainwindow.c:591 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Vo_rige nieuwe bericht"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:592 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Volge_nde nieuwe bericht"
 
-#: src/mainwindow.c:595 src/messageview.c:244
+#: src/mainwindow.c:594 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Vorige ge_markeerde bericht"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:595 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Volgende gem_arkeerde bericht"
 
-#: src/mainwindow.c:598 src/messageview.c:247
+#: src/mainwindow.c:597 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Vorige bericht met _label"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:598 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Volgende bericht met l_abel"
 
-#: src/mainwindow.c:601 src/messageview.c:250
-msgid "Previous opened message"
+#: src/mainwindow.c:600
+msgid "Previously opened message"
 msgstr "Vorige geopende bericht"
 
-#: src/mainwindow.c:602 src/messageview.c:251
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Volgende geopende bericht"
 
-#: src/mainwindow.c:604 src/messageview.c:253
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Bovenliggende bericht"
 
-#: src/mainwindow.c:606 src/messageview.c:255
+#: src/mainwindow.c:605 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Volgende _ongelezen bericht"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "_Map..."
 
-#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:608 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Volgende deel"
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:609 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Vorige deel"
 
-#: src/mainwindow.c:613 src/messageview.c:260
+#: src/mainwindow.c:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Berichten schuiven"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Vorige regel"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:614 src/messageview.c:263
 msgid "Next line"
 msgstr "Volgende regel"
 
-#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
+#: src/mainwindow.c:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Vorige pagina"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Volgende pagina"
 
-#: src/mainwindow.c:635 src/messageview.c:282
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Decodeer"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:641
 msgid "Open in new _window"
 msgstr "_Nieuw venster"
 
-#: src/mainwindow.c:643 src/messageview.c:289
+#: src/mainwindow.c:642 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Br_on weergeven"
 
-#: src/mainwindow.c:645 src/messageview.c:290
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "Berichtendeel"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:645 src/messageview.c:292
 msgid "View as text"
 msgstr "Als tekst weergeven"
 
-#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Openen"
 
-#: src/mainwindow.c:649 src/messageview.c:294
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "Openen met..."
 
-#: src/mainwindow.c:653 src/messageview.c:297
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citaten"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "Berichtenlijst v_erversen"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "Ont_vangen"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "Ophalen van _huidige account"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "Ophalen van _alle accounts"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "Ophalen ann_uleren"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "Verzend berichten uit de _wachtrij"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "Nieuw _e-mailbericht opstellen"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:669
 msgid "Compose a news message"
 msgstr "Nieuw _Nieuwsbericht opstellen"
 
-#: src/mainwindow.c:672 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
+#: src/mainwindow.c:671 src/messageview.c:304
+#: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
 msgstr "Be_antwoord"
 
-#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
 msgstr "Mailing-_lijst"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:676
 msgid "Follow-up and reply to"
 msgstr "Beantwoorden en _opvolgen"
 
-#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
-#: src/toolbar.c:2449
+#: src/mainwindow.c:679 src/messageview.c:311 src/summaryview.c:438
+#: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
-#: src/toolbar.c:2450
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
+#: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr "Doorsturen als bijlage"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
-#: src/toolbar.c:2451
+#: src/mainwindow.c:681 src/messageview.c:313 src/summaryview.c:440
+#: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "Herverwi_jzen"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
 msgstr "Mailing-_Lijst"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Plaatsen"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "Help"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:692
 msgid "View archive"
 msgstr "Bekijk archief"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:694
 msgid "Contact owner"
 msgstr "Contact eigenaar"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "Ver_plaatsen..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "K_opiëren..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:700
 msgid "Move to _trash"
 msgstr "Naar _prullenbak"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "Ver_wijderen..."
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
 msgstr "Draad naar _prullenbak"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "_Verwijder draad"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Trek nieuwsartikel in"
 
-#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "_Markeren"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "_Demarkeren"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "Markeer _gelezen"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "Markeer _ongelezen"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Markeer alles gelezen in map"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:716
 msgid "Mark all unread in folder"
 msgstr "Markeer alles ongelezen in map"
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
-#: src/toolbar.c:503
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Draad negeren"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:719
 msgid "Unignore thread"
 msgstr "Draad niet meer negeren"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
-#: src/toolbar.c:504
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Volg draad"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Volg draad niet meer"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "Markeer als _spam"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:725
 msgid "Mark as _ham"
 msgstr "Markeer als _ham"
 
-#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
+#: src/mainwindow.c:728 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
 msgstr "Op slot"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Van slot"
 
-#: src/mainwindow.c:732 src/summaryview.c:441
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "_Kleurlabel"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "Ta_gs"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "_Wijzigen"
 
-#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "Verifieer ondertekening"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:743 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "A_fzender toevoegen aan adresboek"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:745
 msgid "C_ollect addresses"
 msgstr "_Verzamel adressen"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "Van huidige _map..."
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "Van geselecteerde _berichten..."
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "Alle berichten _filteren"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "Selectie _filteren"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "_Verwerkingsregels draaien voor map"
 
-#: src/mainwindow.c:755 src/messageview.c:320
+#: src/mainwindow.c:754 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:322
+#: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automatisch"
 
-#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:756 src/mainwindow.c:763 src/mainwindow.c:871
+#: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "A_fzender"
 
-#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
-#: src/messageview.c:323 src/messageview.c:329
+#: src/mainwindow.c:757 src/mainwindow.c:764 src/mainwindow.c:872
+#: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Aan"
 
-#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
-#: src/messageview.c:330
+#: src/mainwindow.c:758 src/mainwindow.c:765 src/messageview.c:325
+#: src/messageview.c:332
 msgid "By _Subject"
 msgstr "_Onderwerp"
 
-#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
+#: src/mainwindow.c:759 src/mainwindow.c:766 src/messageview.c:326
+#: src/messageview.c:333
+msgid "By S_ender"
+msgstr "Door _afzender"
+
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "Verwerkingsregel aanmaken"
 
-#: src/mainwindow.c:768 src/messageview.c:333
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Geef _URLs weer..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:776
 msgid "Ch_eck for new messages in all folders"
 msgstr "Alle mappen worden gecontroleerd op nieuwe berichten"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:777
 msgid "Delete du_plicated messages"
 msgstr "Verwijder _dubbele berichten"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "In geselecteerde map"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "In alle mappen"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "_Uitvoeren"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "_Weggooien"
 
-#: src/mainwindow.c:785
-msgid "SSL/TLS cer_tificates"
-msgstr "SSL/TLS-cer_tificaten"
+#: src/mainwindow.c:786
+msgid "TLS cer_tificates"
+msgstr "TLS-cer_tificaten"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Filterlo_g"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Netwerk_log"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "Foutopsporings_logboek"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "_Vergeet alle wachtwoorden van de sessie"
 
-#: src/mainwindow.c:796
-msgid "Forget _master passphrase"
+#: src/mainwindow.c:797
+msgid "Forget _primary passphrase"
 msgstr "Vergeet _hoofdwachtwoord"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "_Huidig account veranderen"
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "V_oorkeuren huidig account..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "_Nieuw account aanmaken..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "Account_beheer..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "_Voorkeuren..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "_Voorverwerken..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "_Naverwerken..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Filteren..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "_Sjablonen..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "_Acties..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "Tag_s..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "Plu_gins..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Handboek"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "_Online FAQ met bijdragen van gebruikers"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "Pictogram_legenda"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Instellen als standaard mailprogramma"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "_Werk offline"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "Men_ubalk"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "_Berichtweergave"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "_Statusbalk"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Kolomkoppen"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "Toon berichtenlijst in _boomvorm"
 
-#: src/mainwindow.c:837 src/prefs_summaries.c:667
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Gelezen draden verbergen"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "Gelezen berichten _verbergen"
 
-#: src/mainwindow.c:839 src/prefs_summaries.c:673
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Verberg verwijderde berichten"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "_Volledig venster"
 
-#: src/mainwindow.c:841 src/messageview.c:345
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Vo_lledige header weergeven"
 
-#: src/mainwindow.c:842 src/messageview.c:346
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Alles _opvouwen"
 
-#: src/mainwindow.c:843 src/messageview.c:347
+#: src/mainwindow.c:844 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Opvouwen vanaf niveau _2"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Opvouwen vanaf niveau _3"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Tekst _onder pictogrammen"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Tekst _naast pictogrammen"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "Alleen _pictogrammen"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "Alleen _tekst"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "_Standaard"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "3 _Kolommen"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "_Hele bericht"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "_Brede berichtenlijst"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "K_lein venster"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "Volgens _nummer"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "Volgens _grootte"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "Op _datum"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "Volgens datum van draad"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "Volgens _onderwerp"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "Volgens _kleurlabel"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "Volgens tag"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "Volgens _markering"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "Volgens _status"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "Volgens _bijlage"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "Volgens sc_ore"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "Volgens op slot"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "Ni_et sorteren"
 
-#: src/mainwindow.c:884 src/prefs_summaries.c:654
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: src/mainwindow.c:885 src/prefs_summaries.c:655
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Aflopend"
 
-#: src/mainwindow.c:927 src/messageview.c:390
+#: src/mainwindow.c:928 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Automatisch detecteren"
 
-#: src/mainwindow.c:1305 src/summaryview.c:6499
-msgid "Apply tags..."
-msgstr "Tags toepassen..."
+#: src/mainwindow.c:1306 src/summaryview.c:6511
+msgid "Modify tags..."
+msgstr "Tags wijzigen..."
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1964
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Fout(en) voorgekomen. Klik hier om het log te zien."
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1979
 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:1979
+#: src/mainwindow.c:1982
 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:1993
+#: src/mainwindow.c:1996
 msgid "Select account"
 msgstr "Selecteer account"
 
-#: src/mainwindow.c:2020 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Netwerklog"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Filtering/Processing debug log"
 msgstr "Filteren/Verwerken foutopsporingslogboek"
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:378
+#: src/mainwindow.c:2046 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "filterlog staat aan\n"
 
-#: src/mainwindow.c:2045 src/prefs_logging.c:380
+#: src/mainwindow.c:2048 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "filterlog staat uit\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:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: 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:1149
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:2897 src/mainwindow.c:2902
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten in de prullenbakken weggooien?"
 
-#: src/mainwindow.c:2898
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "Niet afsluiten"
 
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Postvak toevoegen"
 
-#: src/mainwindow.c:2930
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7921,18 +8036,18 @@ msgstr ""
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Het postvak '%s' bestaat al."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:742
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Postvak"
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7942,54 +8057,54 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen rechten om er te "
 "schrijven."
 
-#: src/mainwindow.c:3415
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Versturen niet toegestaan"
 
-#: src/mainwindow.c:3997
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Fout bij importeren mbox-bestand."
 
-#: src/mainwindow.c:4006 src/mainwindow.c:4015
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "Exporteren naar mbox-bestand mislukt."
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail afsluiten?"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Map synchronisatie"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Wil je alle mappen nu synchroniseren?"
 
-#: src/mainwindow.c:4259
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "_Synchroniseren"
 
-#: src/mainwindow.c:4737
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Dubbele berichten worden verwijderd..."
 
-#: src/mainwindow.c:4747
+#: src/mainwindow.c:4754
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Geen dubbel bericht gevonden in geselecteerde map.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4760
 #, 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:4757
+#: src/mainwindow.c:4764
 #, 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"
@@ -7998,117 +8113,117 @@ msgstr[0] ""
 msgstr[1] ""
 "%d dubbele berichten gemarkeerd voor verwijderen in geselecteerde map.\n"
 
-#: src/mainwindow.c:4795
+#: src/mainwindow.c:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Dubbele berichten worden verwijderd in alle mappen..."
 
-#: src/mainwindow.c:4801
+#: src/mainwindow.c:4808
 #, 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:4806
+#: src/mainwindow.c:4813
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Geen dubbel bericht gevonden in %d mappen.\n"
 
-#: src/mainwindow.c:4968 src/messageview.c:2634
+#: src/mainwindow.c:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Selecteer map om heen te gaan"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5942
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 msgid "Processing rules to apply before folder rules"
 msgstr "Verwerkingsregels toepassen voor mapregels"
 
-#: src/mainwindow.c:5077
+#: src/mainwindow.c:5086
 msgid "Processing rules to apply after folder rules"
 msgstr "Verwerkingsregels toepassen na mapregels"
 
-#: src/mainwindow.c:5085 src/summaryview.c:5953
+#: src/mainwindow.c:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Filters instellen"
 
-#: src/mainwindow.c:5200
+#: src/mainwindow.c:5207
 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:5259
+#: src/mainwindow.c:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail is geregistreerd als standaard mailprogramma."
 
-#: src/mainwindow.c:5261
+#: src/mainwindow.c:5300
 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:5275 src/setup.c:91
+#: src/mainwindow.c:5314 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Map wordt ingelezen %s%c%s..."
 
-#: src/mainwindow.c:5419
+#: src/mainwindow.c:5458
 #, 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:752 src/summary_search.c:455
 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"
@@ -8117,7 +8232,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"
@@ -8126,26 +8241,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:1897 src/prefs_themes.c:596
+#: src/mbox.c:549 src/mimeview.c:1794 src/prefs_themes.c:601
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: src/mbox.c:561
+#: src/mbox.c:558
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -8154,7 +8269,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..."
 
@@ -8186,19 +8301,23 @@ msgstr "Einde van bericht bereikt, verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:300 src/textview.c:249
+#: src/messageview.c:251
+msgid "Previous opened message"
+msgstr "Vorige geopende bericht"
+
+#: src/messageview.c:301 src/textview.c:272
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
+#: src/messageview.c:720 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Berichtenvenster"
 
-#: src/messageview.c:845
+#: src/messageview.c:850
 msgid "<No Return-Path found>"
 msgstr "<Geen Return-Path gevonden>"
 
-#: src/messageview.c:852
+#: src/messageview.c:857
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8213,36 +8332,36 @@ msgstr ""
 "Return path: %s\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:859
+#: src/messageview.c:864
 msgid "_Don't Send"
 msgstr "_Niet versturen"
 
-#: src/messageview.c:1366
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Ophalen van bericht (%s)..."
 
-#: src/messageview.c:1402 src/procmime.c:957
+#: src/messageview.c:1409 src/procmime.c:987
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Decoderen mislukt: %s"
 
-#: src/messageview.c:1483 src/messageview.c:1491
+#: src/messageview.c:1490 src/messageview.c:1498
 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:1868
+#: src/messageview.c:1882
 #, c-format
 msgid "Show all %s."
 msgstr "Geef alle %s weer."
 
-#: src/messageview.c:1870
+#: src/messageview.c:1884
 msgid "Only the first megabyte of text is shown."
 msgstr "Alleen de eerste megabyte tekst is weergegeven."
 
-#: src/messageview.c:1901
+#: src/messageview.c:1915
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8250,19 +8369,19 @@ msgstr ""
 "Je kreeg een ontvangstbevestiging in dit bericht: het is gezien door de "
 "ontvanger."
 
-#: src/messageview.c:1904
+#: src/messageview.c:1918
 msgid "You asked for a return receipt in this message."
 msgstr "Je hebt om een ontvangstbevestiging gevraagd voor dit bericht."
 
-#: src/messageview.c:1910
+#: src/messageview.c:1924
 msgid "This message asks for a return receipt."
 msgstr "Dit bericht vraagt om een ontvangstbevestiging."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1925
 msgid "Send receipt"
 msgstr "Ontvangstbevestiging versturen"
 
-#: src/messageview.c:1954
+#: src/messageview.c:1968
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8270,7 +8389,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "en is verwijderd van de server."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1974
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8279,15 +8398,15 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s."
 
-#: src/messageview.c:1964 src/messageview.c:1986
+#: src/messageview.c:1978 src/messageview.c:2000
 msgid "Mark for download"
 msgstr "Markeer voor ophalen"
 
-#: src/messageview.c:1965 src/messageview.c:1977
+#: src/messageview.c:1979 src/messageview.c:1991
 msgid "Mark for deletion"
 msgstr "Gemarkeerd om te verwijderen"
 
-#: src/messageview.c:1970
+#: src/messageview.c:1984
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8296,12 +8415,12 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden opgehaald."
 
-#: src/messageview.c:1975 src/messageview.c:1988
-#: src/prefs_filtering_action.c:176 src/toolbar.c:506
+#: src/messageview.c:1989 src/messageview.c:2002
+#: src/prefs_filtering_action.c:176 src/toolbar.c:516
 msgid "Unmark"
 msgstr "Demarkeer"
 
-#: src/messageview.c:1981
+#: src/messageview.c:1995
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8310,7 +8429,7 @@ msgstr ""
 "Dit bericht was gedeeltelijk opgehaald,\n"
 "het is %s en zal worden verwijderd."
 
-#: src/messageview.c:2058
+#: src/messageview.c:2072
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8324,20 +8443,20 @@ msgstr ""
 "officieel aan je gericht.\n"
 "Je wordt afgeraden een onvangstbevestiging te versturen."
 
-#: src/messageview.c:2066 src/messageview.c:2074
+#: src/messageview.c:2080 src/messageview.c:2088
 msgid "Return Receipt Notification"
 msgstr "Verstuur ontvangstbevestiging"
 
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2082 src/messageview.c:2093
 #: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2082 src/messageview.c:2093
 msgid "_Send Notification"
-msgstr "_Stuur melding"
+msgstr "Ver_stuur melding"
 
-#: src/messageview.c:2075
+#: src/messageview.c:2089
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8348,11 +8467,11 @@ msgstr ""
 "gebruiken.\n"
 "Kies het account vanaf welke je de ontvangstbevestiging wilt versturen:"
 
-#: src/messageview.c:2171 src/messageview.c:2190
+#: src/messageview.c:2185 src/messageview.c:2204
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Kan niet afdrukken: het bericht bevat geen tekst."
 
-#: src/messageview.c:2944
+#: src/messageview.c:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8360,7 +8479,7 @@ msgstr ""
 "\n"
 " Er zijn geen berichten in deze map"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8368,7 +8487,7 @@ msgstr ""
 "\n"
 " Bericht is verwijderd"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8376,8 +8495,8 @@ msgstr ""
 "\n"
 "  Bericht is verplaatst naar de prullenbak of naar een andere map"
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
-#: src/summaryview.c:7302
+#: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4424
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "Er is een fout opgetreden tijdens het leren.\n"
 
@@ -8385,7 +8504,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..."
 
@@ -8449,32 +8568,32 @@ msgstr "_Alles op_slaan..."
 msgid "MIME Type"
 msgstr "MIME-Type"
 
-#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
-#: src/mimeview.c:1068
+#: src/mimeview.c:1049 src/mimeview.c:1054 src/mimeview.c:1059
+#: src/mimeview.c:1064
 msgid "View full information"
 msgstr "Bekijk volledige informatie"
 
-#: src/mimeview.c:1074
+#: src/mimeview.c:1071
 msgid "Check again"
 msgstr "Opnieuw controleren"
 
-#: src/mimeview.c:1086
+#: src/mimeview.c:1084
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s Klik het pictogram om te controleren."
 
-#: src/mimeview.c:1088
+#: src/mimeview.c:1086
 #, 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."
 
-#: src/mimeview.c:1098
+#: src/mimeview.c:1093
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 "Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
 "pictogram om het opnieuw te proberen."
 
-#: src/mimeview.c:1100
+#: src/mimeview.c:1095
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8482,87 +8601,100 @@ msgstr ""
 "Controleren van ondertekening niet gelukt binnen de tijdslimiet. Klik het "
 "pictogram of klik op '%s' om het opnieuw te proberen."
 
-#: src/mimeview.c:1345
+#: src/mimeview.c:1102
+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:1104
+#, 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:1223
 msgid "Checking signature..."
 msgstr "Ondertekening wordt geverifieerd..."
 
-#: src/mimeview.c:1386
+#: src/mimeview.c:1278
 msgid "Go back to email"
 msgstr "Ga terug naar bericht"
 
-#: 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:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, 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:1894
+#: src/mimeview.c:1791
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Bestaand bestand '%s' overschrijven?"
 
-#: src/mimeview.c:1918
+#: src/mimeview.c:1816
 #, 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:1921
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
 msgstr "Fout bij opslaan van alle berichtdelen"
 
-#: src/mimeview.c:1922
-msgid "Skip"
-msgstr "Overslaan"
+#: src/mimeview.c:1820
+msgid "Ignore"
+msgstr "Negeren"
 
-#: src/mimeview.c:1922
-msgid "Skip all"
-msgstr "Alles overslaan"
+#: src/mimeview.c:1820
+msgid "Ignore all"
+msgstr "Alles negeren"
 
-#: src/mimeview.c:1932
+#: src/mimeview.c:1832
 #, 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:1940
+#: src/mimeview.c:1844
 #, 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:1945
+#: src/mimeview.c:1849
 #, 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:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1886 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Selecteer doelmap"
 
-#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1893 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' is geen map."
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
-#: src/summaryview.c:5035
+#: src/mimeview.c:2011 src/plugins/fancy/fancy_viewer.c:708
+#: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: src/mimeview.c:2232 src/mimeview.c:2239
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
 msgstr "Open met"
 
-#: src/mimeview.c:2233 src/mimeview.c:2240
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8571,7 +8703,7 @@ msgstr ""
 "Geef de opdracht om het bestand mee te openen:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/mimeview.c:2335
+#: src/mimeview.c:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8582,11 +8714,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Onbekend programma uitvoeren?"
 
-#: src/mimeview.c:2344
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8599,22 +8731,22 @@ msgstr ""
 "\n"
 "Wil je dit programma uitvoeren?"
 
-#: src/mimeview.c:2348
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "Draai programma"
 
-#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2561
 msgid "Type:"
 msgstr "Type:"
 
-#: 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:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 msgid "Size:"
 msgstr "Grootte:"
 
-#: 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:2576 src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
 msgstr "Beschrijving:"
 
@@ -8663,34 +8795,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"
@@ -8721,73 +8853,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 "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
+#: 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 "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 "OAuth2 encoded: %s\n"
 msgstr "OAuth2 versleuteld: %s\n"
 
-#: src/oauth2.c:585
+#: src/oauth2.c:690
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -8797,11 +8938,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:67
@@ -8809,16 +8950,16 @@ msgid "New passphrases do not match, try again."
 msgstr "Nieuwe wachtwoorden komen niet overeen, probeer nogmaals."
 
 #: src/password_gtk.c:80
-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"
+msgid "Changing primary passphrase"
 msgstr "Wijzigen hoofdwachtwoord"
 
 #: src/password_gtk.c:165
 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"
@@ -8836,11 +8977,11 @@ msgstr "Nieuw wachtwoord:"
 msgid "Confirm passphrase:"
 msgstr "Bevestig wachtwoord:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:53
+#: src/plugins/acpi_notifier/acpi_notifier.c:52
 msgid "Acpi Notifier"
 msgstr "Acpi-meldingen"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:68
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8848,7 +8989,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:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:70
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8856,19 +8997,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:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:72
 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:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 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:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 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:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8876,78 +9017,79 @@ msgstr ""
 "Controleer dat apanelc geinstalleerd is.\n"
 "Je kunt het verkrijgen op 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:208
+#: src/plugins/acpi_notifier/acpi_notifier.c:214
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
 msgid "Control file doesn't exist."
 msgstr "Beheer bestand bestaat niet."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:306
 msgid " : no new or unread mail"
 msgstr " : geen nieuwe of ongelezen mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : unread mail"
 msgstr " : ongelezen mail"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : new mail"
 msgstr " : nieuwe mail"
 
-#: 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:310
+#: src/plugins/acpi_notifier/acpi_notifier.c:316
+#: src/plugins/acpi_notifier/acpi_notifier.c:322
 msgid "off"
 msgstr "uit"
 
-#: 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:312
+#: src/plugins/acpi_notifier/acpi_notifier.c:318
+#: src/plugins/acpi_notifier/acpi_notifier.c:324
 msgid "blinking"
 msgstr "knipperend"
 
-#: 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:314
+#: src/plugins/acpi_notifier/acpi_notifier.c:320
+#: src/plugins/acpi_notifier/acpi_notifier.c:326
 msgid "on"
 msgstr "aan"
 
-#: 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:348
+#: src/plugins/acpi_notifier/acpi_notifier.c:357
+#: src/plugins/acpi_notifier/acpi_notifier.c:372
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:388
+#: src/plugins/acpi_notifier/acpi_notifier.c:387
 msgid "ACPI type: "
 msgstr "ACPI-type: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:397
+#: src/plugins/acpi_notifier/acpi_notifier.c:396
 msgid "ACPI file: "
 msgstr "ACPI-bestand: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:408
+#: src/plugins/acpi_notifier/acpi_notifier.c:407
 msgid "values - On: "
 msgstr "waardes - Aan: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:413
+#: src/plugins/acpi_notifier/acpi_notifier.c:412
 msgid " - Off: "
 msgstr " - Uit: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:435
+#: src/plugins/acpi_notifier/acpi_notifier.c:434
 msgid "Blink when user interaction is required"
 msgstr "Knipperen wanneer interactie gevraagd wordt"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:869
+#: src/plugins/acpi_notifier/acpi_notifier.c:868
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "Deze plugin regelt verschillende ACPI-mail-LEDs."
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:890
+#: src/plugins/acpi_notifier/acpi_notifier.c:889
 msgid "Laptop LED"
 msgstr "Laptop-LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/attachwarner/attachwarner.c:253
+#: src/plugins/keyword_warner/keyword_warner.c:231
 msgid "Failed to register check before send hook"
 msgstr "Registreren van 'check before send'-hook is mislukt"
 
@@ -8975,7 +9117,7 @@ msgstr "Adresboek pad waar adressen opgeslagen worden"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:123
 #: 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:466
 #: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
 #: src/prefs_matcher.c:690
@@ -9001,7 +9143,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"
 
@@ -9209,17 +9351,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: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:721 src/prefs_folder_item.c:531
+#: src/prefs_folder_item.c:1262 src/prefs_folder_item.c:1294
 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:724 src/prefs_folder_item.c:530
+#: src/prefs_folder_item.c:1261 src/prefs_folder_item.c:1293
+#: src/prefs_summaries.c:407
 msgid "No"
 msgstr "Geen"
 
@@ -9236,7 +9378,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"
 
@@ -9244,104 +9386,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"
@@ -9351,12 +9493,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"
@@ -9366,7 +9508,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"
@@ -9374,11 +9516,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]"
@@ -9386,60 +9528,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"
@@ -9451,34 +9593,38 @@ 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/managesieve/sieve_manager.c:771
+#: src/plugins/archive/archiver_prefs.c:424
+#: src/plugins/managesieve/sieve_manager.c:772
 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:337
+#: src/plugins/att_remover/att_remover.c:305
+msgid "Filename"
+msgstr "Bestandsnaam"
+
+#: src/plugins/att_remover/att_remover.c:336
 msgid "Remove attachments"
 msgstr "Verwijder bijlages"
 
-#: src/plugins/att_remover/att_remover.c:363
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
+#: src/plugins/att_remover/att_remover.c:362
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1199
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: 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:370 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:79 src/summaryview.c:2883
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: src/plugins/att_remover/att_remover.c:425
+#: src/plugins/att_remover/att_remover.c:424
 msgid "Destroy attachments"
 msgstr "Vernietig bijlages"
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:425
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9488,34 +9634,34 @@ msgstr ""
 "\n"
 "De verwijderde gegevens kunnen niet teruggehaald worden."
 
-#: src/plugins/att_remover/att_remover.c:469
+#: src/plugins/att_remover/att_remover.c:468
 msgid "The selected messages don't have any attachments."
 msgstr "Het geselecteerde bericht bevat geen bijlages."
 
-#: src/plugins/att_remover/att_remover.c:472
+#: src/plugins/att_remover/att_remover.c:471
 #, 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:475
+#: src/plugins/att_remover/att_remover.c:474
 #, 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:504
+#: src/plugins/att_remover/att_remover.c:503
 msgid "This message doesn't have any attachments."
 msgstr "Dit bericht bevat geen bijlages."
 
-#: src/plugins/att_remover/att_remover.c:517
+#: src/plugins/att_remover/att_remover.c:516
 msgid "Remove attachments..."
 msgstr "Verwijderen bijlages..."
 
-#: src/plugins/att_remover/att_remover.c:529
-#: src/plugins/att_remover/att_remover.c:589
+#: src/plugins/att_remover/att_remover.c:528
+#: src/plugins/att_remover/att_remover.c:588
 msgid "AttRemover"
 msgstr "Bijlage verwijderaar"
 
-#: src/plugins/att_remover/att_remover.c:594
+#: src/plugins/att_remover/att_remover.c:593
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9527,11 +9673,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:618
+#: src/plugins/att_remover/att_remover.c:617
 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 "
@@ -9545,17 +9691,17 @@ 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.c:283
+#: src/plugins/attachwarner/attachwarner.c:335
+#: src/plugins/attachwarner/attachwarner_prefs.c:234
+msgid "AttachWarner"
 msgstr "Bijlage waarschuwingen"
 
-#: src/plugins/attachwarner/attachwarner.c:292
+#: src/plugins/attachwarner/attachwarner.c:293
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9568,23 +9714,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:87
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:87
 msgid "Expressions are case sensitive"
 msgstr "Expressies zijn hoofdlettergevoelig"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:93
+#: src/plugins/attachwarner/attachwarner_prefs.c:94
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:94
 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:115
+#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:116
 msgid "Lines starting with quotation marks"
 msgstr "Regels beginnend met citaatmarkeringen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:122
+#: src/plugins/attachwarner/attachwarner_prefs.c:124
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:124
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
@@ -9594,22 +9748,26 @@ msgstr ""
 "Opmerking: handgemaakte citaten kunnen niet worden onderscheiden van citaten "
 "die gegenereerd zijn bij het antwoorden."
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/attachwarner/attachwarner_prefs.c:129
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:129
 msgid "Forwarded or redirected messages"
 msgstr "Doorgestuurde of herverwezen berichten"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:132
+#: src/plugins/attachwarner/attachwarner_prefs.c:137
 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:135 src/prefs_msg_colors.c:310
+#: src/plugins/attachwarner/attachwarner_prefs.c:140
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:140
+#: src/prefs_msg_colors.c:310
 msgid "Signatures"
 msgstr "Ondertekeningen"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:142
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:147
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9617,49 +9775,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:148
-msgid "Warn when"
-msgstr "Waarschuwen wanneer"
+#: src/plugins/attachwarner/attachwarner_prefs.c:156
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:156
+msgid "Exclude"
+msgstr "Uitgezonderd"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:152
-msgid "Excluding"
-msgstr "Uitsluiten"
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
-msgid "Attach Warner"
-msgstr "Bijlage waarschuwingen"
-
-#: 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/prefs_matcher.c:2590
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1663 src/prefs_matcher.c:1670
+#: src/prefs_matcher.c:1678 src/prefs_matcher.c:1680 src/prefs_matcher.c:2592
+#: src/prefs_matcher.c:2596
 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"
@@ -9671,7 +9822,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` "
@@ -9685,7 +9836,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."
@@ -9731,39 +9882,39 @@ 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:419
 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:377
 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:386
 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:389 src/prefs_account.c:1718
-msgid "KB"
-msgstr "KB"
+#: src/plugins/bsfilter/bsfilter_gtk.c:162
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1748
+msgid "KiB"
+msgstr "KiB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
@@ -9778,7 +9929,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:435
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
@@ -9787,7 +9938,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:441
 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"
@@ -9819,13 +9970,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:456
 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:460
 msgid ""
 "Messages coming from your address book contacts will be received in the "
@@ -9835,13 +9986,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:470
 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"
 
@@ -9862,24 +10013,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:448
 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"
@@ -9891,7 +10042,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 "
@@ -9900,11 +10051,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 "
@@ -9932,12 +10083,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:427
 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."
@@ -9945,11 +10096,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"
 
@@ -9978,12 +10129,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"
@@ -9992,20 +10143,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"
@@ -10015,7 +10166,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"
@@ -10025,7 +10176,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"
@@ -10068,7 +10219,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"
 
@@ -10182,7 +10333,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"
@@ -10191,7 +10342,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"
@@ -10200,44 +10351,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."
@@ -10246,7 +10397,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"
@@ -10288,8 +10439,8 @@ msgstr "Open in weergever (inhoud van de server wordt geladen)"
 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:4306
-#: src/prefs_proxy.c:241
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4360
+#: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -10340,7 +10491,7 @@ msgstr "De CSS in dit bestand wordt toegepast op alle HTML-delen"
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: 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_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Bekijk"
@@ -10349,89 +10500,90 @@ msgstr "Bekijk"
 msgid "Select stylesheet"
 msgstr "Stijlblad selecteren"
 
-#: src/plugins/fancy/fancy_viewer.c:420
+#: src/plugins/fancy/fancy_viewer.c:421
 msgid "Remote content loading is disabled."
 msgstr "Inhoud van de server laden is uitgezet."
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:500
 msgid "Load images"
 msgstr "Laad afbeeldingen"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:502
 msgid "Enable remote content"
 msgstr "Deblokkeer externe inhoud"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:504
 msgid "Enable Javascript"
 msgstr "Zet Javascript Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:506
 msgid "Enable Plugins"
 msgstr "Zet Plugins Aan"
 
-#: src/plugins/fancy/fancy_viewer.c:507
+#: src/plugins/fancy/fancy_viewer.c:508
 msgid "Enable Java"
 msgstr "Java activeren"
 
-#: src/plugins/fancy/fancy_viewer.c:509
+#: src/plugins/fancy/fancy_viewer.c:510
 msgid "Open links with external browser"
 msgstr "Open koppelingen met externe browser"
 
-#: src/plugins/fancy/fancy_viewer.c:684
+#: src/plugins/fancy/fancy_viewer.c:688
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "Een fout gebeurde: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:748
 #, 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:755
+#: src/plugins/fancy/fancy_viewer.c:759
 msgid "Search the Web"
 msgstr "Zoeken op het Web"
 
-#: src/plugins/fancy/fancy_viewer.c:766
+#: src/plugins/fancy/fancy_viewer.c:770
 msgid "Open in Viewer"
 msgstr "Open in weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:775
+#: src/plugins/fancy/fancy_viewer.c:779
 msgid "Open in Browser"
 msgstr "Open in Browser"
 
-#: src/plugins/fancy/fancy_viewer.c:785
+#: src/plugins/fancy/fancy_viewer.c:789
 msgid "Open Image"
 msgstr "Open Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:794
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Copy Link"
 msgstr "Kopieer koppeling"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:802
 msgid "Download Link"
 msgstr "Haal koppeling op"
 
-#: src/plugins/fancy/fancy_viewer.c:809
+#: src/plugins/fancy/fancy_viewer.c:813
 msgid "Save Image As"
 msgstr "Sla Afbeelding Op Als"
 
-#: src/plugins/fancy/fancy_viewer.c:819
+#: src/plugins/fancy/fancy_viewer.c:823
 msgid "Copy Image"
 msgstr "Kopieer Afbeelding"
 
-#: src/plugins/fancy/fancy_viewer.c:859
+#: src/plugins/fancy/fancy_viewer.c:863
 msgid "Import feed"
 msgstr "Importeer feed"
 
-#: src/plugins/fancy/fancy_viewer.c:1141
+#: src/plugins/fancy/fancy_viewer.c:1145
 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:1173
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML Weergever"
 
-#: src/plugins/fancy/fancy_viewer.c:1174
+#: src/plugins/fancy/fancy_viewer.c:1178
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10443,17 +10595,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 "
@@ -10467,10 +10624,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"
@@ -10479,10 +10638,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)"
@@ -10490,6 +10646,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"
@@ -10498,6 +10655,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"
@@ -10506,6 +10664,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"
@@ -10514,6 +10673,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"
@@ -10656,12 +10816,12 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData-plugin: Starten van vernieuwing autorisatie\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 msgid "Authentication"
 msgstr "Authenticatie"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
@@ -10710,6 +10870,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:261
+#: src/plugins/keyword_warner/keyword_warner.c:314
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:234
+msgid "Keyword Warner"
+msgstr "Sleutelwoorden waarschuwingen"
+
+#: src/plugins/keyword_warner/keyword_warner.c:271
+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:137
+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
@@ -10787,7 +10985,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
@@ -10839,8 +11037,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: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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "uur"
 
@@ -10985,15 +11183,15 @@ msgstr ""
 msgid "Size of image cache in megabytes"
 msgstr "Grootte van afbeeldings-cache in megabytes"
 
-#: src/plugins/litehtml_viewer/lh_prefs.c:148
+#: src/plugins/litehtml_viewer/lh_prefs.c:149
 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"
 
@@ -11009,15 +11207,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"
 
@@ -11031,74 +11229,65 @@ msgstr ""
 "Als een bestaand postvak wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: 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 ""
-"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:5834
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5844
 msgid "_Filter"
 msgstr "_Filter"
 
@@ -11205,20 +11394,20 @@ msgstr "Verbinden..."
 msgid "Manage Sieve Filters"
 msgstr "Beheer Sieve-filters"
 
-#: 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."
 
@@ -11226,7 +11415,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:1265
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1292
 msgid "Server information"
 msgstr "Serverinformatie"
 
@@ -11277,30 +11466,30 @@ 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:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1487
+#: src/prefs_account.c:2108
 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: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/vcalendar/vcal_prefs.c:400
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/wizard.c:1635
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 msgid "Authentication method"
 msgstr "Authenticatie-methode"
 
-#: 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:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -11350,7 +11539,7 @@ msgstr ""
 msgid "Log file"
 msgstr "Logbestand"
 
-#: src/plugins/notification/notification_banner.c:357
+#: src/plugins/notification/notification_banner.c:356
 msgid "Folder:"
 msgstr "Map:"
 
@@ -11367,7 +11556,7 @@ 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_plugin.c:418
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -11377,48 +11566,47 @@ msgstr "Geen nieuwe berichten"
 #: src/plugins/notification/notification_prefs.c:505
 #: src/plugins/notification/notification_prefs.c:523
 msgid "Notification"
-msgstr "Melding"
+msgstr "Meldingen"
 
-#: src/plugins/notification/notification_plugin.c:225
-msgid "The Notification plugin needs threading support."
-msgstr "De Melding-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 Melding-plugin is mislukt"
+"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 Melding-plugin is mislukt"
+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 Melding-plugin is mislukt"
+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 Melding-plugin is mislukt"
+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 Melding-plugin is mislukt"
+"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 Melding-plugin is mislukt"
+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 Melding-plugin is mislukt"
+"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 Melding-plugin is mislukt"
+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"
@@ -11433,7 +11621,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"
 
@@ -11538,7 +11726,7 @@ msgstr "Banner"
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:267
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Opdracht"
@@ -11600,13 +11788,13 @@ msgid "Show banner"
 msgstr "Geef banner weer"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: 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:768 src/prefs_receive.c:229
-#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
+#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
 msgid "Always"
 msgstr "Altijd"
 
@@ -12042,7 +12230,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)..."
 
@@ -12058,35 +12246,35 @@ msgstr "Wachtwoord"
 msgid "[no user id]"
 msgstr "[geen gebruikers-ID]"
 
-# c-format
 #: src/plugins/pgpcore/passphrase.c:261
-msgid "Please enter the passphrase for the new key:"
-msgstr "Geef het wachtwoord voor de nieuwe sleutel:"
-
-#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr "Wachtwoord was niet hetzelfde.\n"
 
 # c-format
-#: src/plugins/pgpcore/passphrase.c:268
+#: src/plugins/pgpcore/passphrase.c:262
+msgid "Please enter the passphrase for the new key:"
+msgstr "Geef het wachtwoord voor de nieuwe sleutel:"
+
+# c-format
+#: src/plugins/pgpcore/passphrase.c:266
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "Geef nogmaals het wachtwoord voor de nieuwe sleutel:"
 
-#: src/plugins/pgpcore/passphrase.c:273
-msgid "Please enter the passphrase for:"
-msgstr "Geef het wachtwoord voor:"
-
-#: src/plugins/pgpcore/passphrase.c:276
+#: src/plugins/pgpcore/passphrase.c:270
 msgid "Bad passphrase.\n"
 msgstr "Fout wachtwoord. Probeer opnieuw...\n"
 
+#: src/plugins/pgpcore/passphrase.c:271
+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?"
@@ -12190,7 +12378,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"
@@ -12227,8 +12415,8 @@ msgstr ""
 "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:1862
-#: src/prefs_account.c:2161 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuten"
 
@@ -12287,69 +12475,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"
@@ -12369,180 +12557,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 "
@@ -12551,12 +12738,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."
@@ -12564,7 +12751,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"
@@ -12572,11 +12759,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"
@@ -12586,12 +12773,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:1173 src/plugins/pgpcore/sgpgme.c:1195
 #, 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:1183
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12599,11 +12786,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:1201
 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:1205
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12616,62 +12803,41 @@ msgstr ""
 "\n"
 "Wil je de sleutel exporteren naar een sleutelserver?"
 
-#: src/plugins/pgpcore/sgpgme.c:1020
+#: src/plugins/pgpcore/sgpgme.c:1209
 msgid "Key generated"
 msgstr "Seutel aangemaakt"
 
-#: src/plugins/pgpcore/sgpgme.c:1096
+#: src/plugins/pgpcore/sgpgme.c:1285
 msgid "Key exported."
 msgstr "Sleutel geëxporteerd."
 
-#: src/plugins/pgpcore/sgpgme.c:1098
+#: src/plugins/pgpcore/sgpgme.c:1287
 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"
@@ -12679,53 +12845,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."
@@ -12733,17 +12907,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"
 
@@ -12770,35 +12944,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."
@@ -12806,7 +12976,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"
 
@@ -12832,7 +13002,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"
@@ -12853,9 +13023,9 @@ msgstr "Geef Python-console weer..."
 msgid "Refresh"
 msgstr "Verversen"
 
-#: 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:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
+#: src/wizard.c:1625
 msgid "Browse"
 msgstr "Bekijk"
 
@@ -12963,7 +13133,7 @@ msgstr ""
 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"
@@ -13028,40 +13198,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:285 src/plugins/rssyl/rssyl_cb_menu.c:332
 #: 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:358
 #, 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:359
 msgid "Remove feed tree"
 msgstr "Verwijder feedboom"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_cb_menu.c:393
 msgid "Select an OPML file"
 msgstr "Selecteer een OPML bestand"
 
@@ -13160,9 +13330,9 @@ msgstr ""
 "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/vcalendar/vcal_prefs.c:594
+msgid "Verify TLS certificate validity"
+msgstr "Verifieer geldigheid van TLS-certificaat"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:380
 msgid "User name"
@@ -13177,8 +13347,8 @@ 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: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/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dagen"
 
@@ -13277,8 +13447,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"
@@ -13321,13 +13491,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)"
 
@@ -13336,7 +13506,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)"
 
@@ -13408,7 +13578,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"
@@ -13432,8 +13602,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 "
@@ -13445,24 +13615,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."
@@ -13470,21 +13640,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"
@@ -13500,7 +13670,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"
 
@@ -13512,7 +13682,7 @@ msgstr "Aangezet"
 msgid "Forward to:"
 msgstr "Doorsturen aan:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
 msgid "Password:"
 msgstr "Wachtwoord:"
 
@@ -13555,15 +13725,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 "
@@ -13670,29 +13840,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"
@@ -13705,115 +13875,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:594 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:602 src/plugins/vcalendar/month-view.c:689
 msgid "Start"
 msgstr "Start"
 
-#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:702
 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:798
+#: src/plugins/vcalendar/month-view.c:797
 msgid "Week number"
 msgstr "Weeknummer"
 
-#: src/plugins/vcalendar/month-view.c:889
+#: src/plugins/vcalendar/month-view.c:888
 msgid "Previous month"
 msgstr "Vorige maand"
 
-#: src/plugins/vcalendar/month-view.c:909
+#: src/plugins/vcalendar/month-view.c:908
 msgid "Next month"
 msgstr "Volgende maand"
 
@@ -13888,7 +14058,7 @@ msgstr "Je hebt een Todo item."
 
 #: 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:506 src/plugins/vcalendar/vcalendar.c:715
 msgid "Details follow:"
 msgstr "Details volgen:"
 
@@ -13912,15 +14082,15 @@ msgstr "Je hebt een afspraak doorgestuurd gekregen."
 msgid "(this event recurs)"
 msgstr "(deze gebeurtenis gebeurt opnieuw)"
 
-#: src/plugins/vcalendar/vcalendar.c:566
+#: src/plugins/vcalendar/vcalendar.c:565
 msgid "(this event is part of a recurring event)"
 msgstr "(deze gebeurtenis is onderdeel van een terugkerende gebeurtenis)"
 
-#: src/plugins/vcalendar/vcalendar.c:717
+#: src/plugins/vcalendar/vcalendar.c:714
 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:721
+#: src/plugins/vcalendar/vcalendar.c:718
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13929,35 +14099,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:800
+#: src/plugins/vcalendar/vcalendar.c:799
 msgid "Error - could not get the calendar MIME part."
 msgstr "Fout - kon niet het agenda-MIME-deel verkrijgen."
 
-#: src/plugins/vcalendar/vcalendar.c:807
+#: src/plugins/vcalendar/vcalendar.c:806
 msgid "Error - no calendar part found."
 msgstr "Fout - geen agenda deel gevonden."
 
-#: src/plugins/vcalendar/vcalendar.c:821
+#: src/plugins/vcalendar/vcalendar.c:820
 msgid "Error - Unknown calendar component type."
 msgstr "Fout - Onbekend agenda component-type."
 
-#: src/plugins/vcalendar/vcalendar.c:953
+#: src/plugins/vcalendar/vcalendar.c:954
 msgid "Send a notification to the attendees"
-msgstr "Stuur een melding naar de genodigden"
+msgstr "Verstuur een melding naar de genodigden"
 
-#: src/plugins/vcalendar/vcalendar.c:962
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Cancel meeting"
 msgstr "Zeg afspraak af"
 
-#: src/plugins/vcalendar/vcalendar.c:963
+#: src/plugins/vcalendar/vcalendar.c:964
 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:1058
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "No account found"
 msgstr "Geen account gevonden"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1060
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13965,128 +14135,128 @@ msgstr ""
 "Je hebt geen account dat overeenkomt met een genodigde.\n"
 "Wil je toch antwoorden?"
 
-#: src/plugins/vcalendar/vcalendar.c:1061
+#: src/plugins/vcalendar/vcalendar.c:1062
 msgid "Reply anyway"
 msgstr "Toch antwoorden"
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Answer"
 msgstr "Antwoord"
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Edit meeting..."
 msgstr "Pas afspraak aan..."
 
-#: src/plugins/vcalendar/vcalendar.c:1192
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Cancel meeting..."
 msgstr "Zeg afspraak af..."
 
-#: src/plugins/vcalendar/vcalendar.c:1193
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Launch website"
 msgstr "Ga naar website"
 
-#: src/plugins/vcalendar/vcalendar.c:1197
+#: src/plugins/vcalendar/vcalendar.c:1198
 msgid "You are already busy at this time."
 msgstr "Je bent al bezet op dit moment."
 
-#: src/plugins/vcalendar/vcalendar.c:1236
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1616
 msgid "Event:"
 msgstr "Gebeurtenis:"
 
-#: 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:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Organizer:"
 msgstr "Agenda:"
 
-#: 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:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1597
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1607
 msgid "Location:"
 msgstr "Locatie:"
 
-#: 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:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Summary:"
 msgstr "Samenvatting:"
 
-#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Starting:"
 msgstr "Start:"
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Ending:"
 msgstr "Einde:"
 
-#: 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:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1599
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
 msgid "Attendees:"
 msgstr "Genodigden:"
 
-#: src/plugins/vcalendar/vcalendar.c:1245
+#: src/plugins/vcalendar/vcalendar.c:1246
 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"
@@ -14095,21 +14265,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"
@@ -14122,7 +14292,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"
@@ -14133,46 +14303,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"
 
@@ -14388,7 +14558,7 @@ msgid "available"
 msgstr "beschikbaar"
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:836
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1090
 msgid "Free/busy retrieval failed"
 msgstr "Vrij/bezet ophalen mislukt"
 
@@ -14404,22 +14574,22 @@ msgstr "Verstuur toch"
 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:1069
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1072
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "Planning voor %s wordt bijgewerkt..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1099
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: 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:1112
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1119
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1127
 msgid "Everyone is available."
 msgstr "Iedereen is beschikbaar."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1128
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14427,7 +14597,7 @@ msgstr ""
 "Iedereen lijkt beschikbaar, maar sommige vrij/bezet informatie kon niet "
 "opgehaald worden."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1298
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14435,61 +14605,61 @@ msgstr ""
 "Kon de uitnodiging niet versturen.\n"
 "Controleer de ontvangers."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1379
 msgid "Save & Send"
 msgstr "Opslaan en verzenden"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1380
 msgid "Check availability"
 msgstr "Controleer beschikbaarheid"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1474
 msgid "Starts at:"
 msgstr "Begint om:"
 
-#: 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:1480
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1504 src/prefs_matcher.c:771
 msgid "on:"
 msgstr "aan:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1498
 msgid "Ends at:"
 msgstr "Eindigt om:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1539
 msgid "New meeting"
 msgstr "Nieuwe afspraak"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1541
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - Pas afspraak aan"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Time:"
 msgstr "Tijd:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1745
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1756
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "Eerstvolgende afspraak: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1757
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14506,121 +14676,121 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1774
 #, 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:1897
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1900
 msgid "Empty calendar"
 msgstr "Lege agenda"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1901
 msgid "There is nothing to export."
 msgstr "Er is niets te exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1941
 msgid "Could not export the calendar."
 msgstr "Kon de agenda niet exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1964
 msgid "Export calendar to ICS"
 msgstr "Exporteer agenda nar ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1981
 #, 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:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2097
 msgid "Could not export the freebusy info."
 msgstr "Kon de vrij/bezet info niet exporteren."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2129
 #, 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 "
@@ -14629,9 +14799,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"
@@ -14645,95 +14815,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:396 src/prefs_account.c:1631 src/prefs_account.c:2954
+#: src/prefs_account.c:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 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:416 src/prefs_account.c:1804 src/prefs_account.c:3008
+#: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1502
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Lokaal mbox-bestand"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Niets (alleen SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Instellen als standaardaccount"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1256
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1262
 msgid "Mail address"
 msgstr "E-mailadres"
 
-#: src/prefs_account.c:1298 src/wizard.c:1525
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Automatische instellingen"
 
-#: src/prefs_account.c:1300 src/wizard.c:1526
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14741,81 +14911,81 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail is\n"
 "gecompileerd zonder ondersteuning voor IMAP en Nieuws."
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "This server requires authentication"
 msgstr "Deze server vereist authenticatie"
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Authenticatie bij verbinding maken"
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Lokaal postvak"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "SMTP-server (zenden)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1471
 msgid "Use mail command rather than SMTP server"
 msgstr "Gebruik mail opdracht i.p.v. SMTP"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1480
 msgid "command to send mails"
 msgstr "opdracht voor versturen berichten"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 msgid "Default Inbox"
 msgstr "Standaard Inbox"
 
-#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ongefilterde berichten gaan in deze map"
 
-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1661
 msgid "Authenticate before POP connection"
 msgstr "Authenticatie voor POP-verbinding"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
 msgid "Select"
 msgstr "Selecteren"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1696
 msgid "Remove messages on server when received"
 msgstr "Verwijder reeds ontvangen berichten van de server"
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1707
 msgid "Remove after"
 msgstr "Verwijder na"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dagen en 0 uur: verwijder meteen"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1737
 msgid "Receive size limit"
 msgstr "Limiet op grootte"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1740
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14824,95 +14994,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:1750 src/prefs_account.c:2984
+#: src/prefs_account.c:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal artikelen dat zal worden opgehaald"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "ongelimiteerd als 0 is opgegeven"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Platte tekst"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "IMAP-servermap"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(gewoonlijk leeg)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Geef alleen geabonneerde mappen weer"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1864
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Bandbreedte-efficiente methode (vermijdt ophalen van tags)"
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1866
 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:1840 src/prefs_receive.c:164
+#: src/prefs_account.c:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatisch controleren"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Globale instellingen gebruiken"
 
 # TPTD: check
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Controleer op nieuwe berichten elke"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1921
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1937
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filter de berichten bij het ophalen met behulp van plugins"
 
-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1941
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ophalen' haalt de e-mail voor dit account op"
 
-#: 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:2031 src/prefs_customheader.c:210
+#: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account.c:2000
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2036
 msgid "Send account mail address in Message-ID"
-msgstr "Stuur account-e-mailadres in Bericht-ID"
+msgstr "E-mailadres van account waarmee verzonden wordt in Bericht-ID"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2039
 msgid "Add user agent header"
 msgstr "Voeg een header van de gebruikers-agent toe"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-authenticatie (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14920,220 +15090,220 @@ msgstr ""
 "Als je deze velden leeg laat, worden dezelfde\n"
 "gebruikersnaam en wachtwoord gebruikt als bij ontvangen."
 
-#: src/prefs_account.c:2138
+#: src/prefs_account.c:2174
 msgid "Authenticate with POP before sending"
 msgstr "Authenticatie met POP voor het verzenden"
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "Tijdslimiet voor POP-authenticatie"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2270
 msgid "Authorization"
 msgstr "Autorisatie"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2287
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Selecteer de OAuth2 email-provider"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2327
 msgid "Client ID"
 msgstr "Client-ID"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2333
 msgid "Client secret"
 msgstr "Client-geheim"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2365
 msgid "Obtain authorization code"
 msgstr "Autorisatie-code verkrijgen"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2369
 msgid "Open default browser with request"
 msgstr "Open externe browser met aanvraag"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2375
 msgid "Copy link"
 msgstr "Kopieer koppeling"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2387
 msgid "Authorization code"
 msgstr "Autorisatie-code"
 
-#: src/prefs_account.c:2357
-msgid "Paste complete URL from browser or the provided auth token"
+#: src/prefs_account.c:2395
+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:2364
+#: src/prefs_account.c:2402
 msgid "Complete authorization"
 msgstr "Autorisatie afronden"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2406
 msgid "Authorize"
 msgstr "Autoriseren"
 
-#: src/prefs_account.c:2455 src/prefs_account.c:2501
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "Ondertekening"
 
-#: src/prefs_account.c:2458
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
 msgstr "Voeg automatisch ondertekening in"
 
-#: src/prefs_account.c:2463
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "Scheidingsteken van ondertekening"
 
-#: src/prefs_account.c:2488
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Opdracht-uitvoer"
 
-#: src/prefs_account.c:2521
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
 msgstr "Automatisch volgende adressen instellen"
 
-#: src/prefs_account.c:2573
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
 msgstr "Woordenlijsten voor spellingcontrole"
 
-#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Standaard woordenlijst"
 
-#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Standaard alternatieve woordenlijst"
 
-#: 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_account.c:2721 src/prefs_account.c:4222
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
+#: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
-#: src/toolbar.c:490
+#: src/prefs_account.c:2736 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
+#: src/toolbar.c:500
 msgid "Reply"
 msgstr "Antwoord"
 
-#: 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:2751 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Standaard privacy-systeem"
 
-#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "Berichten altijd ondertekenen"
 
-#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "Berichten altijd versleutelen"
 
-#: src/prefs_account.c:2792
+#: src/prefs_account.c:2831
 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:2795
+#: src/prefs_account.c:2834
 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:2798
+#: src/prefs_account.c:2837
 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:2800
+#: src/prefs_account.c:2839
 msgid "Save sent encrypted messages as clear text"
 msgstr "Sla verzonden versleutelde berichten onversleuteld op"
 
-#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
-msgid "Don't use SSL/TLS"
-msgstr "Gebruik geen SSL/TLS"
+#: src/prefs_account.c:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
+msgid "Don't use TLS"
+msgstr "Gebruik geen 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"
-msgstr "Gebruik SSL/TLS"
+#: src/prefs_account.c:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
+msgid "Use TLS"
+msgstr "Gebruik TLS"
 
-#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
+#: src/prefs_account.c:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Gebruik STARTTLS voor starten beveiligde sessie"
 
-#: src/prefs_account.c:3000
+#: src/prefs_account.c:3039
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account.c:3004
-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:3043
+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:3015
+#: src/prefs_account.c:3054
 msgid "Client certificates"
 msgstr "Client-certificaten"
 
-#: src/prefs_account.c:3023
+#: src/prefs_account.c:3062
 msgid "Certificate for receiving"
 msgstr "Certificaat om te ontvangen"
 
-#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
-#: src/prefs_account.c:3058
+#: src/prefs_account.c:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Client-certificaat-bestand als een PKCS12- of PEM-bestand"
 
-#: src/prefs_account.c:3051
+#: src/prefs_account.c:3090
 msgid "Certificate for sending"
 msgstr "Certificaat om te verzenden"
 
-#: src/prefs_account.c:3091
-msgid "Automatically accept valid SSL/TLS certificates"
-msgstr "Geldige SSL/TLS-certificaten automatisch accepteren"
+#: src/prefs_account.c:3130
+msgid "Automatically accept valid TLS certificates"
+msgstr "Geldige TLS-certificaten automatisch accepteren"
 
-#: src/prefs_account.c:3094
-msgid "Use non-blocking SSL/TLS"
-msgstr "Gebruik niet-blokkerende SSL/TLS"
+#: src/prefs_account.c:3133
+msgid "Use non-blocking TLS"
+msgstr "Gebruik niet-blokkerende TLS"
 
-#: src/prefs_account.c:3106
-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:3145
+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:3198 src/prefs_proxy.c:73
+#: src/prefs_account.c:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Proxy-server gebruiken"
 
-#: src/prefs_account.c:3207
+#: src/prefs_account.c:3246
 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:3209
+#: src/prefs_account.c:3248
 msgid "Use global proxy server settings"
 msgstr "Globale proxy-instellingen gebruiken"
 
-#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Gebruik authenticatie"
 
-#: src/prefs_account.c:3251 src/prefs_proxy.c:123
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account.c:3285
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Proxy-server gebruiken voor verzenden"
 
-#: src/prefs_account.c:3287
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15142,27 +15312,27 @@ msgstr ""
 "naar de ingestelde uitgaande server, en wordt de ingestelde proxy-server "
 "niet gebruikt."
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "SMTP-poort"
 
-#: src/prefs_account.c:3405
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "POP-poort"
 
-#: src/prefs_account.c:3412
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "IMAP-poort"
 
-#: src/prefs_account.c:3419
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "NNTP-poort"
 
-#: src/prefs_account.c:3425
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: src/prefs_account.c:3428
+#: src/prefs_account.c:3468
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15170,242 +15340,271 @@ msgstr ""
 "De domeinnaam wordt gebruikt in de aangemaakte Bericht-ID, en wanneer er "
 "wordt verbonden met SMTP-servers."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3482
 msgid "Use command to communicate with server"
 msgstr "Gebruik opdracht om te communiceren met server"
 
-#: src/prefs_account.c:3451
+#: src/prefs_account.c:3491
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markeer dubbel geplaatste berichten als gelezen en kleur:"
 
-#: src/prefs_account.c:3504
+#: src/prefs_account.c:3544
 msgid "Put sent messages in"
 msgstr "Plaats verzonden berichten in"
 
-#: src/prefs_account.c:3506
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Plaats berichten in wachtrij in"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Plaats kladberichten in"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Plaats verwijderde berichten in"
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "Je hebt geen accountnaam opgegeven."
 
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "Je hebt geen e-mailadres opgegeven."
 
-#: src/prefs_account.c:3579
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "Je hebt geen SMTP-server opgegeven."
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "Je hebt geen gebruikers-ID opgegeven."
 
-#: src/prefs_account.c:3589
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "Je hebt geen POP-server opgegeven."
 
-#: src/prefs_account.c:3609
+#: src/prefs_account.c:3649
 msgid "The default Inbox folder doesn't exist."
 msgstr "De standaard Inbox-map bestaat niet."
 
-#: src/prefs_account.c:3615
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "Je hebt geen IMAP-server opgegeven."
 
-#: src/prefs_account.c:3620
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "Je hebt geen NNTP-server opgegeven."
 
-#: src/prefs_account.c:3626
+#: src/prefs_account.c:3666
 msgid "local mailbox filename is not entered."
 msgstr "je hebt geen bestandsnaam voor het lokale postvak opgegeven."
 
-#: src/prefs_account.c:3632
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "je hebt geen mail-opdrachtregel opgegeven."
 
-#: src/prefs_account.c:3642
+#: src/prefs_account.c:3682
 msgid "User ID cannot contain a newline character."
 msgstr "Gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3647
+#: src/prefs_account.c:3689
 msgid "Password cannot contain a newline character."
 msgstr "Wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3678
+#: src/prefs_account.c:3726
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP gebruikers-ID kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3683
+#: src/prefs_account.c:3731
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP-wachtwoord kan geen karakter voor nieuwe regel bevatten."
 
-#: src/prefs_account.c:3775
+#: src/prefs_account.c:3826
 msgid "domain is not specified."
 msgstr "geen domein opgegeven."
 
-#: src/prefs_account.c:3780
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "verzonden-map is niet geselecteerd."
 
-#: src/prefs_account.c:3785
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "wachtrij-map is niet geselecteerd."
 
-#: src/prefs_account.c:3790
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "concept-map is niet geselecteerd."
 
-#: src/prefs_account.c:3795
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "prullenbak-map is niet geselecteerd."
 
-#: src/prefs_account.c:4104
+#: src/prefs_account.c:4166
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account.c:4140
+#: src/prefs_account.c:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Verstuur"
+
+#: src/prefs_account.c:4203
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: src/prefs_account.c:4194
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account.c:4324
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account.c:4679
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account.c:4681
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
-msgstr "%s - accountvoorkeuren"
+msgstr "%s - Account-voorkeuren"
 
-#: src/prefs_account.c:4800 src/wizard.c:1390
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Mislukt (verkeerd adres)"
 
-#: src/prefs_account.c:4885
+#: src/prefs_account.c:4946
 msgid "Select signature file"
 msgstr "Selecteer bestand met ondertekening"
 
-#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
+#: src/prefs_account.c:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Selecteer certificaat-bestand"
 
-#: src/prefs_account.c:5016
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/prefs_account.c:5333
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (plugin niet geladen)"
 
-#: src/prefs_actions.c:225
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Autorisatie afgerond"
+
+#: src/prefs_account.c:6278
+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:6281
+msgid "Authorisation NOT completed"
+msgstr "Autorisatie NIET afgerond"
+
+#: src/prefs_account.c:6282
+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:227
 msgid "Actions configuration"
 msgstr "Acties instellen"
 
-#: src/prefs_actions.c:252
+#: src/prefs_actions.c:254
 msgid "Menu name"
 msgstr "Menunaam"
 
-#: src/prefs_actions.c:285
+#: src/prefs_actions.c:287
 msgid "Shell command"
 msgstr "Voer opdracht uit"
 
-#: src/prefs_actions.c:295
+#: src/prefs_actions.c:297
 msgid "Filter action"
 msgstr "Filter actie"
 
-#: src/prefs_actions.c:301
+#: src/prefs_actions.c:303
 msgid "Edit filter action"
 msgstr "Bewerk filter actie"
 
-#: src/prefs_actions.c:329
+#: src/prefs_actions.c:331
 msgid "Append the new action above to the list"
 msgstr "Plaats de nieuwe actie bovenaan de lijst"
 
-#: src/prefs_actions.c:337
+#: src/prefs_actions.c:339
 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:339 src/prefs_filtering_action.c:589
+#: src/prefs_actions.c:341 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
+#: src/prefs_toolbar.c:1025
 msgid "D_elete"
 msgstr "V_erwijderen"
 
-#: src/prefs_actions.c:347
+#: src/prefs_actions.c:349
 msgid "Delete the selected action from the list"
 msgstr "Verwijder de geselecteerde actie van de lijst"
 
-#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
+#: src/prefs_actions.c:359 src/prefs_filtering.c:504 src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "Wis alle invoervelden in de dialoog"
 
-#: src/prefs_actions.c:365
+#: src/prefs_actions.c:367
 msgid "Show information on configuring actions"
 msgstr "Geef informatie weer over configureren van acties"
 
-#: src/prefs_actions.c:396
+#: src/prefs_actions.c:398
+msgid "Move the selected action to the top"
+msgstr "Verplaats de geselecteerde actie naar bovenaan"
+
+#: src/prefs_actions.c:408
 msgid "Move the selected action up"
 msgstr "Verplaats de geselecteerde actie naar boven"
 
-#: src/prefs_actions.c:404
+#: src/prefs_actions.c:416
 msgid "Move selected action down"
 msgstr "Verplaats de geselecteerde actie naar onderen"
 
-#: 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_actions.c:426
+msgid "Move the selected action to the bottom"
+msgstr "Verplaats de geselecteerde actie naar onderaan"
+
+#: src/prefs_actions.c:559 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:843
+#: src/prefs_filtering.c:844 src/prefs_filtering.c:954 src/prefs_matcher.c:922
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Nieuw)"
 
-#: src/prefs_actions.c:602
+#: src/prefs_actions.c:624
 msgid "Menu name is not set."
 msgstr "Menunaam is niet ingevoerd."
 
-#: src/prefs_actions.c:607
+#: src/prefs_actions.c:629
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "Een menunaam mag niet met een '/' beginnen."
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:634
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dubbele punt ':' is niet toegestaan in de menunaam."
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:653
 msgid "Menu name is too long."
 msgstr "Menunaam is te lang."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:662
 msgid "Command-line not set."
 msgstr "Opdrachtregel is niet ingevoerd."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:667
 msgid "Menu name and command are too long."
 msgstr "Menunaam en opdrachtregel zijn te lang."
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:673
 #, c-format
 msgid ""
 "The command\n"
@@ -15416,148 +15615,149 @@ msgstr ""
 "%s\n"
 "bevat een syntaxfout."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:731
 msgid "Delete action"
 msgstr "Verwijder actie"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:732
 msgid "Do you really want to delete this action?"
 msgstr "Wil je werkelijk deze actie verwijderen?"
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:752
 msgid "Delete all actions"
 msgstr "Verwijder alle acties"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:753
 msgid "Do you really want to delete all the actions?"
 msgstr "Wil je werkelijk alle acties verwijderen?"
 
-#: 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_actions.c:920 src/prefs_actions.c:951 src/prefs_filtering.c:1508
+#: src/prefs_filtering.c:1530 src/prefs_matcher.c:2170 src/prefs_template.c:572
 #: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "Ingang niet opgeslagen"
 
-#: 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:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Deze ingang is nie opgeslagen. Toch afsluiten?"
 
-#: 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_actions.c:922 src/prefs_actions.c:927 src/prefs_actions.c:953
+#: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
+#: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "Ga _door met bewerken"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:925
 msgid "Actions list not saved"
 msgstr "Actielijst is niet bewaard"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:926
 msgid "The actions list has been modified. Close anyway?"
 msgstr "De actielijst is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:996
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Menunaam:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:997
 msgid "Use / in menu name to make submenus."
 msgstr "Gebruik '/' in een menunaam om submenus te maken."
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:999
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Opdrachtregel:</span>"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:1000
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Begin met:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:1001
 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:976
+#: src/prefs_actions.c:1002
 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:977
+#: src/prefs_actions.c:1003
 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:978
+#: src/prefs_actions.c:1004
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Eindig met:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:1005
 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:980
+#: src/prefs_actions.c:1006
 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:981
+#: src/prefs_actions.c:1007
 msgid "to run command asynchronously"
 msgstr "om de opdracht asynchroon uit te voeren"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:1008
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Gebruik:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:1009
 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:984
+#: src/prefs_actions.c:1010
 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:985
+#: src/prefs_actions.c:1011
 msgid "for the file of the selected decoded message MIME part"
 msgstr "voor het bestand van het geselecteerde berichtonderdeel"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:1012
 msgid "for a user provided argument"
 msgstr "voor een door de gebruiker opgegeven argument"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:1013
 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:988
+#: src/prefs_actions.c:1014
 msgid "for the text selection"
 msgstr "voor de tekst selectie"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:1015
 msgid "apply filtering actions between {} to selected messages"
 msgstr "voer de filteracties tussen de {} uit op de geselecteerde berichten"
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:1016
 msgid "for a literal %"
 msgstr "letterlijke %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
+#: src/prefs_actions.c:1026 src/prefs_themes.c:1190
 msgid "Actions"
 msgstr "Acties"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1027
 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."
@@ -15565,29 +15765,41 @@ msgstr ""
 "Met 'Acties' kunt externe programma's uitvoeren om berichten of gedeelten "
 "daarvan te verwerken."
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
+#: src/prefs_actions.c:1114 src/prefs_filtering.c:1706
 #: src/prefs_template.c:1114
 msgid "D_uplicate"
 msgstr "D_ubbele"
 
-#: src/prefs_actions.c:1208
+#: src/prefs_actions.c:1234
 msgid "Current actions"
 msgstr "Huidige acties"
 
-#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
-#: src/prefs_filtering.c:1137
+#: src/prefs_actions.c:1321
+msgid "Entry was modified"
+msgstr "Ingang is gewijzigd"
+
+#: src/prefs_actions.c:1322
+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:1332 src/prefs_filtering.c:1081
+#: src/prefs_filtering.c:1139
 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"
@@ -15595,7 +15807,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"
 
@@ -15644,8 +15856,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "Waarschuwen wanneer een bestand wordt ingevoegd groter dan"
 
 #: src/prefs_compose_writing.c:208
-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:214
 msgid "Replying"
@@ -15680,11 +15892,11 @@ msgstr "Bij het laten vallen van bestanden in het opstelvenster"
 msgid "Ask"
 msgstr "Vraag"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:522
+#: src/prefs_compose_writing.c:243 src/toolbar.c:533
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:523
+#: src/prefs_compose_writing.c:244 src/toolbar.c:534
 msgid "Attach"
 msgstr "Bijvoegen"
 
@@ -15697,69 +15909,73 @@ msgid "Custom header configuration"
 msgstr "Aangepaste header instellen"
 
 #: src/prefs_customheader.c:504 src/prefs_display_header.c:589
-#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
+#: src/prefs_matcher.c:1639 src/prefs_matcher.c:1654
 msgid "Header name is not set."
 msgstr "Header-naam niet ingevoerd."
 
 #: src/prefs_customheader.c:514
+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:519
 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:561
+#: src/prefs_customheader.c:566
 msgid "Choose a PNG file"
 msgstr "Kies een PNG-bestand"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Kies een XBM-bestand"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Kies een tekst-bestand"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Dit bestand is geen afbeelding."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "De gekozen afbeelding heeft niet de goede afmetingen (48x48)"
 
-#: src/prefs_customheader.c:589
+#: src/prefs_customheader.c:594
 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:594
+#: src/prefs_customheader.c:599
 msgid "The image isn't in the correct format (PNG)."
 msgstr "De afbeelding heeft niet het goede format (PNG)."
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:608
 msgid "The image isn't in the correct format (XBM)."
 msgstr "De afbeelding heeft niet het goede format (XBM)."
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:617
 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:618
+#: src/prefs_customheader.c:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "'Compface' fout: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Dit bestand bevat regeleinden."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Verwijder header"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 msgid "Do you really want to delete this header?"
 msgstr "Wil je deze header werkelijk verwijderen?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:880
 msgid "Current custom headers"
 msgstr "Huidige aangepaste headers"
 
@@ -15821,7 +16037,7 @@ msgstr ""
 "de 'Als tekst weergeven'-optie worden weergegeven, dit te laten doen door "
 "middel van een script"
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:180
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:179
 #: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Berichtweergave"
@@ -15845,8 +16061,8 @@ msgstr "Verberg"
 msgid "Message flags"
 msgstr "Bericht vlaggen"
 
-#: 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:175 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:77 src/summaryview.c:2889 src/toolbar.c:515
 msgid "Mark"
 msgstr "Markeren"
 
@@ -15867,11 +16083,11 @@ msgid "Mark as ham"
 msgstr "Markeer als ham"
 
 #: 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/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2509
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:641
 msgid "Color label"
 msgstr "Kleurlabel"
 
@@ -15886,8 +16102,8 @@ msgstr "Herverwijzen"
 
 #: 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_summaries.c:646 src/prefs_summary_column.c:86
+#: src/summaryview.c:475
 msgid "Score"
 msgstr "Score"
 
@@ -15901,7 +16117,7 @@ msgstr "Stel Score in"
 
 #: 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_summary_column.c:88 src/summaryview.c:477
 msgid "Tags"
 msgstr "Tags"
 
@@ -15929,7 +16145,7 @@ msgstr "Stop filter"
 msgid "Action configuration"
 msgstr "Acties instellen"
 
-#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
+#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1899
 #: src/prefs_matcher.c:597
 msgid "Rule"
 msgstr "Regel"
@@ -15970,25 +16186,25 @@ msgstr "Vlagnaam niet ingevoerd."
 msgid "No action was defined."
 msgstr "Geen acties gedefinieerd."
 
-#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2218
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "letterlijke %"
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2227
 msgid "filename (should not be modified)"
 msgstr "bestandsnaam (dient niet veranderd te worden)"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2228
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "nieuwe regel"
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2229
 msgid "escape character for quotes"
 msgstr "escape-teken voor aanhalingstekens"
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2230
 msgid "quote character"
 msgstr "aanhalingsteken"
 
@@ -16032,8 +16248,8 @@ msgid "Filtering/Processing configuration"
 msgstr "Filteren/Verwerken instellen"
 
 # TPTD: Check this
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
-#: src/prefs_filtering.c:986
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:872
+#: src/prefs_filtering.c:988
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alle"
@@ -16080,7 +16296,7 @@ msgstr "Verplaats de geselecteerde regel naar boven"
 
 #: src/prefs_filtering.c:563
 msgid "Move the selected rule down"
-msgstr "Verplaats e geselecteerde regel naar onderen"
+msgstr "Verplaats de geselecteerde regel naar onderen"
 
 #: src/prefs_filtering.c:566
 msgid "Page dow_n"
@@ -16094,51 +16310,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:1043 src/prefs_filtering.c:1129
+#: src/prefs_filtering.c:1045 src/prefs_filtering.c:1131
 msgid "Condition string is not valid."
 msgstr "Voorwaarde-regel is niet geldig."
 
-#: src/prefs_filtering.c:1116
+#: src/prefs_filtering.c:1118
 msgid "Condition string is empty."
 msgstr "Voorwaarde-regel is leeg."
 
-#: src/prefs_filtering.c:1122
+#: src/prefs_filtering.c:1124
 msgid "Action string is empty."
 msgstr "Actie-regel is leeg."
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1213
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1214
 msgid "Do you really want to delete this rule?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1230
+#: src/prefs_filtering.c:1232
 msgid "Delete all rules"
 msgstr "Verwijder alle regels"
 
-#: src/prefs_filtering.c:1231
+#: src/prefs_filtering.c:1233
 msgid "Do you really want to delete all the rules?"
 msgstr "Wil je alle regels werkelijk verwijderen?"
 
-#: src/prefs_filtering.c:1482
+#: src/prefs_filtering.c:1484
 msgid "Filtering rules not saved"
 msgstr "Filterregels niet bewaard"
 
-#: src/prefs_filtering.c:1483
+#: src/prefs_filtering.c:1485
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "De lijst met filterregels is gewijzigd. Toch afsluiten?"
 
-#: src/prefs_filtering.c:1705
+#: src/prefs_filtering.c:1709
 msgid "Move one page up"
 msgstr "Ga een pagina naar boven"
 
-#: src/prefs_filtering.c:1706
+#: src/prefs_filtering.c:1710
 msgid "Move one page down"
 msgstr "Ga een pagina naar beneden"
 
-#: src/prefs_filtering.c:1863
+#: src/prefs_filtering.c:1867
 msgid "Enable"
 msgstr "Activeren"
 
@@ -16158,17 +16374,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:464
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1033
 msgid " Use default "
 msgstr " Gebruik de standaard "
 
-#: src/prefs_folder_item.c:214
+#: src/prefs_folder_item.c:218
 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 "
@@ -16179,7 +16395,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:293 src/prefs_folder_item.c:896
+#: src/prefs_folder_item.c:299 src/prefs_folder_item.c:931
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -16187,56 +16403,56 @@ msgstr ""
 "Pas toe op\n"
 "submappen"
 
-#: src/prefs_folder_item.c:318
+#: src/prefs_folder_item.c:324
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/prefs_folder_item.c:320
+#: src/prefs_folder_item.c:326
 msgid "Outbox"
 msgstr "Uitbox"
 
-#: src/prefs_folder_item.c:336
+#: src/prefs_folder_item.c:342
 msgid "Folder type"
 msgstr "Map-type"
 
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:354
 msgid "Simplify Subject RegExp"
 msgstr "Verkorte onderwerpweergave RegExp"
 
-#: src/prefs_folder_item.c:374
+#: src/prefs_folder_item.c:380
 msgid "Test string"
 msgstr "Test string"
 
-#: src/prefs_folder_item.c:391
+#: src/prefs_folder_item.c:397
 msgid "Result"
 msgstr "Resultaat"
 
 # TPTD: ugly
-#: src/prefs_folder_item.c:406
+#: src/prefs_folder_item.c:412
 msgid "Folder chmod"
 msgstr "Map-chmod"
 
-#: src/prefs_folder_item.c:432
+#: src/prefs_folder_item.c:438
 msgid "Folder color"
 msgstr "Mapkleur"
 
-#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
+#: src/prefs_folder_item.c:450 src/prefs_folder_item.c:1841
 msgid "Pick color for folder"
 msgstr "Selecteer kleur voor map"
 
-#: src/prefs_folder_item.c:462
+#: src/prefs_folder_item.c:468
 msgid "Run Processing rules at start-up"
 msgstr "Draai Verwerkingsregels bij opstarten"
 
-#: src/prefs_folder_item.c:477
+#: src/prefs_folder_item.c:483
 msgid "Run Processing rules when opening"
 msgstr "Draai Verwerkingsregels bij openen"
 
-#: src/prefs_folder_item.c:491
+#: src/prefs_folder_item.c:497
 msgid "Scan for new mail"
 msgstr "Controleer op nieuwe berichten"
 
-#: src/prefs_folder_item.c:493
+#: src/prefs_folder_item.c:499
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -16244,11 +16460,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:513
+#: src/prefs_folder_item.c:519
 msgid "Select the HTML part of multipart messages"
 msgstr "Selecteer het HTML-gedeelte van meerdelige berichten"
 
-#: src/prefs_folder_item.c:530
+#: src/prefs_folder_item.c:536
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -16256,68 +16472,81 @@ msgstr ""
 "\"Standaard\" volgt de globale voorkeuren (gevonden in /Voorkeuren/"
 "Berichtweergave/Tekstopties)"
 
-#: src/prefs_folder_item.c:540
+#: src/prefs_folder_item.c:547
+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:549
+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:561
+#: src/prefs_folder_item.c:585
 msgid "Fetch message bodies from the last"
 msgstr "Haal berichttekst op van de laatste"
 
-#: src/prefs_folder_item.c:568
+#: src/prefs_folder_item.c:592
 msgid "0: all bodies"
 msgstr "0: alle berichtteksten"
 
-#: src/prefs_folder_item.c:576
+#: src/prefs_folder_item.c:600
 msgid "Remove older messages bodies"
 msgstr "Verwijder oude berichtteksten"
 
-#: src/prefs_folder_item.c:593
+#: src/prefs_folder_item.c:618
 msgid "Discard folder cache"
 msgstr "Cache van de map weggooien"
 
-#: src/prefs_folder_item.c:905
+#: src/prefs_folder_item.c:940
 msgid "Request Return Receipt"
 msgstr "Vraag om ontvangstbevestiging"
 
-#: src/prefs_folder_item.c:920
+#: src/prefs_folder_item.c:955
 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:934 src/prefs_folder_item.c:986
-#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:970 src/prefs_folder_item.c:996
+#: src/prefs_folder_item.c:1048 src/prefs_folder_item.c:1074
+#: src/prefs_folder_item.c:1100
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "Standaard %s"
 
-#: src/prefs_folder_item.c:960
+#: src/prefs_folder_item.c:1022
 #, 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:1063
+#: src/prefs_folder_item.c:1125
 msgid "Default account"
 msgstr "Standaard account"
 
-#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+#: src/prefs_folder_item.c:1267 src/prefs_folder_item.c:1299
 msgid "\"Default\" will follow the applicable account preference"
 msgstr "\"Standaard\" volgt de voorkeuren van het betreffende account"
 
-#: src/prefs_folder_item.c:1781
+#: src/prefs_folder_item.c:1854
 msgid "Discard cache"
 msgstr "Cache weggooien"
 
-#: src/prefs_folder_item.c:1782
+#: src/prefs_folder_item.c:1855
 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:1907
+#: src/prefs_folder_item.c:1980
 msgid "General"
 msgstr "Algemeen"
 
-#: src/prefs_folder_item.c:1986
+#: src/prefs_folder_item.c:2059
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Eigenschappen voor map %s"
@@ -16326,7 +16555,7 @@ msgstr "Eigenschappen voor map %s"
 msgid "Folder and Message Lists"
 msgstr "Mappen- en berichtenlijst"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2091
 msgid "Message"
 msgstr "Bericht"
 
@@ -16350,8 +16579,8 @@ msgstr "Gebruik ander lettertype bij het afdrukken"
 msgid "Message Printing"
 msgstr "Bericht afdrukken"
 
-#: 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:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:876
+#: src/prefs_themes.c:427
 msgid "Display"
 msgstr "Beeld"
 
@@ -16359,48 +16588,48 @@ msgstr "Beeld"
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:895 src/toolbar.c:260 src/toolbar.c:528
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: src/prefs_image_viewer.c:76
+#: src/prefs_image_viewer.c:75
 msgid "Automatically display attached images"
 msgstr "Bijgevoegde afbeeldingen automatisch weergeven"
 
-#: src/prefs_image_viewer.c:82
+#: src/prefs_image_viewer.c:81
 msgid "Resize attached images by default"
 msgstr "Herschaal bijgevoegde afbeeldingen automatisch"
 
-#: src/prefs_image_viewer.c:85
+#: src/prefs_image_viewer.c:84
 msgid "Clicking image toggles scaling"
 msgstr "Klikken op de afbeelding verandert schalen"
 
-#: src/prefs_image_viewer.c:96
+#: src/prefs_image_viewer.c:95
 msgid "Fit image"
 msgstr "Afbeelding passend maken"
 
-#: src/prefs_image_viewer.c:99
+#: src/prefs_image_viewer.c:98
 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:102
+#: src/prefs_image_viewer.c:101
 msgid "Height"
 msgstr "Hoogte"
 
-#: src/prefs_image_viewer.c:107
+#: src/prefs_image_viewer.c:106
 msgid "Width"
 msgstr "Breedte"
 
-#: src/prefs_image_viewer.c:114
+#: src/prefs_image_viewer.c:113
 msgid "Display images inline"
 msgstr "Afbeeldingen in het bericht weergeven"
 
-#: src/prefs_image_viewer.c:120
+#: src/prefs_image_viewer.c:119
 msgid "Print images"
 msgstr "Druk afbeeldingen af"
 
-#: src/prefs_image_viewer.c:181
+#: src/prefs_image_viewer.c:180
 msgid "Image Viewer"
 msgstr "Afbeeldingweergever"
 
@@ -16574,12 +16803,12 @@ msgid "bytes"
 msgstr "bytes"
 
 #: src/prefs_matcher.c:364
-msgid "kilobytes"
-msgstr "kilobytes"
+msgid "kibibytes"
+msgstr "kibibytes"
 
 #: src/prefs_matcher.c:365
-msgid "megabytes"
-msgstr "megabytes"
+msgid "mebibytes"
+msgstr "mebibytes"
 
 #: src/prefs_matcher.c:369
 msgid "contains"
@@ -16605,11 +16834,11 @@ msgstr "berichtinhoud"
 msgid "whole message"
 msgstr "hele bericht"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6563
+#: src/prefs_matcher.c:403 src/summaryview.c:6575
 msgid "Marked"
 msgstr "Gemarkeerd"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6561
+#: src/prefs_matcher.c:404 src/summaryview.c:6573
 msgid "Deleted"
 msgstr "Verwijderd"
 
@@ -16617,12 +16846,12 @@ msgstr "Verwijderd"
 msgid "Replied"
 msgstr "Beantwoord"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6555
+#: src/prefs_matcher.c:406 src/summaryview.c:6567
 msgid "Forwarded"
 msgstr "Doorgestuurd"
 
-#: 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:408 src/summaryview.c:6557 src/toolbar.c:526
+#: src/toolbar.c:1005 src/toolbar.c:2383
 msgid "Spam"
 msgstr "Spam"
 
@@ -16630,7 +16859,7 @@ msgstr "Spam"
 msgid "Has attachment"
 msgstr "Heeft bijlage"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6581
+#: src/prefs_matcher.c:410 src/summaryview.c:6593
 msgid "Signed"
 msgstr "Ondertekend"
 
@@ -16738,8 +16967,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:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
-#: src/prefs_matcher.c:2583
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1660 src/prefs_matcher.c:1675
+#: src/prefs_matcher.c:2589
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alle"
@@ -16764,32 +16993,32 @@ msgstr "elke"
 msgid "of above rules"
 msgstr "van bovenstaande regels"
 
-#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
+#: src/prefs_matcher.c:1565 src/prefs_matcher.c:1644
 msgid "Search pattern is not set."
 msgstr "Zoekcriteria niet ingevoerd."
 
-#: src/prefs_matcher.c:1578
+#: src/prefs_matcher.c:1579
 msgid "Invalid hour."
 msgstr "Ongeldig uur."
 
-#: src/prefs_matcher.c:1587
+#: src/prefs_matcher.c:1589
 msgid "Test command is not set."
 msgstr "Test-opdrachtregel is niet ingevoerd."
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1661
 msgid "all addresses in all headers"
 msgstr "alle adressen in alle headers"
 
-#: src/prefs_matcher.c:1662
+#: src/prefs_matcher.c:1664
 msgid "any address in any header"
 msgstr "elk adres in elke header"
 
-#: src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1666
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "de adres(sen) in header '%s'"
 
-#: src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1667
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16802,99 +17031,91 @@ 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:1884
+#: src/prefs_matcher.c:1889
 msgid "Headers part"
 msgstr "Header-deel"
 
-#: src/prefs_matcher.c:1888
+#: src/prefs_matcher.c:1893
 msgid "Headers values"
 msgstr "Header-waardes"
 
-#: src/prefs_matcher.c:1892
+#: src/prefs_matcher.c:1897
 msgid "Body part"
 msgstr "Berichtinhoud"
 
-#: src/prefs_matcher.c:1896
+#: src/prefs_matcher.c:1901
 msgid "Whole message"
 msgstr "Hele bericht"
 
-#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
+#: src/prefs_matcher.c:2018 src/prefs_matcher.c:2064
 msgid "in"
 msgstr "in"
 
-#: src/prefs_matcher.c:2015
+#: src/prefs_matcher.c:2020
 msgid "content is"
 msgstr "inhoud is"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2024
 msgid "Date is"
 msgstr "Datum is"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2035
 msgid "Age is"
 msgstr "Leeftijd is"
 
-#: src/prefs_matcher.c:2035
+#: src/prefs_matcher.c:2040
 msgid "Flag"
 msgstr "Vlag"
 
-#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
+#: src/prefs_matcher.c:2041 src/prefs_matcher.c:2055
 msgid "is"
 msgstr "is"
 
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2046
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/prefs_matcher.c:2049
+#: src/prefs_matcher.c:2054
 msgid "Label"
 msgstr "Label"
 
-#: src/prefs_matcher.c:2054
+#: src/prefs_matcher.c:2059
 msgid "Value:"
 msgstr "Waarde:"
 
-#: src/prefs_matcher.c:2069
+#: src/prefs_matcher.c:2074
 msgid "Score is"
 msgstr "Score is"
 
-#: src/prefs_matcher.c:2070
+#: src/prefs_matcher.c:2075
 msgid "points"
 msgstr "punten"
 
-#: src/prefs_matcher.c:2080
+#: src/prefs_matcher.c:2085
 msgid "Size is"
 msgstr "Grootte is"
 
-#: src/prefs_matcher.c:2085
+#: src/prefs_matcher.c:2090
 msgid "Scope:"
 msgstr "Breedte:"
 
-#: src/prefs_matcher.c:2087
+#: src/prefs_matcher.c:2092
 msgid "tags"
 msgstr "tags"
 
-#: src/prefs_matcher.c:2092
+#: src/prefs_matcher.c:2097
 msgid "type is"
 msgstr "type is"
 
-#: src/prefs_matcher.c:2096
+#: src/prefs_matcher.c:2101
 msgid "Program returns"
 msgstr "Programma komt terug"
 
-#: src/prefs_matcher.c:2166
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"Deze ingang is niet opgeslagen.\n"
-"Toch sluiten?"
-
-#: src/prefs_matcher.c:2233
+#: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Zoek Type: 'Test'"
 
-#: src/prefs_matcher.c:2234
+#: src/prefs_matcher.c:2240
 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"
@@ -16907,7 +17128,7 @@ msgstr ""
 "\n"
 "De volgende speciale tekens kunnen gebruikt worden:"
 
-#: src/prefs_matcher.c:2333
+#: src/prefs_matcher.c:2339
 msgid "Current condition rules"
 msgstr "Huidige voorwaarden"
 
@@ -17146,7 +17367,7 @@ msgstr "Selecteer kleur voor \"hunk\"-regels"
 msgid "Hunk lines"
 msgstr "\"Hunk\"-regels"
 
-#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:378
 msgid "Folder list"
 msgstr "Mappenlijst"
 
@@ -17326,7 +17547,7 @@ msgstr ""
 
 #: src/prefs_other.c:531
 msgid " Choose preset keyboard shortcuts... "
-msgstr "Kies vooringestelde sneltoetsen... "
+msgstr " Kies vooringestelde sneltoetsen... "
 
 #: src/prefs_other.c:541
 msgid "Metadata handling"
@@ -17399,31 +17620,31 @@ msgid "Synchronise offline folders as soon as possible"
 msgstr "Synchroniseer offline mappen zo snel mogelijk"
 
 #: src/prefs_other.c:615
-msgid "Master passphrase"
+msgid "Primary passphrase"
 msgstr "Hoofdwachtwoord"
 
 #: src/prefs_other.c:618
-msgid "Use a master passphrase"
+msgid "Use a primary passphrase"
 msgstr "Gebruik een hoofdwachtwoord"
 
 #: src/prefs_other.c:621
 msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
+"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:626
-msgid "Change master passphrase"
-msgstr "Wijzigen hoofdwachtwoord"
+msgid "Change primary passphrase"
+msgstr "Wijzig hoofdwachtwoord"
 
 #: src/prefs_other.c:816
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+#: src/prefs_proxy.c:242 src/prefs_receive.c:415 src/prefs_send.c:419
 msgid "Mail Handling"
 msgstr "E-mailverwerking"
 
@@ -17502,7 +17723,7 @@ msgstr "Bewaar verzonden berichten"
 
 #: src/prefs_send.c:179
 msgid "Never send Return Receipts"
-msgstr "Stuur nooit een ontvangstbevestiging"
+msgstr "Verstuur nooit een ontvangstbevestiging"
 
 #: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
@@ -17664,14 +17885,14 @@ 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:420 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:420 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"
+msgstr "Selecteer kleur voor foutief gespeld woord"
 
 #: src/prefs_spelling.c:128
 msgid "Enable spell checker"
@@ -17718,207 +17939,215 @@ msgstr ""
 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'"
@@ -17926,56 +18155,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:539
+#: src/prefs_summaries.c:618 src/quote_fmt.c:539
 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"
 
@@ -18150,29 +18379,29 @@ msgstr "Huidige sjablonen"
 msgid "Template"
 msgstr "Sjabloon"
 
-#: src/prefs_themes.c:401 src/prefs_themes.c:841
+#: src/prefs_themes.c:406 src/prefs_themes.c:939
 msgid "Default internal theme"
 msgstr "Standaard intern thema"
 
-#: src/prefs_themes.c:423
+#: src/prefs_themes.c:428
 msgid "Themes"
 msgstr "Thema's"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:505
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Verwijder systeemthema '%s'"
 
-#: src/prefs_themes.c:502
+#: src/prefs_themes.c:507
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Verwijder thema '%s'"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:512
 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:522
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18181,24 +18410,24 @@ msgstr ""
 "Bestand %s mislukt\n"
 "tijdens verwijderen thema."
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:526
 msgid "Removing theme directory failed."
 msgstr "Verwijderen van thema-map mislukt."
 
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:529
 msgid "Theme removed successfully"
 msgstr "Thema verwijderd"
 
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:549
 msgid "Select theme folder"
 msgstr "Selecteer thema-map"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:564
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Installeer thema '%s'"
 
-#: src/prefs_themes.c:562
+#: src/prefs_themes.c:567
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -18206,15 +18435,15 @@ msgstr ""
 "Deze map lijkt niet een thema-map te zijn.\n"
 "Toch installeren?"
 
-#: src/prefs_themes.c:572
+#: src/prefs_themes.c:577
 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:597
 msgid "Theme exists"
 msgstr "Thema bestaat"
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:598
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -18226,25 +18455,25 @@ msgstr ""
 "\n"
 "Wil je het vervangen?"
 
-#: src/prefs_themes.c:600
+#: src/prefs_themes.c:605
 #, 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:614
 #, 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:628
 msgid "Theme installed successfully."
 msgstr "Thema geïnstalleerd."
 
-#: src/prefs_themes.c:630
+#: src/prefs_themes.c:635
 msgid "Failed installing theme"
 msgstr "Installatie thema mislukt"
 
-#: src/prefs_themes.c:633
+#: src/prefs_themes.c:638
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18253,74 +18482,82 @@ msgstr ""
 "Bestand %s mislukt\n"
 "tijdens installatie thema."
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:691
+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:983
+#: src/prefs_themes.c:1082
 msgid "Information"
 msgstr "Informatie"
 
-#: src/prefs_themes.c:998
+#: src/prefs_themes.c:1097
 msgid "Author"
 msgstr "Auteur"
 
-#: src/prefs_themes.c:1006
+#: src/prefs_themes.c:1105
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1048
+#: src/prefs_themes.c:1147
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/prefs_themes.c:1105
+#: src/prefs_themes.c:1204
+msgid "View all"
+msgstr "Bekijk alles"
+
+#: src/prefs_themes.c:1209
 msgid "SVG rendering"
 msgstr "SVG rendering"
 
-#: src/prefs_themes.c:1112
+#: src/prefs_themes.c:1216
 msgid "Enable alpha channel"
 msgstr "Inschakelen alpha-channel"
 
-#: src/prefs_themes.c:1113
+#: src/prefs_themes.c:1217
 msgid "Force scaling"
 msgstr "Forceer schalen"
 
-#: src/prefs_themes.c:1119
+#: src/prefs_themes.c:1223
 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"
@@ -18328,75 +18565,75 @@ 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:912
+#: src/prefs_toolbar.c:913
 msgid "Item type"
 msgstr "Item-type"
 
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:923
 msgid "Internal Function"
 msgstr "Interne Functie"
 
-#: src/prefs_toolbar.c:923
+#: src/prefs_toolbar.c:924
 msgid "User Action"
 msgstr "Gebruikers Actie"
 
-#: src/prefs_toolbar.c:925 src/toolbar.c:279
+#: src/prefs_toolbar.c:926 src/toolbar.c:283
 msgid "Separator"
 msgstr "Scheidingsteken"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:933
 msgid "Event executed on click"
 msgstr "Gebeurtenis uitgevoerd na klikken"
 
-#: src/prefs_toolbar.c:959
+#: src/prefs_toolbar.c:960
 msgid "Toolbar text"
 msgstr "Tekst van werkbalk"
 
-#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
+#: src/prefs_toolbar.c:975 src/prefs_toolbar.c:1353
 msgid "Icon"
 msgstr "Pictogram"
 
-#: src/prefs_toolbar.c:1010
+#: src/prefs_toolbar.c:1011
 msgid "A_dd"
 msgstr "_Toevoegen"
 
-#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
+#: src/prefs_toolbar.c:1231 src/prefs_toolbar.c:1245 src/prefs_toolbar.c:1259
 msgid "Toolbars"
 msgstr "Werkbalken"
 
-#: src/prefs_toolbar.c:1231
+#: src/prefs_toolbar.c:1232
 msgid "Main Window"
 msgstr "Hoofdvenster"
 
-#: src/prefs_toolbar.c:1245
+#: src/prefs_toolbar.c:1246
 msgid "Message Window"
 msgstr "Berichtvenster"
 
-#: src/prefs_toolbar.c:1259
+#: src/prefs_toolbar.c:1260
 msgid "Compose Window"
 msgstr "Venster sluiten"
 
-#: src/prefs_toolbar.c:1374
+#: src/prefs_toolbar.c:1376
 msgid "Icon text"
 msgstr "Pictogramtekst"
 
-#: src/prefs_toolbar.c:1383
+#: src/prefs_toolbar.c:1385
 msgid "Mapped event"
 msgstr "Gebeurtenis"
 
-#: src/prefs_toolbar.c:1690
+#: src/prefs_toolbar.c:1692
 msgid "Toolbar item icon"
 msgstr "Werkbalk item pictogram"
 
@@ -18457,40 +18694,40 @@ msgstr "Zoom uit"
 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:2758
+#: src/procmime.c:2797
 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."
@@ -18498,7 +18735,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."
@@ -18506,21 +18743,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"
 
@@ -18832,88 +19069,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"
@@ -18937,11 +19174,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"
@@ -18951,14 +19188,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:445
+#: src/ssl_manager.c:448
 msgid "Delete certificate"
 msgstr "Certificaat verwijderen"
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:449
 msgid "Do you really want to delete this certificate?"
 msgstr "Wil je dit certificaat werkelijk verwijderen?"
 
@@ -18986,7 +19223,7 @@ msgstr "Voorwaarde:"
 msgid "Find _all"
 msgstr "Vind _alles"
 
-#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
+#: src/summary_search.c:692 src/summaryview.c:1154 src/summaryview.c:1417
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Bezig met zoeken in %s...\n"
@@ -18999,304 +19236,304 @@ msgstr "Begin van de lijst bereikt, verdergaan vanaf het einde?"
 msgid "End of list reached; continue from beginning?"
 msgstr "Einde van de lijst bereikt, verdergaan vanaf het begin?"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:431
 msgid "Re-edit"
 msgstr "Opnieuw wijzigen"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:444
 msgid "Create _filter rule"
 msgstr "_Filterregel aanmaken"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:457
 msgid "_Set displayed columns"
 msgstr "Weergegeven _kolommen instellen"
 
-#: src/summaryview.c:461
+#: src/summaryview.c:462
 msgid "_Lock column headers"
 msgstr "Kolomkoppen _vastzetten"
 
-#: src/summaryview.c:598
+#: src/summaryview.c:599
 msgid "Toggle quick search bar"
 msgstr "Verberg/Toon snelzoeken"
 
-#: src/summaryview.c:635
+#: src/summaryview.c:636
 msgid "Toggle multiple selection"
 msgstr "Tik meervoudige selectie aan"
 
-#: src/summaryview.c:1339
+#: src/summaryview.c:1345
 msgid "Process mark"
 msgstr "Verwerkmarkering"
 
-#: src/summaryview.c:1340
+#: src/summaryview.c:1346
 msgid "Some marks are left. Process them?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:1390
+#: src/summaryview.c:1396
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Map wordt ingelezen (%s)..."
 
-#: src/summaryview.c:1950 src/summaryview.c:1998
+#: src/summaryview.c:1951 src/summaryview.c:1999
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten"
 
-#: src/summaryview.c:1951
+#: src/summaryview.c:1952
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
-#: src/summaryview.c:2096 src/summaryview.c:2163
+#: src/summaryview.c:1964 src/summaryview.c:2012 src/summaryview.c:2049
+#: src/summaryview.c:2097 src/summaryview.c:2164
 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:1975
+#: src/summaryview.c:1976
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1999
+#: src/summaryview.c:2000
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2035 src/summaryview.c:2083
+#: src/summaryview.c:2036 src/summaryview.c:2084
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2037
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuwe berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2061
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2085
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2117 src/summaryview.c:2150
+#: src/summaryview.c:2118 src/summaryview.c:2151
 msgid "No more marked messages"
 msgstr "Laatste gemarkeerde bericht"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2119
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerde berichten gevonden. Zoeken vanaf einde?"
 
-#: src/summaryview.c:2127
+#: src/summaryview.c:2128
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:2151
+#: src/summaryview.c:2152
 msgid "No marked message found. Go to next folder?"
 msgstr "Geen ongemarkeerde berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:2184 src/summaryview.c:2213
+#: src/summaryview.c:2185 src/summaryview.c:2214
 msgid "No more labeled messages"
 msgstr "Geen berichten met labels"
 
-#: src/summaryview.c:2185
+#: src/summaryview.c:2186
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen berichten met gekleurde labels gevonden. Zoeken vanaf eind?"
 
-#: src/summaryview.c:2194 src/summaryview.c:2227
+#: src/summaryview.c:2195 src/summaryview.c:2228
 msgid "No labeled messages."
 msgstr "Geen berichten met labels."
 
-#: src/summaryview.c:2214
+#: src/summaryview.c:2215
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen berichten met gekleurde labels gevonden. Zoeken vanaf begin?"
 
-#: src/summaryview.c:2537
+#: src/summaryview.c:2538
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2723
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:2726
+#: src/summaryview.c:2727
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:2727 src/summaryview.c:2734
+#: src/summaryview.c:2728 src/summaryview.c:2735
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2732
+#: src/summaryview.c:2733
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2747
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] " item geselecteerd"
 msgstr[1] " items geselecteerd"
 
-#: src/summaryview.c:2764 src/summaryview.c:2809
+#: src/summaryview.c:2765 src/summaryview.c:2810
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2785
 msgid "Message summary"
 msgstr "Berichtsamenvatting"
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2786
 msgid "New:"
 msgstr "Nieuw:"
 
-#: src/summaryview.c:2786
+#: src/summaryview.c:2787
 msgid "Unread:"
 msgstr "Ongelezen:"
 
-#: src/summaryview.c:2787
+#: src/summaryview.c:2788
 msgid "Total:"
 msgstr "Totaal:"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2790
 msgid "Marked:"
 msgstr "Gemarkeerd:"
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2791
 msgid "Replied:"
 msgstr "Beantwoord:"
 
-#: src/summaryview.c:2791
+#: src/summaryview.c:2792
 msgid "Forwarded:"
 msgstr "Doorgestuurd:"
 
-#: src/summaryview.c:2792
+#: src/summaryview.c:2793
 msgid "Locked:"
 msgstr "Op slot:"
 
-#: src/summaryview.c:2793
+#: src/summaryview.c:2794
 msgid "Ignored:"
 msgstr "Genegeerd:"
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2795
 msgid "Watched:"
 msgstr "Gevolgd:"
 
-#: src/summaryview.c:2804
+#: src/summaryview.c:2805
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d geselecteerd (%s/%s, %d ongelezen"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3098
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3266
 msgid "Setting summary from message data..."
 msgstr "Lijst wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:3471
+#: src/summaryview.c:3472
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/summaryview.c:3528
+#: src/summaryview.c:3529
 msgid "(No Recipient)"
 msgstr "(Geen ontvanger)"
 
-#: src/summaryview.c:3576
+#: src/summaryview.c:3577
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Van: %s, op %s"
 
-#: src/summaryview.c:3585
+#: src/summaryview.c:3586
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Aan: %s, op %s"
 
-#: src/summaryview.c:4484
+#: src/summaryview.c:4485
 msgid "You're not the author of the article."
 msgstr "Je bent niet de auteur van het artikel."
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4575
 #, 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:4577
+#: src/summaryview.c:4578
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Verwijder bericht"
 msgstr[1] "Verwijder bericht"
 
-#: src/summaryview.c:4741
+#: src/summaryview.c:4742
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4796
+#: src/summaryview.c:4797
 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:4847
+#: src/summaryview.c:4848
 msgid "Destination to copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:4881
+#: src/summaryview.c:4882
 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:5039
+#: src/summaryview.c:5046
 msgid "Append or Overwrite"
 msgstr "Toevoegen of Overschrijven"
 
-#: src/summaryview.c:5040
+#: src/summaryview.c:5047
 msgid "Append or overwrite existing file?"
 msgstr "Aan bestaand bestand toevoegen of overschrijven?"
 
-#: src/summaryview.c:5041
+#: src/summaryview.c:5048
 msgid "_Append"
 msgstr "_Toevoegen"
 
-#: src/summaryview.c:5041
+#: src/summaryview.c:5048
 msgid "_Overwrite"
 msgstr "_Overschrijven"
 
-#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
+#: src/summaryview.c:5059 src/summaryview.c:5062 src/summaryview.c:5077
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan bestand '%s' niet opslaan."
 
-#: src/summaryview.c:5090
+#: src/summaryview.c:5100
 #, 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:5548
+#: src/summaryview.c:5558
 msgid "Building threads..."
 msgstr "Discussie-draden worden opgebouwd..."
 
-#: src/summaryview.c:5796
+#: src/summaryview.c:5806
 msgid "Skip these rules"
 msgstr "Sla deze regels over"
 
-#: src/summaryview.c:5799
+#: src/summaryview.c:5809
 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:5802
+#: src/summaryview.c:5812
 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:5831
+#: src/summaryview.c:5841
 msgid "Filtering"
 msgstr "Filteren"
 
-#: src/summaryview.c:5832
+#: src/summaryview.c:5842
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19304,73 +19541,73 @@ msgstr ""
 "Er zijn filterregels die bij een account horen.\n"
 "Kies wat te doen met deze regels:"
 
-#: src/summaryview.c:5864
+#: src/summaryview.c:5874
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:5947
+#: src/summaryview.c:5957
 msgid "Processing configuration"
 msgstr "Verwerken instellen"
 
-#: src/summaryview.c:6095
+#: src/summaryview.c:6105
 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:6097
+#: src/summaryview.c:6107
 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:6098
+#: src/summaryview.c:6108
 msgid "Reset color label"
 msgstr "Kleurlabel herstellen"
 
-#: src/summaryview.c:6098
+#: src/summaryview.c:6108
 msgid "Set color label"
 msgstr "Kleurlabel instellen"
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6553
 msgid "Ignored thread"
 msgstr "Genegeerde draad"
 
-#: src/summaryview.c:6543
+#: src/summaryview.c:6555
 msgid "Watched thread"
 msgstr "Gevolgde draad"
 
-#: src/summaryview.c:6551
+#: src/summaryview.c:6563
 msgid "Replied but also forwarded - click to see reply"
 msgstr "Beantwoord maar ook doorgestuurd - klik om het antwoord te zien"
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6565
 msgid "Replied - click to see reply"
 msgstr "Beantwoord - klik om het antwoord te zien"
 
-#: src/summaryview.c:6565
+#: src/summaryview.c:6577
 msgid "To be moved"
 msgstr "Nog te verplaatsen"
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6579
 msgid "To be copied"
 msgstr "Nog te kopiëren"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6591
 msgid "Signed, has attachment(s)"
 msgstr "Ondertekend, heeft bijlage(s)"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6595
 msgid "Encrypted, has attachment(s)"
 msgstr "Versleuteld, heeft bijlage(s)"
 
-#: src/summaryview.c:6585
+#: src/summaryview.c:6597
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: src/summaryview.c:6587
+#: src/summaryview.c:6599
 msgid "Has attachment(s)"
 msgstr "Heeft bijlage(s)"
 
-#: src/summaryview.c:8299
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19379,45 +19616,45 @@ msgstr ""
 "Reguliere expressie (regexp) fout:\n"
 "%s"
 
-#: src/summaryview.c:8402
+#: src/summaryview.c:8428
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Ga terug in de mappenlijst (Je heeft ongelezen berichten)"
 
-#: src/summaryview.c:8407
+#: src/summaryview.c:8433
 msgid "Go back to the folder list"
 msgstr "Ga terug naar de mappenlijst"
 
-#: src/textview.c:242
+#: src/textview.c:265
 msgid "_Open in web browser"
 msgstr "_Openen met webbrowser"
 
-#: src/textview.c:243
+#: src/textview.c:266
 msgid "Copy this _link"
 msgstr "Kopieer deze _koppeling"
 
-#: src/textview.c:250
+#: src/textview.c:273
 msgid "_Reply to this address"
 msgstr "_Antwoord aan dit adres"
 
-#: src/textview.c:251
+#: src/textview.c:274
 msgid "Add to _Address book"
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:252
+#: src/textview.c:275
 msgid "Copy this add_ress"
 msgstr "Kopieer _dit adres"
 
-#: src/textview.c:702
+#: src/textview.c:729
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
-#: src/textview.c:705
+#: src/textview.c:732
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
-#: src/textview.c:875
+#: src/textview.c:902
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19431,67 +19668,68 @@ msgstr ""
 "\n"
 "  Gebruik "
 
-#: src/textview.c:880
+#: src/textview.c:907
 msgid "'Network Log'"
 msgstr "'Netwerklog'"
 
-#: src/textview.c:881
+#: src/textview.c:908
 msgid " in the Tools menu for more information."
 msgstr " in het 'Gereedschap'-menu voor meer informatie."
 
-#: src/textview.c:947
+#: src/textview.c:974
 msgid "  The following can be performed on this part\n"
 msgstr "  Het volgende kan op dit gedeelte worden toegepast\n"
 
-#: src/textview.c:949
+#: src/textview.c:976
 msgid "  by right-clicking the icon or list item:"
 msgstr "  met de rechtermuisknop op het pictogram of lijst-item te klikken:"
 
-#: src/textview.c:953
+#: src/textview.c:980
 msgid "     - To save, select "
 msgstr "     - Om op te slaan selecteer "
 
-#: src/textview.c:954
+#: src/textview.c:981
 msgid "'Save as...'"
 msgstr "'Opslaan als...'"
 
-#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
+#: src/textview.c:983 src/textview.c:995 src/textview.c:1007
+#: src/textview.c:1017
 msgid " (Shortcut key: '"
 msgstr " (Sneltoets: '"
 
-#: src/textview.c:964
+#: src/textview.c:991
 msgid "     - To display as text, select "
 msgstr "     - Om als tekst weer te geven selecteer "
 
-#: src/textview.c:965
+#: src/textview.c:992
 msgid "'Display as text'"
 msgstr "'Als tekst weergeven'"
 
-#: src/textview.c:976
+#: src/textview.c:1003
 msgid "     - To open with an external program, select "
 msgstr "     - Om te openen met een extern programma, selecteer "
 
-#: src/textview.c:977
+#: src/textview.c:1004
 msgid "'Open'"
 msgstr "'Openen'"
 
-#: src/textview.c:985
+#: src/textview.c:1012
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (of dubbelklik, of klik met de middelste "
 
-#: src/textview.c:986
+#: src/textview.c:1013
 msgid "mouse button)\n"
 msgstr "muisknop)\n"
 
-#: src/textview.c:988
+#: src/textview.c:1015
 msgid "     - Or use "
 msgstr "     - Of gebruik "
 
-#: src/textview.c:989
+#: src/textview.c:1016
 msgid "'Open with...'"
 msgstr "'Open met...'"
 
-#: src/textview.c:1111
+#: src/textview.c:1139
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19502,432 +19740,464 @@ msgstr ""
 "    %s\n"
 "Uitvoer-code %d\n"
 
-#: src/textview.c:2195
+#: src/textview.c:2235
 msgid "Tags: "
 msgstr "Tags: "
 
-#: src/textview.c:2914
+#: src/textview.c:2716
+msgid "Zoom _In"
+msgstr "_Inzoomen"
+
+#: src/textview.c:2727
+msgid "Zoom _Out"
+msgstr "_Uitzoomen"
+
+#: src/textview.c:2738
+msgid "Reset _zoom"
+msgstr "_Zoom herstellen"
+
+#: src/textview.c:3105
+msgid "Copy it anyway?"
+msgstr "Toch kopiëren?"
+
+#: src/textview.c:3105
+msgid "Open it anyway?"
+msgstr "Toch openen?"
+
+#: src/textview.c:3106
+msgid "Co_py URL"
+msgstr "Ko_pieer URL"
+
+#: src/textview.c:3106
+msgid "_Open URL"
+msgstr "_Open URL"
+
+#: src/textview.c:3112
 msgid "The real URL is different from the displayed URL."
 msgstr "De echte URL verschilt van de weergegeven URL."
 
-#: src/textview.c:2915
+#: src/textview.c:3113
 msgid "Displayed URL:"
 msgstr "Weergegeven URL:"
 
-#: src/textview.c:2916
+#: src/textview.c:3114
 msgid "Real URL:"
 msgstr "Echte URL:"
 
-#: src/textview.c:2917
-msgid "Open it anyway?"
-msgstr "Toch openen?"
-
-#: src/textview.c:2918
+#: src/textview.c:3116
 msgid "Phishing attempt warning"
 msgstr "Phishing-waarschuwing"
 
-#: src/textview.c:2919
-msgid "_Open URL"
-msgstr "_Open URL"
-
-#: src/toolbar.c:224 src/toolbar.c:2294
+#: src/toolbar.c:227 src/toolbar.c:2335
 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:2340
 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:2344
 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:2362 src/toolbar.c:2373
 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:2417 src/toolbar.c:2427
 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:2434 src/toolbar.c:2444
 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:2451 src/toolbar.c:2461
 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:2468 src/toolbar.c:2478
 msgid "Reply to Mailing-list"
 msgstr "Beantwoord mailing-lijst"
 
-#: src/toolbar.c:233 src/toolbar.c:2315
+#: src/toolbar.c:236 src/toolbar.c:2356
 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:2485 src/toolbar.c:2496
 msgid "Forward Message"
 msgstr "Stuur bericht door"
 
-#: src/toolbar.c:235 src/toolbar.c:2460
+#: src/toolbar.c:238 src/toolbar.c:2501
 msgid "Trash Message"
 msgstr "Bericht naar prullenbak"
 
-#: src/toolbar.c:236 src/toolbar.c:2464
+#: src/toolbar.c:239 src/toolbar.c:2505
 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:2513
 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:2517
 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:2523
 msgid "Send Message"
 msgstr "Verzend bericht"
 
-#: src/toolbar.c:259 src/toolbar.c:2486
+#: src/toolbar.c:263 src/toolbar.c:2527
 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:2531
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/toolbar.c:261 src/toolbar.c:2494
+#: src/toolbar.c:265 src/toolbar.c:2535
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/toolbar.c:262 src/toolbar.c:2498
+#: src/toolbar.c:266 src/toolbar.c:2539
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: src/toolbar.c:263 src/toolbar.c:2502
+#: src/toolbar.c:267 src/toolbar.c:2543
 msgid "Insert signature"
 msgstr "Ondertekening invoegen"
 
-#: src/toolbar.c:264 src/toolbar.c:2506
+#: src/toolbar.c:268 src/toolbar.c:2547
 msgid "Replace signature"
 msgstr "Ondertekening vervangen"
 
-#: src/toolbar.c:265 src/toolbar.c:2510
+#: src/toolbar.c:269 src/toolbar.c:2551
 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:2555
 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:2559
 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:2568
 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:2573
 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:2581
 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:2600
 msgid "Cancel receiving"
 msgstr "Ophalen annuleren"
 
-#: src/toolbar.c:277 src/toolbar.c:2567
+#: src/toolbar.c:281 src/toolbar.c:2608
 msgid "Cancel receiving/sending"
 msgstr "Ophalen/verzenden annuleren"
 
-#: src/toolbar.c:278 src/toolbar.c:2307
+#: src/toolbar.c:282 src/toolbar.c:2348
 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:2401 src/toolbar.c:2410
 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:2330
 msgid "Go to folder list"
 msgstr "Ga naar mappenlijst"
 
-#: src/toolbar.c:2295
+#: src/toolbar.c:2336
 msgid "Receive Mail from selected Account"
 msgstr "E-mail voor geselecteerde Account ophalen"
 
-#: src/toolbar.c:2311
+#: src/toolbar.c:2352
 msgid "Open preferences"
 msgstr "Open voorkeuren"
 
-#: src/toolbar.c:2322
+#: src/toolbar.c:2363
 msgid "Compose with selected Account"
 msgstr "E-mail opstellen met geselecteerde Account"
 
-#: src/toolbar.c:2343
+#: src/toolbar.c:2384
 msgid "Learn as..."
 msgstr "Leren als..."
 
-#: src/toolbar.c:2353
+#: src/toolbar.c:2394
 msgid "Learn as _Spam"
 msgstr "Leer als _Spam"
 
-#: src/toolbar.c:2354
+#: src/toolbar.c:2395
 msgid "Learn as _Ham"
 msgstr "Leer als _Ham"
 
-#: src/toolbar.c:2361
+#: src/toolbar.c:2402
 msgid "Delete duplicates options"
 msgstr "Opties voor verwijderen dubbele berichten"
 
-#: src/toolbar.c:2365
+#: src/toolbar.c:2406
 msgid "Delete duplicates in selected folder"
 msgstr "Verwijder dubbele berichten in geselecteerde map"
 
-#: src/toolbar.c:2366
+#: src/toolbar.c:2407
 msgid "Delete duplicates in all folders"
 msgstr "Verwijder dubbele berichten in alle mappen"
 
-#: src/toolbar.c:2377
+#: src/toolbar.c:2418
 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:2422 src/toolbar.c:2439 src/toolbar.c:2456 src/toolbar.c:2473
 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:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "Reply without _quote"
 msgstr "Antwoord _zonder citaat"
 
-#: src/toolbar.c:2394
+#: src/toolbar.c:2435
 msgid "Reply to Sender options"
 msgstr "Opties voor afzender antwoorden"
 
-#: src/toolbar.c:2411
+#: src/toolbar.c:2452
 msgid "Reply to All options"
 msgstr "Opties voor allen beantwoorden"
 
-#: src/toolbar.c:2428
+#: src/toolbar.c:2469
 msgid "Reply to Mailing-list options"
 msgstr "Opties voor mailing-lijst beantwoorden"
 
-#: src/toolbar.c:2445
+#: src/toolbar.c:2486
 msgid "Forward Message options"
 msgstr "Opties voor bericht doorsturen"
 
-#: src/uri_opener.c:87
+#: src/uri_opener.c:71
+msgid "C_opy URL"
+msgstr "K_opieer URL"
+
+#: src/uri_opener.c:102
 msgid "There are no URLs in this email."
 msgstr "Er zijn geen adressen in deze e-mail."
 
-#: src/uri_opener.c:115
-msgid "Available URLs:"
-msgstr "Beschikbare adressen:"
+#: src/uri_opener.c:130
+msgid "Included URLs:"
+msgstr "Ingevoegde URLs:"
 
-#: src/uri_opener.c:189
+#: src/uri_opener.c:210
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "Open adressen"
 
-#: src/uri_opener.c:217
-msgid "Please select the URL to open."
-msgstr "Selecteer een adres om te openen."
+#: src/uri_opener.c:238
+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:225
+#: src/uri_opener.c:246
 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"
@@ -19988,7 +20258,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"
@@ -20017,47 +20287,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:976
+#: src/wizard.c:975
 msgid "Your name:"
 msgstr "Je naam:"
 
-#: src/wizard.c:987
+#: src/wizard.c:986
 msgid "Your email address:"
 msgstr "Je e-mailadres:"
 
-#: src/wizard.c:998
+#: src/wizard.c:997
 msgid "Your organization:"
 msgstr "Je organisatie:"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1031
 msgid "Mailbox name:"
 msgstr "Postvak-naam:"
 
-#: src/wizard.c:1040
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -20065,7 +20335,7 @@ msgstr ""
 "Je kunt ook een absoluut pad opgeven, bijvoorbeeld: \"/home/kees/Documenten/"
 "Mail\""
 
-#: src/wizard.c:1111
+#: src/wizard.c:1110
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -20073,51 +20343,51 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:25\""
 
-#: src/wizard.c:1114
+#: src/wizard.c:1113
 msgid "SMTP server address:"
 msgstr "SMTP-serveradres:"
 
-#: src/wizard.c:1129
+#: src/wizard.c:1128
 msgid "(empty to use the same as receive)"
 msgstr "(laat leeg om dezelfde als bij ontvangen te gebruiken)"
 
-#: src/wizard.c:1143
+#: src/wizard.c:1142
 msgid "SMTP username:"
 msgstr "SMTP-gebruikersnaam:"
 
-#: src/wizard.c:1154
+#: src/wizard.c:1153
 msgid "SMTP password:"
 msgstr "SMTP-wachtwoord:"
 
-#: src/wizard.c:1167
-msgid "Use SSL/TLS to connect to SMTP server"
-msgstr "Gebruik SSL/TLS voor verbinding met de SMTP-server"
+#: src/wizard.c:1166
+msgid "Use TLS to connect to SMTP server"
+msgstr "Gebruik TLS voor verbinding met de SMTP-server"
 
-#: src/wizard.c:1178 src/wizard.c:1598
+#: src/wizard.c:1177 src/wizard.c:1597
 msgid "Use STARTTLS command to start encryption"
 msgstr "Gebruik STARTTLS voor starten beveiligde sessie"
 
-#: src/wizard.c:1190 src/wizard.c:1610
-msgid "Client SSL/TLS certificate (optional)"
-msgstr "Client SSL/TLS-certificaat (optioneel)"
+#: src/wizard.c:1189 src/wizard.c:1609
+msgid "Client TLS certificate (optional)"
+msgstr "Client TLS-certificaat (optioneel)"
 
-#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
+#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
 msgid "Server address:"
 msgstr "Serveradres:"
 
-#: src/wizard.c:1322
+#: src/wizard.c:1321
 msgid "Local mailbox:"
 msgstr "Lokaal postvak:"
 
-#: src/wizard.c:1491
+#: src/wizard.c:1490
 msgid "Server type:"
 msgstr "Servertype:"
 
-#: src/wizard.c:1500
+#: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1556
+#: src/wizard.c:1555
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -20125,19 +20395,19 @@ msgstr ""
 "Je kunt het poortnummer specificeren door het aan het eind toe te voegen: "
 "\"mail.voorbeeld.com:110\""
 
-#: src/wizard.c:1587
-msgid "Use SSL/TLS to connect to receiving server"
-msgstr "Gebruik SSL/TLS voor verbinding met de ontvangende server"
+#: src/wizard.c:1586
+msgid "Use TLS to connect to receiving server"
+msgstr "Gebruik TLS voor verbinding met de ontvangende server"
 
-#: src/wizard.c:1652
+#: src/wizard.c:1651
 msgid "IMAP server directory:"
 msgstr "IMAP-servermap:"
 
-#: src/wizard.c:1663
+#: src/wizard.c:1662
 msgid "Show only subscribed folders"
 msgstr "Alleen geabonneerde mappen weergeven"
 
-#: src/wizard.c:1671
+#: src/wizard.c:1670
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -20145,15 +20415,15 @@ msgstr ""
 "Waarschuwing: deze versie van Claws Mail\n"
 "is gecompileerd zonder ondersteuning voor IMAP."
 
-#: src/wizard.c:1789
+#: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail Setup-assistent"
 
-#: src/wizard.c:1822
+#: src/wizard.c:1821
 msgid "Welcome to Claws Mail"
 msgstr "Welkom by Claws Mail"
 
-#: src/wizard.c:1829
+#: src/wizard.c:1828
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -20167,31 +20437,31 @@ msgstr ""
 "gebruikte e-mailopties zodat je binnen vijf minuten Claws Mail kunt "
 "gebruiken."
 
-#: src/wizard.c:1842
+#: src/wizard.c:1841
 msgid "About You"
 msgstr "Over u"
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: src/wizard.c:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
 msgid "Bold fields must be completed"
 msgstr "Velden in vet zijn verplicht"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1856
 msgid "Receiving mail"
 msgstr "E-mail ontvangen"
 
-#: src/wizard.c:1872
+#: src/wizard.c:1871
 msgid "Sending mail"
 msgstr "E-mail verzenden"
 
-#: src/wizard.c:1888
+#: src/wizard.c:1887
 msgid "Saving mail on disk"
 msgstr "E-mail opslaan op schijf"
 
-#: src/wizard.c:1904
+#: src/wizard.c:1903
 msgid "Configuration finished"
 msgstr "Klaar met instellen"
 
-#: src/wizard.c:1911
+#: src/wizard.c:1910
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
@@ -20199,56 +20469,3 @@ msgstr ""
 "Claws Mail is nu klaar.\n"
 "Klik op 'Opslaan' om te starten."
 
-#~ msgid "_Yes"
-#~ msgstr "_Ja"
-
-#~ msgid "_New"
-#~ msgstr "_Nieuw"
-
-#~ msgid "_Properties"
-#~ msgstr "_Eigenschappen"
-
-#~ msgid "Find and _Replace"
-#~ msgstr "Zoeken en _vervangen"
-
-#~ msgid "_Bottom"
-#~ msgstr "_Onderaan"
-
-#~ msgid "_Down"
-#~ msgstr "Naar b_eneden"
-
-#~ msgid "_Next"
-#~ msgstr "Vo_lgende"
-
-#~ msgid "_Previous"
-#~ msgstr "Vo_rige"
-
-#~ msgid "_Top"
-#~ msgstr "_Bovenaan"
-
-#~ msgid "_Up"
-#~ msgstr "Naar bo_ven"
-
-#~ msgid "_Add"
-#~ msgstr "Toe_voegen"
-
-#~ msgid "_Stop"
-#~ msgstr "_Stop"
-
-#~ msgid "_Execute"
-#~ msgstr "_Uitvoeren"
-
-#~ msgid "_Refresh"
-#~ msgstr "V_erversen"
-
-#~ msgid "_Apply"
-#~ msgstr "_Toepassen"
-
-#~ msgid "_Quit"
-#~ msgstr "_Afsluiten"
-
-#~ msgid "_Rename"
-#~ msgstr "_Hernoemen"
-
-#~ msgid "Use secure authentication (APOP)"
-#~ msgstr "Gebruik beveiligde authenticatie (APOP)"
diff --git a/po/pl.po b/po/pl.po
index b62767758..06a9de179 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 3.18.0git358\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-04-02 11:17+0100\n"
-"PO-Revision-Date: 2022-04-02 21:29+0200\n"
+"POT-Creation-Date: 2022-10-13 20:42+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:403 src/account.c:470
 msgid ""
@@ -44,7 +44,7 @@ msgstr "Nie można utworzyć katalogu."
 
 #: src/account.c:738
 msgid "Edit accounts"
-msgstr "Edytuj konta"
+msgstr "Dostosowywanie kont"
 
 #: src/account.c:755
 msgid ""
@@ -52,33 +52,34 @@ 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:789
 msgid "Create a new account"
-msgstr "Utwórz nowe konto"
+msgstr "Utworzy nowe konto"
 
 #: src/account.c:797
 msgid "Edit preferences for the selected account"
-msgstr "Zmień ustawienia dla zaznaczonego konta"
+msgstr "Dostosuje ustawienia dla danego konta"
 
 #: src/account.c:805
 msgid "Delete the selected account from the list"
-msgstr "Usuń zaznaczone konto ze spisu"
+msgstr "Usunie dane konto ze spisu"
 
 #: src/account.c:813
 msgid "Create a new copy of the selected account"
-msgstr "Utwórz nową kopię zaznaczonego konta"
+msgstr "Utworzy kopię danego konta"
 
 #: src/account.c:821
 msgid "Move the selected account down"
-msgstr "Przesuń zaznaczone konto w dół"
+msgstr "Przesunie dane konto w dół"
 
 #: src/account.c:829
 msgid "Move the selected account up"
-msgstr "Przesuń zaznaczone konto w górę"
+msgstr "Przesunie dane konto w górę"
 
 #: src/account.c:836
 msgid " _Set as default account "
@@ -86,7 +87,7 @@ msgstr " U_staw jako konto domyślne "
 
 #: src/account.c:928
 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:935
 #, c-format
@@ -124,13 +125,13 @@ msgstr "'Pobierz z wszystkich kont' odbierze pocztę z zaznaczonych kont"
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1851
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:385
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
 #: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
 #: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account.c:1637 src/prefs_account.c:1271 src/prefs_account.c:5015
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Protokół"
 
@@ -189,10 +190,10 @@ msgstr ""
 #: src/compose.c:9783 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"
 
@@ -321,7 +322,7 @@ msgstr "Czy naprawdę usunąć tę nazwę cechy?"
 
 #: src/addrcustomattr.c:196
 msgid "Reset to default"
-msgstr "Domyślne"
+msgstr "Wyzeruj do domyślnych"
 
 #: src/addrcustomattr.c:197
 msgid ""
@@ -345,7 +346,7 @@ msgstr "Usuń _wszystko"
 
 #: src/addrcustomattr.c:219
 msgid "_Reset to default"
-msgstr "_Domyślne"
+msgstr "Wyze_ruj do domyślnych"
 
 #: src/addrcustomattr.c:411
 msgid "Attribute name is not set."
@@ -354,11 +355,11 @@ msgstr "Nie określono nazwy cechy."
 #: src/addrcustomattr.c:470
 msgctxt "Dialog title"
 msgid "Edit attribute names"
-msgstr "Edycja nazw cech"
+msgstr "Zmień nazwy cech"
 
 #: src/addrcustomattr.c:484
 msgid "New attribute name:"
-msgstr "Nazwa cechy:"
+msgstr "Nazwa nowej cechy:"
 
 #: src/addrcustomattr.c:521
 msgid ""
@@ -377,14 +378,14 @@ 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:315
 msgid "No duplicate email addresses found in the address book"
@@ -395,7 +396,7 @@ msgid "Duplicate email addresses"
 msgstr "Powielone adresy pocztowe"
 
 #: src/addrduplicates.c:443 src/addressadd.c:235
-#: 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"
@@ -449,19 +450,19 @@ msgstr "Wybrany adres nie może być dodany"
 #: src/editaddress.c:1287 src/editgroup.c:291 src/expldifdlg.c:517
 #: 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:401 src/addressbook.c:431 src/addressbook.c:456
-#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:524
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
 #: src/messageview.c:213 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:527
+#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:525
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Narzędzia"
@@ -516,7 +517,7 @@ msgid "C_ut"
 msgstr "Wy_tnij"
 
 #: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
-#: src/compose.c:649 src/mainwindow.c:558 src/messageview.c:229
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "S_kopiuj"
@@ -536,7 +537,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"
@@ -564,18 +565,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:411
 #: src/plugins/vcalendar/month-view.c:427 src/prefs_themes.c:917
 #: src/prefs_themes.c:949 src/prefs_themes.c:950
@@ -689,7 +690,7 @@ msgstr "Książka adresowa"
 
 #: src/addressbook.c:1104 src/editldap.c:794
 msgid "Search"
-msgstr "Szukaj"
+msgstr "Poszukaj"
 
 #: src/addressbook.c:1476
 msgid "Delete group"
@@ -732,7 +733,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:332 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -765,7 +766,7 @@ msgstr ""
 #: src/addressbook.c:3099
 #, c-format
 msgid "Search '%s'"
-msgstr "Szukaj '%s'"
+msgstr "Poszukaj '%s'"
 
 #: src/addressbook.c:3237 src/addressbook.c:3286
 msgid "New Contacts"
@@ -844,7 +845,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:5019 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3470 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Katalog"
 
@@ -903,7 +904,7 @@ msgstr "Nazwa książki adresowej:"
 
 #: src/addrgather.c:398
 msgid "Address book folder size:"
-msgstr "Rozmiar katalogu książki adresowej:j"
+msgstr "Rozmiar katalogu książki adresowej:"
 
 #: src/addrgather.c:402 src/addrgather.c:411
 msgid ""
@@ -918,7 +919,7 @@ msgstr "Przetwarzane nagłówki"
 
 #: src/addrgather.c:434
 msgid "Include subfolders"
-msgstr "Uwzględniaj podkatalogi"
+msgstr "Uwzględnij podkatalogi"
 
 #: src/addrgather.c:492 src/prefs_filtering_action.c:1384
 msgid "Header Name"
@@ -939,7 +940,7 @@ msgstr "Koniec"
 
 #: src/addrgather.c:645
 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:649
 msgid "Collect email addresses from folder"
@@ -969,18 +970,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:141 src/compose.c:9857
+#: src/alertpanel.c:141 src/compose.c:9866 src/mimeview.c:1836
 msgid "Notice"
 msgstr "Powiadomienie"
 
 #: src/alertpanel.c:154 src/compose.c:5895 src/compose.c:6444
-#: src/compose.c:12266 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:863 src/plugins/pgpcore/sgpgme.c:1000
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:731
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Błąd"
@@ -991,7 +992,7 @@ msgstr "_Pokaż dziennik"
 
 #: src/alertpanel.c:343
 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:223
 msgid "Browse Directory Entry"
@@ -1100,63 +1101,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"
@@ -1483,8 +1484,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"
 
@@ -1501,7 +1502,7 @@ msgstr "_Usuń"
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
-#: src/compose.c:619 src/mainwindow.c:526 src/messageview.c:215
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "Wiado_mość"
 
@@ -1513,7 +1514,7 @@ msgstr "Pi_sownia"
 msgid "_Options"
 msgstr "U_stawienia"
 
-#: src/compose.c:626 src/mainwindow.c:529 src/messageview.c:217
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -1573,7 +1574,7 @@ msgstr "_Z zawijaniem wierszy"
 msgid "_Unwrapped"
 msgstr "_Bez zawijania wierszy"
 
-#: src/compose.c:657 src/mainwindow.c:559
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Z_aznacz wszystko"
@@ -1641,7 +1642,7 @@ msgstr "Usuń do końca wiersza"
 #: src/compose.c:676 src/messageview.c:232
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
-msgstr "_Szukaj"
+msgstr "Po_szukaj"
 
 #: src/compose.c:679
 msgid "_Wrap current paragraph"
@@ -1683,47 +1684,47 @@ msgstr "Ochrona prywatności"
 msgid "_Priority"
 msgstr "_Ważność"
 
-#: src/compose.c:703 src/mainwindow.c:621 src/messageview.c:268
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Kodowani_e znaków"
 
-#: src/compose.c:708 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:273
 msgid "Western European"
 msgstr "Zachodnioeuropejskie"
 
-#: src/compose.c:709 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Bałtyckie"
 
-#: src/compose.c:710 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrajskie"
 
-#: src/compose.c:711 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabskie"
 
-#: src/compose.c:712 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:712 src/mainwindow.c:628 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: src/compose.c:713 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:713 src/mainwindow.c:629 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japońskie"
 
-#: src/compose.c:714 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Chińskie"
 
-#: src/compose.c:715 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreańskie"
 
-#: src/compose.c:716 src/mainwindow.c:634 src/messageview.c:281
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Tajskie"
 
-#: src/compose.c:719 src/mainwindow.c:744 src/messageview.c:317
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "Książka _adresowa"
 
@@ -1731,11 +1732,11 @@ msgstr "Książka _adresowa"
 msgid "_Template"
 msgstr "Wzorce"
 
-#: src/compose.c:723 src/mainwindow.c:774 src/messageview.c:339
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Działa_nia"
 
-#: src/compose.c:727 src/mainwindow.c:828 src/messageview.c:343
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "O progr_amie"
 
@@ -1757,7 +1758,7 @@ msgstr "Za_szyfruj"
 
 #: src/compose.c:736
 msgid "_Request Return Receipt"
-msgstr "Żądaj potwierdzenia dostarczenia"
+msgstr "Pop_roś o potwierdzenie dostarczenia"
 
 #: src/compose.c:737
 msgid "Remo_ve references"
@@ -1771,19 +1772,19 @@ msgstr "Pokaż li_nijkę"
 msgid "_Normal"
 msgstr "Z_wykły"
 
-#: src/compose.c:744 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_All"
-msgstr "W_szyscy"
+msgstr "W_szystkim"
 
-#: src/compose.c:745 src/mainwindow.c:676 src/messageview.c:307
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
 #: src/summaryview.c:435
 msgid "_Sender"
-msgstr "Nadawca"
+msgstr "Nadawcy"
 
 #: src/compose.c:746
 msgid "_Mailing-list"
-msgstr "Lista dyskusyjna"
+msgstr "Na listę dyskusyjną"
 
 #: src/compose.c:751
 msgid "_Highest"
@@ -1801,27 +1802,27 @@ msgstr "Niska"
 msgid "_Lowest"
 msgstr "Najniższa"
 
-#: src/compose.c:760 src/mainwindow.c:893 src/messageview.c:356
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "S_am wykryj"
 
-#: src/compose.c:761 src/mainwindow.c:894 src/messageview.c:357
+#: src/compose.c:761 src/mainwindow.c:892 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7 bitowe ASCII (US-ASCII)"
 
-#: src/compose.c:762 src/mainwindow.c:895 src/messageview.c:358
+#: src/compose.c:762 src/mainwindow.c:893 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unikod (UTF-8)"
 
-#: src/compose.c:766 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:766 src/mainwindow.c:897 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Środkowoeuropejskie (ISO-8859-2)"
 
-#: src/compose.c:769 src/mainwindow.c:902 src/messageview.c:365
+#: src/compose.c:769 src/mainwindow.c:900 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Greckie (ISO-8859-7)"
 
-#: src/compose.c:774 src/mainwindow.c:907 src/messageview.c:370
+#: src/compose.c:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Tureckie (ISO-8859-9)"
 
@@ -1948,7 +1949,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Czy jesteś pewny?"
 
-#: src/compose.c:3717 src/compose.c:10846 src/compose.c:11746
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "Ws_taw"
 
@@ -1983,7 +1984,7 @@ msgstr " [zmieniono]"
 #: src/compose.c:4902 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:4905 src/plugins/python/composewindowtype.c:504
 #, c-format
@@ -2008,7 +2009,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:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
-#: src/prefs_account.c:4130 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Wyślij"
 
@@ -2173,7 +2174,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:6445 src/mainwindow.c:666 src/toolbar.c:280 src/toolbar.c:2604
+#: src/compose.c:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Przerwij wysyłanie"
 
@@ -2196,15 +2197,17 @@ msgstr "Usuń zawartość wpisu"
 
 #: src/compose.c:7279 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 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:7511
 msgid "Mime type"
 msgstr "Rodzaj MIME"
 
-#: src/compose.c:7517 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:473
+#: src/compose.c:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -2270,8 +2273,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:8800 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
@@ -2329,17 +2332,17 @@ 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:9742
 #, 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"
 
@@ -2348,29 +2351,39 @@ msgstr ""
 msgid "External editor stopped with an error: %s"
 msgstr "Zewnętrzy edytor zatrzymał się z błędem: %s"
 
-#: src/compose.c:9854
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "id procesu: %"
+
+#: src/compose.c:9858
+#, c-format
+msgid "process id: %d"
+msgstr "id procesu: %d"
+
+#: src/compose.c:9863
+#, 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:10260 src/messageview.c:1095
+#: src/compose.c:10273 src/messageview.c:1095
 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:10463
+#: src/compose.c:10476
 msgid "Could not save draft."
 msgstr "Nie można zapisać kopii roboczej."
 
-#: src/compose.c:10467
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "Nie można zapisać kopii roboczej"
 
-#: src/compose.c:10468
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2378,76 +2391,77 @@ msgstr ""
 "Nie można zapisać kopii roboczej\n"
 "Co chcesz zrobić z tą wiadomością ?"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "_Anuluj i wyjdź"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "Porzuć wia_domość"
 
-#: src/compose.c:10658 src/compose.c:10672
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Zaznacz plik"
 
-#: src/compose.c:10686
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nie można odczytać pliku '%s'."
 
-#: src/compose.c:10688
+#: src/compose.c:10704
 #, 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:10765
+#: src/compose.c:10781
 msgid "Discard message"
 msgstr "Porzucanie wiadomości"
 
-#: src/compose.c:10766
+#: src/compose.c:10782
 msgid "This message has been modified. Discard it?"
 msgstr "Wiadomość ta uległa zmianie. Czy porzucić te zmiany?"
 
-#: src/compose.c:10767 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "Por_zuć"
 
-#: src/compose.c:10767 src/compose.c:10772
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "Zapi_sz w katalogu roboczych"
 
-#: src/compose.c:10770 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Zapisywanie zmian"
 
-#: src/compose.c:10771
+#: src/compose.c:10787
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Wiadomość ta uległa zmianie. Czy zapisać te zmiany?"
 
-#: src/compose.c:10772
+#: src/compose.c:10788
 msgid "_Don't save"
 msgstr "_Nie zapisuj"
 
-#: src/compose.c:10843
+#: src/compose.c:10859
 #, 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:10845
+#: src/compose.c:10861
 msgid "Apply template"
-msgstr "Dołącz szablon"
+msgstr "Użycie szablonu"
 
-#: src/compose.c:10846 src/prefs_actions.c:333 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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:1019
 msgid "_Replace"
 msgstr "Z_astąp"
 
-#: src/compose.c:10922
+#: src/compose.c:10938
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2456,7 +2470,7 @@ msgstr ""
 "Rozmiar wklejanego tekstu przekracza graniczny (%dKiB) do wklejenia.\n"
 "Załącz go jako plik."
 
-#: src/compose.c:11739
+#: src/compose.c:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2470,26 +2484,26 @@ msgstr[1] ""
 msgstr[2] ""
 "Wstawić %d plików do treści wiadomości, czy dodać je jako załączniki?"
 
-#: src/compose.c:11745
+#: src/compose.c:11761
 msgid "Insert or attach?"
 msgstr "Wstawić czy załączyć?"
 
-#: src/compose.c:11746
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "Z_ałącz"
 
-#: src/compose.c:11964
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Błąd formatu cytowania w wierszu %d."
 
-#: src/compose.c:12260
+#: src/compose.c:12276
 #, 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
@@ -2550,12 +2564,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."
@@ -2574,12 +2588,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."
@@ -2702,7 +2714,7 @@ msgid " Check File "
 msgstr " Sprawdź plik "
 
 #: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2478
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Plik"
@@ -2760,7 +2772,7 @@ msgstr "Nowy katalog"
 #: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:130
 msgid "Input the name of new folder:"
-msgstr "Podaj nazwę nowego katalogu:"
+msgstr "Wpisz nazwę nowego katalogu:"
 
 #: src/editjpilot.c:188
 msgid "File does not appear to be JPilot format."
@@ -2786,13 +2798,13 @@ msgstr "Dodaj nowy wpis JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Edytuj LDAP - Wybierz podstawę wyszukiwania"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3230
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3268
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Nazwa gospodarza"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3237
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2845,17 +2857,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:469
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:4221
+#: src/editldap.c:470 src/prefs_account.c:4277
 msgid "TLS"
 msgstr "TLS"
 
@@ -2868,8 +2879,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:479
 msgid ""
@@ -2877,9 +2888,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:491
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -2978,8 +2989,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:642
 msgid "Match names 'containing' search term"
@@ -2987,11 +2998,11 @@ msgstr "Zaznacz nazwy 'zawierające' szukane pojęcie"
 
 #: src/editldap.c:647
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"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ć "
@@ -3023,8 +3034,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:739 src/prefs_account.c:1477 src/prefs_account.c:2108
-#: src/prefs_account.c:3042 src/prefs_account.c:3070 src/prefs_account.c:3275
+#: src/editldap.c:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
 #: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Pokaż hasło"
@@ -3046,7 +3057,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:793 src/prefs_account.c:4094
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -3133,11 +3144,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"
 
@@ -3201,9 +3212,9 @@ msgid "Stylesheet"
 msgstr "Wzór stylów"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
-#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1184
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
 #: src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
 #: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 msgid "None"
 msgstr "Brak"
@@ -3212,9 +3223,9 @@ msgstr "Brak"
 #: src/prefs_folder_item.c:1260 src/prefs_folder_item.c:1292
 #: src/prefs_other.c:129 src/prefs_other.c:417
 msgid "Default"
-msgstr "Domyślne"
+msgstr "Domyślnie"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Pełny"
@@ -3403,10 +3414,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:543
 msgid "Use DN attribute if present in data"
@@ -3434,8 +3445,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:655
 msgid "Export Address Book to LDIF File"
@@ -3445,13 +3456,13 @@ msgstr "Eksportowanie książki adresowej do pliku LDIF"
 msgid "Distinguished Name"
 msgstr "Unikalna nazwa"
 
-#: src/export.c:113 src/summaryview.c:8508
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "Eksportowanie do pliku mbox"
 
 #: src/export.c:132
 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:143
 msgid "Source folder:"
@@ -3459,7 +3470,7 @@ msgstr "Katalog źródłowy:"
 
 #: src/export.c:149 src/import.c:143
 msgid "Mbox file:"
-msgstr "Lokalny plik mbox"
+msgstr "Plik skrzynki mbox:"
 
 #: src/export.c:205
 msgid "Target mbox filename can't be left empty."
@@ -3528,152 +3539,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:658
+msgid ""
+"rule is not account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"zasada jest niezależna od konta, mimo to stosowane są wszystkie zasady na"
+" życzenie użytkownika\n"
 
-#: src/filtering.c:646
+#: 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 ""
-"reguła nie opiera się na koncie, wszystkie reguły są dopasowywane i tak na "
-"żądanie użytkownika\n"
+"zasada jest zależna od konta, mimo to stosowane są wszystkie zasady na"
+" życzenie użytkownika\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 ""
 "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"
@@ -3690,11 +3720,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"
@@ -3755,7 +3785,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."
@@ -3772,21 +3802,21 @@ msgstr "Nowy katalog"
 
 #: src/foldersel.c:575 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:585 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:302
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:239
-#: src/plugins/vcalendar/vcal_folder.c:2103
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' nie może występować w nazwie katalogu."
 
 #: src/foldersel.c:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:251
-#: src/plugins/vcalendar/vcal_folder.c:2110
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Katalog '%s' już istnieje."
@@ -3800,25 +3830,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:563
+#: src/folderview.c:254 src/mainwindow.c:561
 msgid "_Search folder..."
 msgstr "Po_szukaj w katalogu..."
 
@@ -3828,11 +3858,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"
@@ -3854,7 +3884,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:474
@@ -3867,33 +3897,32 @@ msgstr "Ustawianie szczegółów katalogu..."
 
 #: src/folderview.c:869 src/summaryview.c:4292
 msgid "Mark all as read"
-msgstr "Oznacz wszystkie jako przeczytane"
+msgstr "Oznaczanie wszystkich jako przeczytane"
 
 #: src/folderview.c:870
 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:872 src/summaryview.c:4293
 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:875 src/summaryview.c:4338
 msgid "Mark all as unread"
-msgstr "Oznacz wszystkie jako nieprzeczytane"
+msgstr "Oznaczanie wszystkich jako nieprzeczytane"
 
 #: src/folderview.c:876
 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:878 src/summaryview.c:4339
 msgid "Do you really want to mark all mails in this folder as unread?"
@@ -3901,12 +3930,12 @@ msgstr ""
 "Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu jako "
 "nieprzeczytane?"
 
-#: src/folderview.c:1074 src/imap.c:4693
+#: src/folderview.c:1074 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Odpytywanie katalogu %s/%s..."
 
-#: src/folderview.c:1077 src/imap.c:4697 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Odpytywanie katalogu %s..."
@@ -3919,9 +3948,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:1119
 msgid "Rebuilding folder tree..."
@@ -3954,7 +3982,7 @@ msgstr "Otwieranie katalogu %s..."
 msgid "Folder could not be opened."
 msgstr "Katalog nie mógł zostać otworzony."
 
-#: src/folderview.c:2493 src/mainwindow.c:2901 src/mainwindow.c:2906
+#: src/folderview.c:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Opróżnij kosz"
 
@@ -3966,15 +3994,15 @@ msgstr "Usunąć wszystkie wiadomości z kosza?"
 msgid "_Empty trash"
 msgstr "Opróżnij _kosz"
 
-#: src/folderview.c:2539 src/inc.c:1669 src/toolbar.c:3085
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Ostrzeżenie o braku sieci"
 
 #: src/folderview.c:2540 src/toolbar.c:3086
 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:2551 src/toolbar.c:3105
 msgid "Send queued messages"
@@ -4068,11 +4096,11 @@ msgstr "Wybierz źródła wieści, do zapisania się:"
 
 #: src/grouplistdialog.c:184
 msgid "Find groups:"
-msgstr "Znajdź grupę:"
+msgstr "Poszukaj grup:"
 
 #: src/grouplistdialog.c:192
 msgid " Search "
-msgstr " Szukaj "
+msgstr " Poszukaj "
 
 #: src/grouplistdialog.c:204
 msgid "Newsgroup name"
@@ -4082,7 +4110,7 @@ msgstr "Nazwa źródła wieści"
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Rodzaj"
 
@@ -4137,7 +4165,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:857
+#: src/gtk/about.c:164 src/gtk/about.c:866
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4208,7 +4236,7 @@ msgstr "Współtwórcy"
 
 #: src/gtk/about.c:414
 msgid "Compiled-in Features"
-msgstr "Cechy włączone do zbudowania programu"
+msgstr "Dodatki użyte do zbudowania programu"
 
 #: src/gtk/about.c:431
 msgctxt "compface"
@@ -4226,47 +4254,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "dodaje obsługę szyfrowanych połączeń z serwerami\n"
 
 #: src/gtk/about.c:461
-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:472
 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:482
+#: src/gtk/about.c:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "dodaje obsługę adresów IPv6\n"
+
+#: src/gtk/about.c:481
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "dodaje obsługę książek adresowych PalmOS\n"
 
-#: src/gtk/about.c:492
+#: src/gtk/about.c:491
 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:502
+#: src/gtk/about.c:501
 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:512
+#: src/gtk/about.c:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "dodaje obsługę wyglądów SVG\n"
+
+#: src/gtk/about.c:521
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "dodaje obsługę posiedzeń\n"
 
-#: src/gtk/about.c:522
+#: src/gtk/about.c:531
 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:532
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "dodaje obsługę wyglądów SVG\n"
+#: src/gtk/about.c:541
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "dodaje obsługę uwierzytelniania OAuth2\n"
 
-#: src/gtk/about.c:564
+#: src/gtk/about.c:573
 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 "
@@ -4277,7 +4309,7 @@ msgstr ""
 "przez Fundację Wolnego Oprogramowania - w wersji 3 lub (jeśli wolisz) każdej "
 "późniejszej."
 
-#: src/gtk/about.c:571
+#: src/gtk/about.c:580
 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 "
@@ -4289,7 +4321,7 @@ msgstr ""
 "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
 "dalszych informacji zobacz Powszechną Licencję Publiczną GNU."
 
-#: src/gtk/about.c:590
+#: src/gtk/about.c:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4298,73 +4330,73 @@ msgstr ""
 "Powszechnej Licencji Publicznej GNU (GNU General Public License);jeśli nie, "
 "odwiedź "
 
-#: src/gtk/about.c:723 src/main.c:2749
+#: src/gtk/about.c:732 src/main.c:2749
 msgid "Session statistics\n"
 msgstr "Statystyki posiedzenia\n"
 
-#: src/gtk/about.c:733 src/gtk/about.c:736 src/main.c:2759 src/main.c:2762
+#: src/gtk/about.c:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Rozpoczęto: %s\n"
 
-#: src/gtk/about.c:743 src/main.c:2768
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Ruch przychodzący\n"
 
-#: src/gtk/about.c:746 src/main.c:2771
+#: src/gtk/about.c:755 src/main.c:2771
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Odebrane wiadomości: %d\n"
 
-#: src/gtk/about.c:753 src/main.c:2777
+#: src/gtk/about.c:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Ruch wychodzący\n"
 
-#: src/gtk/about.c:756 src/main.c:2780
+#: src/gtk/about.c:765 src/main.c:2780
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nowe/przekierowane wiadomości: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2784
+#: src/gtk/about.c:770 src/main.c:2784
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpowiedzi: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2788
+#: src/gtk/about.c:775 src/main.c:2788
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Przekazane wiadomości: %d\n"
 
-#: src/gtk/about.c:771 src/main.c:2792
+#: src/gtk/about.c:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Całkowita liczba wysłanych wiadomości: %d\n"
 
-#: src/gtk/about.c:798
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "O Claws Mail"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "Op_is"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Autorzy"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Features"
-msgstr "_Cechy"
+msgstr "_Dodatki"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Licencja"
 
-#: src/gtk/about.c:897
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "_Uwagi do wydania"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "_Statystyki"
 
@@ -4435,8 +4467,8 @@ msgstr "Ustawianie kolejności skrzynek pocztowych"
 #: src/gtk/foldersort.c:278
 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:312
 msgid "Mailboxes"
@@ -4840,7 +4872,7 @@ msgstr "Pierwszeństwo"
 msgid "Precedence:"
 msgstr "Pierwszeństwo:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1268
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -4978,15 +5010,15 @@ msgstr "Nieprzeczytana wiadomość"
 
 #: src/gtk/icon_legend.c:69
 msgid "Message has been replied to"
-msgstr "Na wiadomość odpowiedziano do"
+msgstr "Odpowiedziano na daną wiadomość"
 
 #: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded"
-msgstr "Przekazano wiadomość"
+msgstr "Przekazano daną wiadomość"
 
 #: src/gtk/icon_legend.c:71
 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:72
 msgid "Message is in an ignored thread"
@@ -5006,7 +5038,7 @@ msgstr "Wiadomość posiada załącznik(i)"
 
 #: src/gtk/icon_legend.c:77
 msgid "Digitally signed message"
-msgstr "Wiadomość podpisana elektronicznie"
+msgstr "Podpisana wiadomość"
 
 #: src/gtk/icon_legend.c:78
 msgid "Encrypted message"
@@ -5026,15 +5058,15 @@ msgstr "Oznaczona wiadomość"
 
 #: src/gtk/icon_legend.c:83
 msgid "Message is marked for deletion"
-msgstr "Wiadomość wyznaczona do usunięcia"
+msgstr "Wiadomość przeznaczona do usunięcia"
 
 #: src/gtk/icon_legend.c:84
 msgid "Message is marked for moving"
-msgstr "Wiadomość wyznaczona do przeniesienia"
+msgstr "Wiadomość przeznaczona do przeniesienia"
 
 #: src/gtk/icon_legend.c:85
 msgid "Message is marked for copying"
-msgstr "Wiadomość oznaczona do skopiowania"
+msgstr "Wiadomość przeznaczona do skopiowania"
 
 #: src/gtk/icon_legend.c:87
 msgid "Locked message"
@@ -5042,7 +5074,7 @@ msgstr "Zablokowana wiadomość"
 
 #: src/gtk/icon_legend.c:89
 msgid "Folder (normal, opened)"
-msgstr "Katalog (normalny, otwarty)"
+msgstr "Katalog (zwyczajny, otwarty)"
 
 #: src/gtk/icon_legend.c:90
 msgid "Folder with read messages hidden"
@@ -5053,7 +5085,7 @@ msgid "Folder contains marked messages"
 msgstr "Katalog zawiera oznaczone wiadomości"
 
 #: src/gtk/icon_legend.c:92
-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:93
@@ -5067,8 +5099,7 @@ msgstr "Opis ikon"
 #: src/gtk/icon_legend.c:146
 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:228 src/gtk/inputdialog.c:250
 #, c-format
@@ -5116,9 +5147,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 ""
@@ -5216,15 +5247,15 @@ msgstr "Wczytane wtyczki"
 msgid "Page Index"
 msgstr "Spis Stron"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:856
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 msgid "_Hide"
 msgstr "_Ukryj"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4093 src/prefs_account.c:4111 src/prefs_account.c:4129
 #: src/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
-#: src/prefs_account.c:4201 src/prefs_account.c:4220 src/prefs_account.c:4303
-#: src/prefs_account.c:4321 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Konto"
@@ -5255,7 +5286,7 @@ msgstr "wiadomości które zawierają S w treści wiadomości"
 
 #: src/gtk/quicksearch.c:478
 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:479
 msgid "messages carbon-copied to S"
@@ -5309,7 +5340,7 @@ msgstr "wiadomości zawierające S w wartości dowolnego nagłówka"
 
 #: src/gtk/quicksearch.c:493
 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:494
 msgid "messages which contain S in In-Reply-To header"
@@ -5337,7 +5368,7 @@ msgstr "stare wiadomości"
 
 #: src/gtk/quicksearch.c:500
 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:501
 msgid "messages which you have replied to"
@@ -5397,7 +5428,7 @@ msgstr "nieprzeczytane wiadomości"
 
 #: src/gtk/quicksearch.c:515
 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:516
 #, c-format
@@ -5429,7 +5460,7 @@ msgstr "szukanie z rozróżnieniem na wielkość liter"
 #: src/gtk/quicksearch.c:523
 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:525
 msgid ""
@@ -5449,8 +5480,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:"
 
@@ -5464,7 +5495,7 @@ msgstr "Od/Do/DW/Temat/Znacznik"
 
 #: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
-msgstr "Rekursywne"
+msgstr "Wgłąb"
 
 #: src/gtk/quicksearch.c:719
 msgid "Sticky"
@@ -5492,7 +5523,7 @@ msgstr "Szczegóły rozszerzonych symboli"
 
 #: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
-msgstr "_Informacje"
+msgstr "_Szczegóły"
 
 #: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
@@ -5511,7 +5542,7 @@ msgstr "Poprawny%s"
 #: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:182
 #: src/ssl_manager.c:301 src/ssl_manager.c:305
 msgid " (expired)"
-msgstr " (przedawnione)"
+msgstr " (przedawniony)"
 
 #: src/gtk/sslcertwindow.c:187
 msgid "Owner"
@@ -5604,7 +5635,7 @@ msgstr "Zerwij połą_czenie"
 
 #: src/gtk/sslcertwindow.c:394 src/gtk/sslcertwindow.c:506
 msgid "_Accept and save"
-msgstr "_Akceptuj i zapisz"
+msgstr "Z_atwierdź i zapisz"
 
 #: src/gtk/sslcertwindow.c:412
 #, c-format
@@ -5625,7 +5656,7 @@ msgstr "Certyfikat TLS wygasł"
 
 #: src/gtk/sslcertwindow.c:444
 msgid "_Accept"
-msgstr "_Akceptuj"
+msgstr "Z_atwierdź"
 
 #: src/gtk/sslcertwindow.c:464
 msgid "New certificate:"
@@ -5633,7 +5664,7 @@ msgstr "Nowy certyfikat:"
 
 #: src/gtk/sslcertwindow.c:469
 msgid "Known certificate:"
-msgstr "Znany certyfikat:"
+msgstr "Bieżący certyfikat:"
 
 #: src/gtk/sslcertwindow.c:476
 #, c-format
@@ -5641,8 +5672,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:497
 msgid "_View certificates"
@@ -5654,7 +5685,7 @@ msgstr "Certyfikat TLS uległ zmianie i jest nieprawidłowy"
 
 #: src/gtk/sslcertwindow.c:504
 msgid "TLS certificate changed"
-msgstr "Certyfikaty TLS uległ zmianie"
+msgstr "Certyfikat TLS uległ zmianie"
 
 #: src/headerview.c:94
 msgid "Tags:"
@@ -5678,8 +5709,7 @@ msgstr "(Bez tematu)"
 msgid "Error:"
 msgstr "Błąd:"
 
-#: src/image_viewer.c:313 src/mimeview.c:2564
-#: src/plugins/att_remover/att_remover.c:305
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Nazwa pliku:"
@@ -5692,197 +5722,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"
@@ -5894,7 +5924,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"
@@ -5906,7 +5936,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"
@@ -5919,7 +5949,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"
@@ -5931,7 +5961,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"
@@ -5943,7 +5973,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"
@@ -5953,36 +5983,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:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:884 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:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:885 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"
@@ -5990,114 +6020,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:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:891 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 "
@@ -6106,20 +6136,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"
@@ -6127,11 +6157,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:59
 msgid "Create _new folder..."
@@ -6171,14 +6199,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:64
 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:65
 msgid "C_heck for new folders"
@@ -6186,7 +6214,7 @@ msgstr "Odpytaj o nowe katalogi"
 
 #: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:66
 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"
@@ -6199,60 +6227,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:252 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:233
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Wpisz nową nazwę dla '%s':"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
 #: src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/vcalendar/vcal_folder.c:2094
 msgid "Rename folder"
 msgstr "Przemianuj katalog"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:257
-#: src/plugins/vcalendar/vcal_folder.c:2116
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 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:307 src/plugins/mailmbox/plugin_gtk.c:372
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:330
+#: 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:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:209
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, 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:506
 #, c-format
@@ -6261,7 +6290,7 @@ msgstr "Czy naprawdę odpytać o podkatalogi, których nie śledzisz w '%s'?"
 
 #: src/imap_gtk.c:509
 msgid "Search recursively"
-msgstr "Szukaj rekursywnie"
+msgstr "Poszukaj wgłąb"
 
 #: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
@@ -6269,14 +6298,14 @@ msgstr "Śledzone"
 
 #: src/imap_gtk.c:515
 msgid "_Search"
-msgstr "_Szukaj"
+msgstr "Po_szukaj"
 
 #: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Wybierz podkatalog z %s do śledzenia: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:690
+#: src/imap_gtk.c:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Zacznij śledzić"
 
@@ -6294,8 +6323,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:565
@@ -6507,42 +6536,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:202
 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)"
@@ -6550,28 +6579,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:407 src/prefs_summaries.c:647
+#: src/inc.c:727 src/prefs_matcher.c:407 src/prefs_summaries.c:647
 #: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 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)"
@@ -6579,66 +6608,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:865
+#: src/inc.c:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:894
+#: src/inc.c:897
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Konto '%s': Podłączanie do serwera POP3: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:931
 #, 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:932
+#: src/inc.c:935
 #, 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:1012 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:1014
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Pobieranie wiadomości z %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby wiadomości (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby wiadomości (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby wiadomości (UIDL)"
 
-#: src/inc.c:1032
+#: src/inc.c:1035
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie wielkości wiadomości (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:1064
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1080
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6646,16 +6675,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:1232
+#: src/inc.c:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Nie udało się nawiązać połączenia z %s:%d."
 
-#: src/inc.c:1237
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1243
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6664,37 +6693,37 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1254
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1259
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
-#: src/inc.c:1262
+#: src/inc.c:1265
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Błąd gniazda podczas połączenia z %s:%d."
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1270 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:1270
+#: src/inc.c:1273
 #, 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:1275
+#: src/inc.c:1278
 msgid "Mailbox is locked."
 msgstr "Skrzynka zablokowana."
 
-#: src/inc.c:1279
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6703,11 +6732,11 @@ msgstr ""
 "Skrzynka zablokowana:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiodło się."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6716,57 +6745,56 @@ msgstr ""
 "Uwierzytelnienie nie powiodło się:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1299 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:1301
+#: src/inc.c:1304
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Upłynął czas oczekiwania na połączenie z %s:%d."
 
-#: src/inc.c:1339
+#: src/inc.c:1342
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporacja została anulowana\n"
 
-#: src/inc.c:1634 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
 #: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/inc.c:1644 src/inc.c:1654
+#: src/inc.c:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/inc.c:1647
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "godzina"
 msgstr[1] "godziny"
 msgstr[2] "godzin"
 
-#: src/inc.c:1659
+#: src/inc.c:1662
 #, 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:1665
+#: src/inc.c:1668
 #, 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:1672
+#: src/inc.c:1675
 msgid "On_ly once"
 msgstr "Ty_lko raz"
 
@@ -6879,16 +6907,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:1598
@@ -6897,9 +6925,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:1604
 msgid ""
@@ -6908,8 +6936,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:1841
 msgid "Missing filename\n"
@@ -6992,8 +7020,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) "
@@ -7052,14 +7079,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:2105
@@ -7092,9 +7119,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:2113
 msgid "  --online               switch to online mode"
@@ -7194,829 +7222,829 @@ msgstr "NetworkManager: sieć jest włączona.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieć jest rozłączona.\n"
 
-#: src/mainwindow.c:523 src/messageview.c:212
+#: src/mainwindow.c:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Plik"
 
-#: src/mainwindow.c:525 src/messageview.c:214 src/summaryview.c:448
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "_Widok"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "U_stawienia"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "Dod_aj skrzynkę pocztową"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Zmień kolejność katalogów..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "Za_importuj plik mbox..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "Wy_eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "Wy_eksportuj zaznaczone do pliku mbox..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
-msgstr "Opróżnij wszystkie kosze"
+msgstr "Opróżnij wszys_tkie kosze"
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "Zapi_sz wiadomość jako..."
 
-#: src/mainwindow.c:547 src/messageview.c:222
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "Zapi_sz część jako..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Układ strony..."
 
-#: src/mainwindow.c:551 src/messageview.c:224
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "Zsynchronizuj katalogi"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "_Wyjdź"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "Zaznacz cały wątek"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "Poszukaj w bieżącej wiadomości..."
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "Poszukaj szybko"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "Pokaż lub uk_ryj"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "Pasek narzędzi"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Wybierz pokazywane kolumny"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "W spisie katalogów..."
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "W spisie wiadomości..."
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "_Układ"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "U_szereguj"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "Grupuj po tem_acie"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "Ro_zwiń wszystkie wątki"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "Prze_jdź do"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Poprzedniej wiadomości"
 
-#: src/mainwindow.c:588 src/messageview.c:237
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Następnej wiadomości"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:588 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Pop_rzedniej nieprzeczytanej wiadomości"
 
-#: src/mainwindow.c:591 src/messageview.c:240
+#: src/mainwindow.c:589 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Następnej nieprz_eczytanej wiadomości"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:591 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Poprzedniej nowej wiadomości"
 
-#: src/mainwindow.c:594 src/messageview.c:243
+#: src/mainwindow.c:592 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Następnej nowej wiadomości"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:594 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Poprzedniej oznaczonej wiado_mości"
 
-#: src/mainwindow.c:597 src/messageview.c:246
+#: src/mainwindow.c:595 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Następnej ozn_aczonej wiadomości"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:597 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Poprzedniej wiadomości z etykietą"
 
-#: src/mainwindow.c:600 src/messageview.c:249
+#: src/mainwindow.c:598 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Następnej wiadomości z etykietą"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:600
 msgid "Previously opened message"
-msgstr "Poprzednio otwarta wiadomość"
+msgstr "Poprzedniej otwartej wiadomości"
 
-#: src/mainwindow.c:603 src/messageview.c:252
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Następnej otwartej wiadomości"
 
-#: src/mainwindow.c:605 src/messageview.c:254
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Nadrzędnej wiadomości"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:605 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Następnego katalogu z ni_eprzeczytanymi wiadomościami"
 
-#: src/mainwindow.c:608 src/messageview.c:257
+#: src/mainwindow.c:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "Katal_ogu..."
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:608 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Następnej części"
 
-#: src/mainwindow.c:611 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:609 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Poprzedniej części"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Przewiń wiadomość do"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Poprzedniego wiersza"
 
-#: src/mainwindow.c:616 src/messageview.c:263
+#: src/mainwindow.c:614 src/messageview.c:263
 msgid "Next line"
 msgstr "Następnego wiersza"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:476
+#: src/mainwindow.c:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Poprzedniej strony"
 
-#: src/mainwindow.c:618 src/messageview.c:265 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Następnej strony"
 
-#: src/mainwindow.c:636 src/messageview.c:283
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Dekodowanie znaków"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:641
 msgid "Open in new _window"
-msgstr "Otwórz w _nowym oknie"
+msgstr "Otwórz w no_wym oknie"
 
-#: src/mainwindow.c:644 src/messageview.c:290
+#: src/mainwindow.c:642 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:646 src/messageview.c:291
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "Część wiadomości"
 
-#: src/mainwindow.c:647 src/messageview.c:292
+#: src/mainwindow.c:645 src/messageview.c:292
 msgid "View as text"
 msgstr "Wyświetl jako tekst"
 
-#: src/mainwindow.c:648 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Otwórz"
 
-#: src/mainwindow.c:650 src/messageview.c:295
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "Otwórz w..."
 
-#: src/mainwindow.c:654 src/messageview.c:298
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Cytowania"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "_Uaktualnij podliczenie wiadomości"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "Pobierz"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "Pobierz z bieżącego konta"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "Pobierz ze wszystkich kont"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "Przerwij pobieranie"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "Utwórz _nową wiadomość"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:669
 msgid "Compose a news message"
-msgstr "Utwórz nową wieść"
+msgstr "Napisz nową wieść"
 
-#: src/mainwindow.c:673 src/messageview.c:304
+#: src/mainwindow.c:671 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: src/mainwindow.c:674 src/messageview.c:305 src/summaryview.c:433
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
-msgstr "Odpowiedz do"
+msgstr "Odpowiedz szczególnie"
 
-#: src/mainwindow.c:677 src/messageview.c:308 src/summaryview.c:436
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
-msgstr "_Lista dyskusyjna"
+msgstr "Na _listę dyskusyjną"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:676
 msgid "Follow-up and reply to"
 msgstr "_Odpowiedz na grupę i nadawcy"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:679 src/messageview.c:311 src/summaryview.c:438
 #: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "Prze_każ"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
 #: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr "Prz_ekaż jako załącznik"
 
-#: src/mainwindow.c:683 src/messageview.c:313 src/summaryview.c:440
+#: src/mainwindow.c:681 src/messageview.c:313 src/summaryview.c:440
 #: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "Prze_kieruj"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
-msgstr "Lista dyskusyjna"
+msgstr "_Lista dyskusyjna"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Wyślij"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "Przestań śledzić"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "View archive"
-msgstr "Podejrzyj archiwum"
+msgstr "Obejrzyj archiwum"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Contact owner"
-msgstr "Właściciel kontaktu"
+msgstr "Napisz do właściciela"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "_Przenieś..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:700
 msgid "Move to _trash"
-msgstr "Przenieś do _kosza"
+msgstr "Wyrzuć do _kosza"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "_Usuń..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
-msgstr "Przenieś wątek do kosz_a"
+msgstr "Wyrzuć wątek do kosz_a"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "Usuń wątek"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Odwołaj wieść"
 
-#: src/mainwindow.c:709 src/mainwindow.c:710 src/summaryview.c:441
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "O_znacz"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "O_dznacz"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "_Oznacz jako przeczytane"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "Oznacz jako nieprzeczytan_e"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Oznacz wszystko w katalogu jako przeczytane"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:716
 msgid "Mark all unread in folder"
 msgstr "Oznacz wszystko w katalogu jako nieprzeczytane"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Pomiń wątek"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Unignore thread"
 msgstr "Cofnij pominięcie wątku"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Śledź wątek"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Cofnij śledzenie wątku"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "Oznacz jako _spam"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:725
 msgid "Mark as _ham"
 msgstr "Oznacz jako _ham"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:177 src/toolbar.c:517
+#: src/mainwindow.c:728 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: src/mainwindow.c:731 src/prefs_filtering_action.c:178 src/toolbar.c:518
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Odblokuj"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "Kolorowa _etykieta"
 
-#: src/mainwindow.c:734 src/summaryview.c:443
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "_Znaczniki"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "Zmień tr_eść"
 
-#: src/mainwindow.c:740 src/messageview.c:314 src/mimeview.c:1044
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "Sprawdź podpis"
 
-#: src/mainwindow.c:745 src/messageview.c:318
+#: src/mainwindow.c:743 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Dodaj nadawcę do książki adresowej..."
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "C_ollect addresses"
 msgstr "Zbierz adresy"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "Z bi_eżącego katalogu..."
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "Z zaznaczonych wiado_mości..."
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "Prze_filtruj wszystkie wiadomości w tym katalogu"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "Prze_filtruj zaznaczone wiadomości"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "Wykonaj zasady przetwarzania katalogów"
 
-#: src/mainwindow.c:756 src/messageview.c:321
+#: src/mainwindow.c:754 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Utwórz zasadę f_iltrowania"
 
-#: src/mainwindow.c:757 src/mainwindow.c:764 src/messageview.c:322
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
-msgstr "Automatycznie"
+msgstr "S_amoczynnie"
 
-#: src/mainwindow.c:758 src/mainwindow.c:765 src/mainwindow.c:873
+#: src/mainwindow.c:756 src/mainwindow.c:763 src/mainwindow.c:871
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Wg nadawcy"
 
-#: src/mainwindow.c:759 src/mainwindow.c:766 src/mainwindow.c:874
+#: src/mainwindow.c:757 src/mainwindow.c:764 src/mainwindow.c:872
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Wg adresa_ta"
 
-#: src/mainwindow.c:760 src/mainwindow.c:767 src/messageview.c:325
+#: src/mainwindow.c:758 src/mainwindow.c:765 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Wg tematu"
 
-#: src/mainwindow.c:761 src/mainwindow.c:768 src/messageview.c:326
+#: src/mainwindow.c:759 src/mainwindow.c:766 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
-msgstr "Wg nadawcy"
+msgstr "Wg wysyłając_ego"
 
-#: src/mainwindow.c:763 src/messageview.c:328 src/summaryview.c:446
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "Utwórz zasadę przetwarzania"
 
-#: src/mainwindow.c:771 src/messageview.c:336
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Wypisz adresy _URL..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "Ch_eck for new messages in all folders"
 msgstr "Odpytaj o nowe wiadomości w_e wszystkich katalogach"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Delete du_plicated messages"
 msgstr "Usuń _powielone wiadomości"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "W zaznaczonym katalogu"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "We wszystkich katalogach"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "_Wymaż"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "TLS cer_tificates"
 msgstr "Cer_tyfikaty TLS"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Dziennik filtr_owania"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Dziennik sieci"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "Dziennik _diagnostyczny"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "_Zapomnij wszystkie hasła sesji"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Forget _primary passphrase"
 msgstr "Za_pomnij główne hasło"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "Przestaw bieżą_ce konto"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "_Dostosuj bieżące konto..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "Utwórz _nowe konto..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "Dostosuj wszystki_e konta..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "U_stawienia..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "_Przetwarzanie przed..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "_Przetwarzanie po..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Filtrowanie..."
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "Wzorce..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "Dzi_ałania..."
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "Znaczniki..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "Wtyczki..."
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Podręcznik użytkownika"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ w internecie"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "Opis ikon"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Ustaw jako konto domyślne"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "Odłącz od sieci"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "Pasek men_u"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "Widok wiado_mości"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "Pasek stanu"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Nagłówki kolumn"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "Pokaż w wątkach"
 
-#: src/mainwindow.c:840 src/prefs_summaries.c:669
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Ukryj przeczytane wątki"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "_Ukryj przeczytane wiadomości"
 
-#: src/mainwindow.c:842 src/prefs_summaries.c:675
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Ukryj usunięte wiadomości"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "_Na całym ekranie"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Pokaż wszystkie na_główki"
 
-#: src/mainwindow.c:845 src/messageview.c:349
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Zwiń wszystkie"
 
-#: src/mainwindow.c:846 src/messageview.c:350
+#: src/mainwindow.c:844 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Zwiń od _2 poziomu"
 
-#: src/mainwindow.c:847 src/messageview.c:351
+#: src/mainwindow.c:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Zwiń od _3 poziomu"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Tekst pod ikonkami"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Tekst obok ikon"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "Tylko _ikony"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "Tylko _tekst"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "_Standardowy"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "_Trójkolumnowy"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "Szerokie _wiadomości"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "Szeroki sp_is wiadomości"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "_Mały ekran"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "Wg _numeru"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "Wg rozm_iaru"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "Wg _daty"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "Wg daty wątku"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "Wg temat_u"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "Wg koloru _etykiety"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "Wg znacznika"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "Wg oznaczenia"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "Wg _stanu"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "Wg załącznika"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "Wg punktacji"
 
-#: src/mainwindow.c:882
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "Wg blokad"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "Nie szereguj"
 
-#: src/mainwindow.c:887 src/prefs_summaries.c:656
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Rosnąco"
 
-#: src/mainwindow.c:888 src/prefs_summaries.c:657
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Malejąco"
 
-#: src/mainwindow.c:930 src/messageview.c:393
+#: src/mainwindow.c:928 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "S_am wykryj"
 
-#: src/mainwindow.c:1308 src/summaryview.c:6511
+#: src/mainwindow.c:1306 src/summaryview.c:6511
 msgid "Modify tags..."
 msgstr "Zmień znaczniki..."
 
-#: src/mainwindow.c:1966
+#: src/mainwindow.c:1964
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Pojawił się błąd. Naciśnij tutaj aby zobaczyć dziennik."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1979
 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:1984
+#: src/mainwindow.c:1982
 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:1998
+#: src/mainwindow.c:1996
 msgid "Select account"
 msgstr "Wybierz konto"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Dziennik sieci"
 
-#: src/mainwindow.c:2029
+#: src/mainwindow.c:2027
 msgid "Filtering/Processing debug log"
 msgstr "Dziennik diagnostyczny filtrowania/przetwarzania"
 
-#: src/mainwindow.c:2048 src/prefs_logging.c:378
+#: src/mainwindow.c:2046 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "dziennik filtrowania włączony\n"
 
-#: src/mainwindow.c:2050 src/prefs_logging.c:380
+#: src/mainwindow.c:2048 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "dziennik filtrowania wyłączony\n"
 
-#: src/mainwindow.c:2484 src/mainwindow.c:2491 src/mainwindow.c:2534
-#: src/mainwindow.c:2567 src/mainwindow.c:2599 src/mainwindow.c:2644
+#: src/mainwindow.c:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1149
 msgid "Untitled"
 msgstr "Nienazwany"
 
-#: src/mainwindow.c:2645 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:2902 src/mainwindow.c:2907
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Usunąć wszystkie wiadomości z katalogów kosza?"
 
-#: src/mainwindow.c:2903
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "Nie wychodź"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę pocztową"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -8030,18 +8058,18 @@ msgstr ""
 "Jeśli podasz istniejącą skrzynkę, zostanie ona\n"
 "samoczynnie przeszukana."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Skrzynka pocztowa '%s' już istnieje."
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Skrzynka pocztowa"
 
-#: src/mainwindow.c:2953 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8050,47 +8078,47 @@ 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:3420
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Wysyłanie zabronione"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Nie udało się zaimportować skrzynki mbox."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "Nie udało się wyeksportować skrzynki mbox."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Wyjdź"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Czy wyjść z Claws Mail?"
 
-#: src/mainwindow.c:4262
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Synchronizacja katalogów"
 
-#: src/mainwindow.c:4263
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Czy chcesz zsynchronizować swoje katalogi?"
 
-#: src/mainwindow.c:4264
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "Z_synchronizuj"
 
-#: src/mainwindow.c:4746
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Usuwanie powielonych wiadomości..."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4754
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Nie znaleziono powielonych wiadomości w wybranym katalogu.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4760
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8098,7 +8126,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:4766
+#: src/mainwindow.c:4764
 #, 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"
@@ -8109,11 +8137,11 @@ msgstr[1] ""
 msgstr[2] ""
 "Oznaczono %d powielonych wiadomości do usunięcia z wybranego katalogu.\n"
 
-#: src/mainwindow.c:4804
+#: src/mainwindow.c:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Usuwanie powielonych wiadomości z wszystkich katalogów..."
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4808
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8121,50 +8149,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:4815
+#: src/mainwindow.c:4813
 #, 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:4977 src/messageview.c:2648
+#: src/mainwindow.c:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Wybierz katalog, do którego chcesz przejść"
 
-#: src/mainwindow.c:5080 src/summaryview.c:5952
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 msgid "Processing rules to apply before folder rules"
 msgstr "Zasady przetwarzania do zastosowania przed zasadami katalogów"
 
-#: src/mainwindow.c:5088
+#: src/mainwindow.c:5086
 msgid "Processing rules to apply after folder rules"
 msgstr "Zasady przetwarzania do zastosowania po zasadach katalogów"
 
-#: src/mainwindow.c:5096 src/summaryview.c:5963
+#: src/mainwindow.c:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Ustawienia filtrowania"
 
-#: src/mainwindow.c:5209
+#: src/mainwindow.c:5207
 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:5300
+#: src/mainwindow.c:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail został zarejestrowany jako klient domyślny."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5300
 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:5316 src/setup.c:91
+#: src/mainwindow.c:5314 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Odpytywanie katalogu %s%c%s..."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5458
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8278,7 +8306,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:779
 msgid "Search failed"
@@ -8369,11 +8397,11 @@ msgstr ""
 
 #: src/messageview.c:1918
 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:1924
 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:1925
 msgid "Send receipt"
@@ -8384,8 +8412,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:1974
 #, c-format
@@ -8492,7 +8520,7 @@ msgstr ""
 "  Wiadomość została usunięta lub przeniesiona do innego katalogu"
 
 #: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4424
-#: src/summaryview.c:7314
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "Błąd podczas uczenia.\n"
 
@@ -8567,7 +8595,7 @@ msgstr "Rodzaj MIME"
 #: src/mimeview.c:1049 src/mimeview.c:1054 src/mimeview.c:1059
 #: src/mimeview.c:1064
 msgid "View full information"
-msgstr "Wyświetl pełne informacje"
+msgstr "Zobacz pełne szczegóły"
 
 #: src/mimeview.c:1071
 msgid "Check again"
@@ -8615,8 +8643,8 @@ msgstr "Sprawdzanie podpisu..."
 msgid "Go back to email"
 msgstr "Powrót do wiadomości email"
 
-#: src/mimeview.c:1712 src/mimeview.c:1804 src/mimeview.c:2046
-#: src/mimeview.c:2082 src/mimeview.c:2194 src/plugins/fancy/fancy_viewer.c:452
+#: src/mimeview.c:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nie można zapisać części wiadomości wieloczęściowej: %s"
@@ -8626,28 +8654,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:1815
+#: src/mimeview.c:1816
 #, 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ć?"
+"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:1818
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
 msgstr "Błąd zapisu wszystkich części wiadomości"
 
-#: src/mimeview.c:1819
-msgid "Skip"
+#: src/mimeview.c:1820
+msgid "Ignore"
 msgstr "Pomiń"
 
-#: src/mimeview.c:1819
-msgid "Skip all"
+#: src/mimeview.c:1820
+msgid "Ignore all"
 msgstr "Pomiń wszystkie"
 
-#: src/mimeview.c:1829
+#: src/mimeview.c:1832
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8655,7 +8683,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:1837
+#: src/mimeview.c:1844
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8663,7 +8691,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:1842
+#: src/mimeview.c:1849
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8671,35 +8699,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:1875 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1886 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Wybierz katalog docelowy"
 
-#: src/mimeview.c:1882 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1893 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: src/mimeview.c:1999 src/plugins/fancy/fancy_viewer.c:708
+#: src/mimeview.c:2011 src/plugins/fancy/fancy_viewer.c:708
 #: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Zapisz jako"
 
-#: src/mimeview.c:2129 src/mimeview.c:2136
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
-msgstr "Otwórz z"
+msgstr "Otwórz w"
 
-#: src/mimeview.c:2130 src/mimeview.c:2137
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, 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:2232
+#: src/mimeview.c:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8710,11 +8738,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Uruchomić niepewny plik binarny?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8726,20 +8754,20 @@ msgstr ""
 "\n"
 "Czy chcesz uruchomić ten plik?"
 
-#: src/mimeview.c:2245
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "Uruchom plik wykonywalny"
 
-#: src/mimeview.c:2549 src/plugins/att_remover/att_remover.c:303
+#: src/mimeview.c:2561
 msgid "Type:"
 msgstr "Rodzaj:"
 
-#: src/mimeview.c:2550 src/plugins/att_remover/att_remover.c:304
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2789
+#: src/mimeview.c:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/mimeview.c:2564 src/plugins/vcalendar/vcalendar.c:1243
+#: src/mimeview.c:2576 src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
@@ -8783,8 +8811,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
@@ -8825,12 +8853,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..."
@@ -8853,77 +8879,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"
@@ -9072,7 +9098,7 @@ msgstr " - Wyłączone: "
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:434
 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:868
 msgid "This plugin handles various ACPI mail LEDs."
@@ -9173,9 +9199,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"
@@ -9188,8 +9213,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"
@@ -9340,7 +9365,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
@@ -9357,7 +9382,7 @@ msgstr "Tak"
 #: src/prefs_folder_item.c:1261 src/prefs_folder_item.c:1293
 #: src/prefs_summaries.c:407
 msgid "No"
-msgstr "Brak"
+msgstr "Nie"
 
 #: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
@@ -9423,7 +9448,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"
 
@@ -9468,7 +9493,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"
@@ -9484,8 +9509,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"
 
@@ -9531,8 +9556,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"
@@ -9584,8 +9608,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"
 
@@ -9598,6 +9622,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:305
+msgid "Filename"
+msgstr "Nazwa pliku"
+
 #: src/plugins/att_remover/att_remover.c:336
 msgid "Remove attachments"
 msgstr "Usuń załącznik"
@@ -9677,9 +9705,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"
 
@@ -9703,15 +9731,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:87
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:87
@@ -9820,8 +9848,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..."
@@ -9861,19 +9889,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
@@ -9905,7 +9932,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:389 src/prefs_account.c:1718
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1748
 msgid "KiB"
 msgstr "KiB"
 
@@ -10042,8 +10069,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..."
@@ -10064,19 +10091,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:427
@@ -10193,13 +10219,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"
@@ -10301,8 +10327,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"
@@ -10434,7 +10460,7 @@ msgstr "Otwieraj w przeglądarce (zdalna zawartość jest włączona)"
 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:4304
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4360
 #: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Pośrednik"
@@ -10461,8 +10487,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."
 
@@ -10477,7 +10503,7 @@ msgstr "Przy kliknięciu na odnośnik, domyślnie"
 
 #: src/plugins/fancy/fancy_prefs.c:285
 msgid "Open in External Browser"
-msgstr "Otwórz w przeglądarce zewnętrznej"
+msgstr "Otwórz w zewnętrznej przeglądarce"
 
 #: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
@@ -10486,7 +10512,7 @@ msgstr "CSS z tego pliku zostanie wczytany dla każdej części HTML"
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: 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:2510
+#: src/prefs_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Prze_glądaj"
@@ -10586,9 +10612,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
@@ -10614,8 +10639,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"
 
@@ -10697,9 +10723,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:"
@@ -10782,9 +10808,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:494
 msgid ""
@@ -10816,7 +10841,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:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
@@ -10879,8 +10904,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"
 
@@ -10899,8 +10924,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:137
 msgid "Don't check for keywords when forwarding or redirecting messages"
@@ -10953,8 +10978,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"
@@ -11037,8 +11062,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: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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "godzin"
 
@@ -11152,9 +11177,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"
@@ -11228,15 +11252,6 @@ msgstr ""
 "Jeśli podasz istniejącą skrzynkę, zostanie ona\n"
 "samoczynnie przeszukana."
 
-#: 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 ""
-"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"
@@ -11423,7 +11438,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:1265
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1292
 msgid "Server information"
 msgstr "Szczegóły serwera"
 
@@ -11434,7 +11449,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"
@@ -11475,28 +11491,28 @@ msgstr "Określ uwierzytelnienia"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1487
+#: src/prefs_account.c:2108
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1466
-#: src/prefs_account.c:2095 src/prefs_account.c:3038 src/prefs_account.c:3066
-#: src/prefs_account.c:3263 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
 #: src/wizard.c:1635
 msgid "Password"
 msgstr "Hasło"
 
-#: 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: 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/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Sam wykryj"
@@ -11513,20 +11529,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 "
@@ -11543,7 +11559,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"
 
@@ -11557,7 +11573,7 @@ msgstr "Wybierz katalog(i)"
 
 #: src/plugins/notification/notification_foldercheck.c:583
 msgid "select recursively"
-msgstr "wybierz rekursywnie"
+msgstr "wybierz wgłąb"
 
 #: src/plugins/notification/notification_lcdproc.c:155
 msgid "No new messages"
@@ -11630,10 +11646,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."
 
@@ -11799,8 +11814,8 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:677
 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:687
 msgid "Use sound theme"
@@ -11811,7 +11826,7 @@ msgid "Show banner"
 msgstr "Pokaż baner"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: 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"
@@ -11910,7 +11925,7 @@ msgstr "Włącz okna wysuwne"
 #: src/plugins/notification/notification_prefs.c:1062
 #: src/plugins/notification/notification_prefs.c:1664
 msgid "Popup timeout"
-msgstr "Czas trwania okna wysuwnego"
+msgstr "Czas pokazywania okna wysuwnego"
 
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
@@ -11959,7 +11974,7 @@ msgstr "Włącz LCD"
 
 #: src/plugins/notification/notification_prefs.c:1483
 msgid "Hostname:Port of LCDd server"
-msgstr "Nazwa_gospodarza:Port dla serwera LCDd"
+msgstr "Gospodarz:Port serwera LCDd"
 
 #: src/plugins/notification/notification_prefs.c:1568
 msgid "Enable Trayicon"
@@ -11971,7 +11986,7 @@ msgstr "Ukryj zaraz po uruchomieniu"
 
 #: src/plugins/notification/notification_prefs.c:1592
 msgid "Close to tray"
-msgstr "Zamknięcie minimalizuje do ikonki"
+msgstr "Zamknięcie umieszcza w zasobniku systemowym"
 
 #: src/plugins/notification/notification_prefs.c:1600
 msgid "Hide when iconified"
@@ -12002,7 +12017,7 @@ msgstr "Włącz globalne skróty klawiszowe"
 #: src/plugins/notification/notification_prefs.c:1882
 #, 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:1882
 msgid "<control><shift>F11"
@@ -12247,11 +12262,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"
 
@@ -12299,8 +12313,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 "_No"
@@ -12396,12 +12410,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"
@@ -12438,8 +12452,8 @@ msgstr ""
 "hasła przez całą sesję"
 
 #: 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/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minut"
 
@@ -12477,7 +12491,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"
@@ -12504,64 +12518,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"
@@ -12964,14 +12978,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"
@@ -13023,13 +13037,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"
@@ -13049,8 +13063,8 @@ msgstr "Pokaż konsolę Pythona..."
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3027
-#: src/prefs_account.c:3055 src/prefs_account.c:3493 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Przeglądaj"
@@ -13063,7 +13077,7 @@ msgstr "Python"
 #: src/plugins/python/python_plugin.c:681
 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:767
 msgid ""
@@ -13116,8 +13130,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"
@@ -13176,7 +13190,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"
@@ -13328,7 +13342,7 @@ msgstr "Zawsze oznaczaj jako nowe"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:337
 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:339
 msgid "Never mark it as new"
@@ -13347,7 +13361,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:360
@@ -13369,7 +13383,7 @@ msgstr "Pobierz komentarze do postów, które są młodsze niż"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1687 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dni"
 
@@ -13379,7 +13393,7 @@ msgstr "Ustaw -1 aby pobrać wszystkie komentarze"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "If an item changes"
-msgstr "Gdy wpis się zmienił"
+msgstr "Gdy wpis ulegnie zmianie"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:444
 msgid "Items"
@@ -13387,11 +13401,11 @@ msgstr "Wpisy"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:457
 msgid "Refresh interval"
-msgstr "Odstęp czasu między odświeżeniami"
+msgstr "Okres odświeżania"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:465
 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:517
 msgid "_OK"
@@ -13407,15 +13421,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..."
@@ -13519,7 +13533,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)"
 
@@ -13528,7 +13542,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)"
 
@@ -13585,7 +13599,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."
@@ -13596,8 +13610,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 ""
@@ -13618,21 +13633,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
@@ -13658,7 +13672,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..."
@@ -13733,9 +13747,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 ""
@@ -13766,17 +13780,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"
@@ -13843,8 +13856,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
@@ -14025,18 +14038,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"
@@ -14051,8 +14062,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:140
 msgid "Creating meeting..."
@@ -14175,7 +14185,7 @@ msgstr "Odwołaj spotkanie..."
 
 #: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Launch website"
-msgstr "Uruchom Stronę"
+msgstr "Otwórz stronę sieciową"
 
 #: src/plugins/vcalendar/vcalendar.c:1198
 msgid "You are already busy at this time."
@@ -14196,7 +14206,7 @@ msgstr "Organizator:"
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1597
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1607
 msgid "Location:"
-msgstr "Położenie:"
+msgstr "Miejsce:"
 
 #: src/plugins/vcalendar/vcalendar.c:1240
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
@@ -14206,11 +14216,11 @@ msgstr "Podsumowanie:"
 
 #: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Starting:"
-msgstr "Początek:"
+msgstr "Rozpoczęcie:"
 
 #: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Ending:"
-msgstr "Koniec:"
+msgstr "Zakończenie:"
 
 #: src/plugins/vcalendar/vcalendar.c:1244
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1599
@@ -14220,65 +14230,65 @@ msgstr "Uczestnicy:"
 
 #: src/plugins/vcalendar/vcalendar.c:1246
 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"
@@ -14287,21 +14297,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"
@@ -14314,7 +14324,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"
@@ -14325,47 +14335,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ć"
 
@@ -14619,8 +14629,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:1298
 msgid ""
@@ -14842,95 +14852,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:396 src/prefs_account.c:1631 src/prefs_account.c:2955
+#: src/prefs_account.c:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2970
+#: src/prefs_account.c:416 src/prefs_account.c:1804 src/prefs_account.c:3008
 #: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Wieści (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1501
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
-msgstr "Lokalny plik mbox"
+msgstr "Plik miejscowej skrzynki mbox"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Żaden (tylko SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Nazwa konta"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Ustaw jako konto domyślne"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Dane osobowe"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1256
 msgid "Full name"
-msgstr "Pełna nazwa"
+msgstr "Imię i nazwisko"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1262
 msgid "Mail address"
-msgstr "Adres e-mail"
+msgstr "Adres pocztowy"
 
-#: src/prefs_account.c:1298 src/wizard.c:1524
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Sam ustaw"
 
-#: src/prefs_account.c:1300 src/wizard.c:1525
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14938,176 +14948,177 @@ msgstr ""
 "Ostrzeżenie: ta wersja Claws Mail\n"
 "została zbudowana bez obsługi IMAP oraz News."
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga uwierzytelniania"
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Uwierzytelnij przy połączeniu"
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "Serwer wieści"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Serwer do pobierania"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Lokalny mailbox"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (do wysyłania)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1471
 msgid "Use mail command rather than SMTP server"
 msgstr "Użyj polecenia mail zamiast serwera SMTP"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1480
 msgid "command to send mails"
 msgstr "polecenia do wysyłania poczty"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Lokalny"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 msgid "Default Inbox"
 msgstr "Domyślna skrzynka poczty przychodzącej"
 
-#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Niefiltrowane wiadomości będą przetrzymywane w tym katalogu"
 
-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1661
 msgid "Authenticate before POP connection"
 msgstr "Uwierzytelnij przed połączeniem POP"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1696
 msgid "Remove messages on server when received"
 msgstr "Po odebraniu usuń wiadomość z serwera"
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1707
 msgid "Remove after"
 msgstr "Usuń po"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dni oraz 0 godzin : usuw natychmiast"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1737
 msgid "Receive size limit"
 msgstr "Graniczny rozmiar przy pobieraniu"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1740
 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:1750 src/prefs_account.c:2985
+#: src/prefs_account.c:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Graniczna liczba artykułów do pobrania"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "nieskończona jeśli podano 0"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Zwykły tekst"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(zazwyczaj puste)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Pokaż tylko katalogi, które śledzę"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1864
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Tryb oszczędzania łącza (zapobiega pobieraniu zdalnych znaczników)"
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1866
 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:1840 src/prefs_receive.c:164
+#: src/prefs_account.c:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Sprawdzanie okresowe"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Użyj ustawień globalnych"
 
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Odpytuj o nowe wiadomości co"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1921
 msgid "Filter messages on receiving"
-msgstr "Filtruj wiadomości podczas pobierania"
+msgstr "Filtruj wiadomości w trakcie ich pobierania"
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1937
 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:1908
+#: src/prefs_account.c:1941
 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:1998 src/prefs_customheader.c:210
+#: src/prefs_account.c:2031 src/prefs_customheader.c:210
 #: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Nagłówek"
 
-#: src/prefs_account.c:2000
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "Wytwórz ID-wiadomości"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2036
 msgid "Send account mail address in Message-ID"
 msgstr "Wyślij adres konta w ID-wiadomości"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2039
 msgid "Add user agent header"
 msgstr "Dodaj nagłówek user agent"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Dodaj nagłówek określony przez użytkownika"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnienie SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15115,215 +15126,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:2138
+#: src/prefs_account.c:2174
 msgid "Authenticate with POP before sending"
 msgstr "Uwierzytelnij z POP przed wysłaniem"
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "Upłynął czas oczekiwania uwierzytelnienie POP"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2270
 msgid "Authorization"
 msgstr "Uwierzytelnienie"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2287
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Wybierz dostawcę usług dla wiadomości OAuth2"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2327
 msgid "Client ID"
-msgstr "Indentyfikator Klienta"
+msgstr "Identyfikator Klienta"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2333
 msgid "Client secret"
 msgstr "Dana poufna klienta"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2365
 msgid "Obtain authorization code"
 msgstr "Pobierz kod uwierzytelniający"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2369
 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:2338
+#: src/prefs_account.c:2375
 msgid "Copy link"
 msgstr "Skopiuj odnośnik"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2387
 msgid "Authorization code"
 msgstr "Kod uwierzytelnienia"
 
-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2395
 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:2365
+#: src/prefs_account.c:2402
 msgid "Complete authorization"
 msgstr "Dokończ uwierzytelnienie"
 
-#: src/prefs_account.c:2369
+#: src/prefs_account.c:2406
 msgid "Authorize"
 msgstr "Uwierzytelnij"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2502
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2459
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
-msgstr "Sam wstawiaj podpisy"
+msgstr "Sam wstaw podpis"
 
-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "Podpis oddziel"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Wynik polecenia"
 
-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
-msgstr "Sam dodawaj następujące adresy"
+msgstr "Sam dodaj następujące adresy"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
-msgstr "Słowniki do sprawdzania pisowni"
+msgstr "Sprawdź pisownię poniższymi słownikami"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1176
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Domyślny słownik"
 
-#: src/prefs_account.c:2597 src/prefs_folder_item.c:1210
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Domyślny zapasowy słownik"
 
-#: src/prefs_account.c:2683 src/prefs_account.c:4166
+#: src/prefs_account.c:2721 src/prefs_account.c:4222
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
 #: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
-msgstr "Tworzenie wiadomości"
+msgstr "Pisanie wiadomości"
 
-#: src/prefs_account.c:2698 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
+#: src/prefs_account.c:2736 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
-msgstr "Odpowiedź"
+msgstr "Odpowiedz"
 
-#: src/prefs_account.c:2713 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2751 src/prefs_filtering_action.c:185
 #: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Domyślny system ochrony prywatności"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1250
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "Podpisz każdą wiadomość"
 
-#: src/prefs_account.c:2791 src/prefs_folder_item.c:1282
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "Zaszyfruj każdą wiadomość"
 
-#: src/prefs_account.c:2793
+#: src/prefs_account.c:2831
 msgid "Always sign messages when replying to a signed message"
 msgstr "Podpisz wiadomość, gdy odpowiadam na podpisaną wiadomość"
 
-#: src/prefs_account.c:2796
+#: src/prefs_account.c:2834
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Zaszyfruj wiadomość, gdy odpowiadam na zaszyfrowaną wiadomość"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2837
 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:2801
+#: src/prefs_account.c:2839
 msgid "Save sent encrypted messages as clear text"
 msgstr "Zapisz wysłane, zaszyfrowane wiadomości zwykłym tekstem"
 
-#: src/prefs_account.c:2959 src/prefs_account.c:2974 src/prefs_account.c:2988
+#: src/prefs_account.c:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
 msgid "Don't use TLS"
 msgstr "Nie używaj TLS"
 
-#: src/prefs_account.c:2962 src/prefs_account.c:2977 src/prefs_account.c:2997
-#: src/prefs_account.c:3008
+#: src/prefs_account.c:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: src/prefs_account.c:2965 src/prefs_account.c:2980 src/prefs_account.c:3011
+#: src/prefs_account.c:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 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:3001
+#: src/prefs_account.c:3039
 msgid "Send (SMTP)"
 msgstr "Wysyłanie (SMTP)"
 
-#: src/prefs_account.c:3005
+#: src/prefs_account.c:3043
 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:3016
+#: src/prefs_account.c:3054
 msgid "Client certificates"
 msgstr "Certyfikaty klienta"
 
-#: src/prefs_account.c:3024
+#: src/prefs_account.c:3062
 msgid "Certificate for receiving"
 msgstr "Certyfikaty do pobierania"
 
-#: src/prefs_account.c:3029 src/prefs_account.c:3031 src/prefs_account.c:3057
-#: src/prefs_account.c:3059
+#: src/prefs_account.c:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 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:3052
+#: src/prefs_account.c:3090
 msgid "Certificate for sending"
 msgstr "Certyfikat do wysyłania"
 
-#: src/prefs_account.c:3092
+#: src/prefs_account.c:3130
 msgid "Automatically accept valid TLS certificates"
-msgstr "Sam przyjmuj prawidłowe certyfikaty TLS"
+msgstr "Sam zatwierdzaj prawidłowe certyfikaty TLS"
 
-#: src/prefs_account.c:3095
+#: src/prefs_account.c:3133
 msgid "Use non-blocking TLS"
 msgstr "Użyj nieblokującego TLS"
 
-#: src/prefs_account.c:3107
+#: src/prefs_account.c:3145
 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:3199 src/prefs_proxy.c:75
+#: src/prefs_account.c:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Użyj serwera pośredniczącego"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3246
 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:3210
+#: src/prefs_account.c:3248
 msgid "Use global proxy server settings"
 msgstr "Użyj globalnych ustawień serwera pośredniczącego"
 
-#: src/prefs_account.c:3247 src/prefs_proxy.c:117 src/wizard.c:1119
+#: src/prefs_account.c:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
-msgstr "Uwierzytelniaj się"
+msgstr "Uwierzytelnij się"
 
-#: src/prefs_account.c:3252 src/prefs_proxy.c:125
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/prefs_account.c:3286
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Użyj serwera pośredniczącego do wysyłania"
 
-#: src/prefs_account.c:3288
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15331,184 +15342,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:3400
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "Port serwera SMTP"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "Port serwera POP"
 
-#: src/prefs_account.c:3414
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "Port serwera IMAP"
 
-#: src/prefs_account.c:3421
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "Port serwera NNTP"
 
-#: src/prefs_account.c:3427
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Nazwa domeny"
 
-#: src/prefs_account.c:3430
+#: src/prefs_account.c:3468
 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:3444
+#: src/prefs_account.c:3482
 msgid "Use command to communicate with server"
 msgstr "Użyj tego polecenia do porozumiewania się z serwerem"
 
-#: src/prefs_account.c:3453
+#: src/prefs_account.c:3491
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Oznacz cross-posty jako przeczytane i zakoloruj:"
 
-#: src/prefs_account.c:3506
+#: src/prefs_account.c:3544
 msgid "Put sent messages in"
 msgstr "Umieść wiadomości wysłane w"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Umieść wiadomości z kolejki w"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Umieść wiadomości robocze w"
 
-#: src/prefs_account.c:3512
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Umieść usunięte wiadomości w"
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "Nie wpisano nazwy konta."
 
-#: src/prefs_account.c:3573
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "Nie wpisano adresu pocztowego."
 
-#: src/prefs_account.c:3581
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "Nie wpisano serwera SMTP."
 
-#: src/prefs_account.c:3586
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "Nie wpisano ID użytkownika."
 
-#: src/prefs_account.c:3591
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "Nie wpisano serwera POP."
 
-#: src/prefs_account.c:3611
+#: src/prefs_account.c:3649
 msgid "The default Inbox folder doesn't exist."
 msgstr "Domyślny katalog poczty przychodzącej nie istnieje."
 
-#: src/prefs_account.c:3617
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "Nie wpisano serwera IMAP."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "Nie wpisano serwera NNTP."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3666
 msgid "local mailbox filename is not entered."
 msgstr "nie wpisano ścieżki do pliku miejscowej skrzynki mailbox."
 
-#: src/prefs_account.c:3634
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "nie wpisano polecenia poczty."
 
-#: src/prefs_account.c:3644
+#: src/prefs_account.c:3682
 msgid "User ID cannot contain a newline character."
 msgstr "ID użytkownika nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3651
+#: src/prefs_account.c:3689
 msgid "Password cannot contain a newline character."
 msgstr "Hasło nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3686
+#: src/prefs_account.c:3726
 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:3691
+#: src/prefs_account.c:3731
 msgid "SMTP password cannot contain a newline character."
 msgstr "Hasło SMTP nie może zawierać znaku nowego wiersza."
 
-#: src/prefs_account.c:3783
+#: src/prefs_account.c:3826
 msgid "domain is not specified."
 msgstr "nie podano domeny."
 
-#: src/prefs_account.c:3788
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "nie wybrano katalogu wysłanych."
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "nie wybrano katalogu kolejki."
 
-#: src/prefs_account.c:3798
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "nie wybrano katalogu roboczych."
 
-#: src/prefs_account.c:3803
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "nie wybrano katalogu kosza."
 
-#: src/prefs_account.c:4112
+#: src/prefs_account.c:4166
 msgid "Receive"
 msgstr "Pobieranie"
 
-#: src/prefs_account.c:4148
+#: src/prefs_account.c:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Wysyłanie"
+
+#: src/prefs_account.c:4203
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4184 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Wzorce"
 
-#: src/prefs_account.c:4202
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account.c:4322
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Rozszerzone"
 
-#: src/prefs_account.c:4682
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Ustawianie nowego konta"
 
-#: src/prefs_account.c:4684
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Ustawienia konta"
 
-#: src/prefs_account.c:4803 src/wizard.c:1389
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Niepowodzenie (błędy adres)"
 
-#: src/prefs_account.c:4888
+#: src/prefs_account.c:4946
 msgid "Select signature file"
 msgstr "Wybierz plik z podpisem"
 
-#: src/prefs_account.c:4906 src/prefs_account.c:4923 src/wizard.c:1066
+#: src/prefs_account.c:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Wybierz plik certyfikatu"
 
-#: src/prefs_account.c:5019
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: src/prefs_account.c:5336
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (nie wczytano wtyczki)"
 
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Ukończono uwierzytelnianie"
+
+#: src/prefs_account.c:6278
+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:6281
+msgid "Authorisation NOT completed"
+msgstr "NIE ukończono uwierzytelniania"
+
+#: src/prefs_account.c:6282
+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:227
 msgid "Actions configuration"
 msgstr "Ustawienia działań"
@@ -15531,11 +15563,11 @@ msgstr "Edytuj działanie filtra"
 
 #: src/prefs_actions.c:331
 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:339
 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:341 src/prefs_filtering_action.c:589
 #: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
@@ -15557,7 +15589,7 @@ msgstr "Pokaż szczegóły działań ustawień"
 
 #: src/prefs_actions.c:398
 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:408
 msgid "Move the selected action up"
@@ -15569,7 +15601,7 @@ msgstr "Przesuń wybrane działanie w dół"
 
 #: src/prefs_actions.c:426
 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:559 src/prefs_filtering_action.c:678
 #: src/prefs_filtering.c:841 src/prefs_filtering.c:843
@@ -15636,16 +15668,17 @@ msgid "Entry not saved"
 msgstr "Nie zapisano wpisu"
 
 #: src/prefs_actions.c:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
-#: src/prefs_filtering.c:1531 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 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:922 src/prefs_actions.c:927 src/prefs_actions.c:953
 #: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
 #: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
-msgstr "Wznów edyt_owanie"
+msgstr "Wróć d_o zmieniania"
 
 #: src/prefs_actions.c:925
 msgid "Actions list not saved"
@@ -15661,7 +15694,7 @@ msgstr "<span weight=\"bold\" underline=\"single\">Nazwa menu:</span>"
 
 #: src/prefs_actions.c:997
 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:999
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
@@ -15669,30 +15702,31 @@ msgstr "<span weight=\"bold\" underline=\"single\">Wiersz poleceń:</span>"
 
 #: src/prefs_actions.c:1000
 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:1001
 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:1002
 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:1003
 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:1004
 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:1005
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
-"aby zamienić treść wiadomości lub wybrany jej kawałek standardowym wyjściem"
-" polecenia"
+"aby zamienić treść wiadomości lub wybrany jej kawałek standardowym wyjściem "
+"polecenia"
 
 #: src/prefs_actions.c:1006
 msgid "to insert command's standard output without replacing old text"
@@ -15709,36 +15743,39 @@ msgstr "<span weight=\"bold\">Użyj:</span>"
 
 #: src/prefs_actions.c:1009
 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:1010
 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:1011
 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:1012
 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:1013
 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:1014
 msgid "for the text selection"
-msgstr "dla wybrania tekstu"
+msgstr "aby uzyskać zaznaczony tekst"
 
 #: src/prefs_actions.c:1015
 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:1016
 msgid "for a literal %"
-msgstr "dla dosłownego %"
+msgstr "aby użyć znaku % dosłownie"
 
 #: src/prefs_actions.c:1026 src/prefs_themes.c:1190
 msgid "Actions"
@@ -15749,9 +15786,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:1114 src/prefs_filtering.c:1706
 #: src/prefs_template.c:1114
@@ -15788,8 +15824,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"
@@ -15836,15 +15872,15 @@ msgstr "Nawet gdy wiadomość ma zostać zaszyfrowana"
 
 #: src/prefs_compose_writing.c:180
 msgid "Undo level"
-msgstr "Graniczna liczba poziomów cofnięć"
+msgstr "Graniczna liczba kroków cofnięć"
 
 #: src/prefs_compose_writing.c:197
 msgid "Warn when inserting a file larger than"
 msgstr "Ostrzeż, gdy wstawię plik większy niż"
 
 #: src/prefs_compose_writing.c:208
-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:214
 msgid "Replying"
@@ -15901,66 +15937,70 @@ msgid "Header name is not set."
 msgstr "Brak nazwy nagłówka."
 
 #: src/prefs_customheader.c:514
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "W nazwie nagłówka nie wolno stosować dwukropka (:)."
+
+#: src/prefs_customheader.c:519
 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:561
+#: src/prefs_customheader.c:566
 msgid "Choose a PNG file"
 msgstr "Wybierz plik PNG"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Wybierz plik XBM"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Wybierz plik tekstowy"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Ten plik nie jest obrazem."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 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:589
+#: src/prefs_customheader.c:594
 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:594
+#: src/prefs_customheader.c:599
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Obraz nie jest we właściwym formacie (PNG)."
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:608
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Obraz nie jest we właściwym formacie (XBM)."
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:617
 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:618
+#: src/prefs_customheader.c:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "błąd Compface: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Ten plik zawiera znaki nowych wierszy."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Usuń nagłówek"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 msgid "Do you really want to delete this header?"
 msgstr "Czy na pewno usunąć ten nagłówek?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:880
 msgid "Current custom headers"
 msgstr "Bieżące własne nagłówki"
 
@@ -15978,7 +16018,7 @@ msgstr "Ukryte nagłówki"
 
 #: src/prefs_display_header.c:354
 msgid "Displayed Headers"
-msgstr "Wyświetlone nagłówki"
+msgstr "Wyświetlane nagłówki"
 
 #: src/prefs_display_header.c:399
 msgid "Show all unspecified headers"
@@ -16018,9 +16058,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:282 src/prefs_image_viewer.c:179
 #: src/prefs_message.c:362
@@ -16174,7 +16214,7 @@ msgstr "Nie określono żadnego działania."
 #: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2218
 #: src/quote_fmt.c:79
 msgid "literal %"
-msgstr "dosłowne %"
+msgstr "znak % dosłownie"
 
 #: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2227
 msgid "filename (should not be modified)"
@@ -16252,19 +16292,19 @@ msgstr " O_kreśl... "
 
 #: src/prefs_filtering.c:476
 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:485
 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:494
 msgid "Delete the selected rule from the list"
-msgstr "Usuń zaznaczoną zasadę ze spisu"
+msgstr "Usunie zaznaczoną zasadę ze spisu"
 
 #: src/prefs_filtering.c:535
 msgid "Move the selected rule to the top"
-msgstr "Przesuwa zaznaczoną zasadę na szczyt"
+msgstr "Przesunie zaznaczoną zasadę na szczyt"
 
 #: src/prefs_filtering.c:538
 msgid "Page u_p"
@@ -16272,15 +16312,15 @@ msgstr "_Strona w górę"
 
 #: src/prefs_filtering.c:546
 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:555
 msgid "Move the selected rule up"
-msgstr "Przesuwa zaznaczoną zasadę w górę"
+msgstr "Przesunie zaznaczoną zasadę w górę"
 
 #: src/prefs_filtering.c:563
 msgid "Move the selected rule down"
-msgstr "Przesuwa zaznaczoną zasadę w dół"
+msgstr "Przesunie zaznaczoną zasadę w dół"
 
 #: src/prefs_filtering.c:566
 msgid "Page dow_n"
@@ -16288,11 +16328,11 @@ msgstr "Stro_na w dół"
 
 #: src/prefs_filtering.c:574
 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:583
 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:1045 src/prefs_filtering.c:1131
 msgid "Condition string is not valid."
@@ -16401,15 +16441,15 @@ msgstr "Rodzaj katalogu"
 
 #: src/prefs_folder_item.c:354
 msgid "Simplify Subject RegExp"
-msgstr "Uprość wyrażenie regularne tematu"
+msgstr "Wyrażenie regularne, upraszczające temat"
 
 #: src/prefs_folder_item.c:380
 msgid "Test string"
-msgstr "Próbny ciąg znaków"
+msgstr "Wejściowy ciąg znaków"
 
 #: src/prefs_folder_item.c:397
 msgid "Result"
-msgstr "Wynik"
+msgstr "Wynikowy ciąg znaków"
 
 #: src/prefs_folder_item.c:412
 msgid "Folder chmod"
@@ -16465,8 +16505,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"
@@ -16474,7 +16514,7 @@ msgstr "Synchronizuj do użytku niesieciowego"
 
 #: src/prefs_folder_item.c:585
 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:592
 msgid "0: all bodies"
@@ -16490,11 +16530,12 @@ msgstr "Porzuć pamięć podręczną katalogu"
 
 #: src/prefs_folder_item.c:940
 msgid "Request Return Receipt"
-msgstr "Żądaj potwierdzenia dostarczenia"
+msgstr "Poproś o potwierdzenie dostarczenia"
 
 #: src/prefs_folder_item.c:955
 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:970 src/prefs_folder_item.c:996
 #: src/prefs_folder_item.c:1048 src/prefs_folder_item.c:1074
@@ -16512,11 +16553,12 @@ msgstr "Domyślny %s przy odpowiadaniu"
 
 #: src/prefs_folder_item.c:1125
 msgid "Default account"
-msgstr "Konto domyślne"
+msgstr "Domyślne konto"
 
 #: src/prefs_folder_item.c:1267 src/prefs_folder_item.c:1299
 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:1854
 msgid "Discard cache"
@@ -16525,7 +16567,7 @@ msgstr "Opróżnij dane z pamięci podręcznej"
 #: src/prefs_folder_item.c:1855
 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:1980
@@ -16548,8 +16590,8 @@ msgstr "Wiadomość"
 #: src/prefs_fonts.c:126
 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:136
 msgid "Small"
@@ -16651,10 +16693,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..."
@@ -17101,14 +17142,6 @@ msgstr "rodzaj"
 msgid "Program returns"
 msgstr "Program zwraca"
 
-#: src/prefs_matcher.c:2171
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"Nie zapisano wpisu.\n"
-"Czy zamknąć mimo tego?"
-
 #: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Rodzaj dopasowania: 'Test'"
@@ -17135,7 +17168,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"
@@ -17163,11 +17196,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"
@@ -17500,7 +17533,7 @@ msgstr ""
 
 #: src/prefs_other.c:497
 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:500
 msgid "On exit"
@@ -17516,7 +17549,7 @@ msgstr "Opróżnij kosz przed wyjściem"
 
 #: src/prefs_other.c:513
 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:515
 msgid "Keyboard shortcuts"
@@ -17556,7 +17589,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:546
 msgid "Safer"
@@ -17682,7 +17715,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"
@@ -17735,7 +17768,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"
@@ -17746,8 +17779,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:267
 msgid "7bit ASCII (US-ASCII)"
@@ -17881,8 +17914,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:420 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:420 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Wysyłanie"
 
@@ -18046,8 +18079,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"
@@ -18079,7 +18112,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"
@@ -18087,24 +18120,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"
@@ -18112,25 +18144,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"
@@ -18142,7 +18172,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 ""
@@ -18155,7 +18185,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"
@@ -18163,7 +18194,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:539
 msgid "Defaults"
@@ -18232,7 +18263,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"
@@ -18256,15 +18287,15 @@ msgstr "najnowsza nieprzeczytana wiadomość"
 
 #: src/prefs_summary_open.c:189
 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:234
 msgid "Available selections"
-msgstr "Dostępne zaznaczenie"
+msgstr "Dostępny wybór"
 
 #: src/prefs_summary_open.c:269
 msgid "Current selections"
-msgstr "Bieżące zaznaczenie"
+msgstr "Bieżący wybór"
 
 #: src/prefs_template.c:80
 msgid "This name is used as the Menu item"
@@ -18292,7 +18323,7 @@ msgstr "Usuwa wybrany szablon z listy"
 
 #: src/prefs_template.c:346
 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:370
 msgid "Move the selected template to the top"
@@ -18328,24 +18359,24 @@ msgstr "Nie podano nazwy wzorca."
 
 #: src/prefs_template.c:803
 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:809
 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:815
 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:821
 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:827
 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:833
 msgid "The \"Subject\" field of the template is invalid."
@@ -18463,7 +18494,7 @@ msgstr "Nie można utworzyć katalogu docelowego %s."
 
 #: src/prefs_themes.c:628
 msgid "Theme installed successfully."
-msgstr "Pomyślnie wgrano wyglad."
+msgstr "Pomyślnie wgrano wygląd."
 
 #: src/prefs_themes.c:635
 msgid "Failed installing theme"
@@ -18558,8 +18589,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."
@@ -18619,7 +18650,7 @@ msgstr "Okno wiadomości"
 
 #: src/prefs_toolbar.c:1260
 msgid "Compose Window"
-msgstr "Okno tworzenia nowej wiadomości"
+msgstr "Okno pisania wiadomości"
 
 #: src/prefs_toolbar.c:1376
 msgid "Icon text"
@@ -18763,15 +18794,15 @@ msgstr "<span weight=\"bold\">symbole:</span>"
 
 #: src/quote_fmt.c:48
 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:51
 msgid "email address of sender"
-msgstr "adres e-mail nadawcy"
+msgstr "adres pocztowy nadawcy"
 
 #: src/quote_fmt.c:52
 msgid "full name of sender"
-msgstr "pełne dane nadawcy"
+msgstr "imię i nazwisko nadawcy"
 
 #: src/quote_fmt.c:53
 msgid "first name of sender"
@@ -18783,7 +18814,7 @@ msgstr "nazwisko nadawcy"
 
 #: src/quote_fmt.c:55
 msgid "initials of sender"
-msgstr "Inicjały Nadawcy"
+msgstr "inicjały nadawcy"
 
 #: src/quote_fmt.c:62
 msgid "message body"
@@ -18807,11 +18838,11 @@ msgstr "znaczniki wiadomości"
 
 #: src/quote_fmt.c:67
 msgid "current dictionary"
-msgstr "aktualny słownik"
+msgstr "bieżący słownik"
 
 #: src/quote_fmt.c:68
 msgid "cursor position"
-msgstr "pozycje kursora"
+msgstr "położenie kursora"
 
 #: src/quote_fmt.c:69
 msgid "account property: your name"
@@ -18843,7 +18874,7 @@ msgstr "właściwość konta: domyślny słownik"
 
 #: src/quote_fmt.c:76
 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:77
 msgid "address book <span style=\"oblique\">completion</span>: From"
@@ -18855,31 +18886,31 @@ msgstr "książka adresowa <span style=\"oblique\">uzupełnianie</span>: Do"
 
 #: src/quote_fmt.c:80
 msgid "literal backslash"
-msgstr "znak odwróconego ukośnika"
+msgstr "odwrócony ukośnik dosłownie"
 
 #: src/quote_fmt.c:81
 msgid "literal question mark"
-msgstr "znak zapytania"
+msgstr "zapytanie dosłownie"
 
 #: src/quote_fmt.c:82
 msgid "literal exclamation mark"
-msgstr "znak wykrzyknika"
+msgstr "wykrzyknik dosłownie"
 
 #: src/quote_fmt.c:83
 msgid "literal pipe"
-msgstr "znak rury"
+msgstr "potok dosłownie"
 
 #: src/quote_fmt.c:84
 msgid "literal opening curly brace"
-msgstr "znak otwarcia nawiasu klamrowego"
+msgstr "otwarcia nawiasu klamrowego dosłownie"
 
 #: src/quote_fmt.c:85
 msgid "literal closing curly brace"
-msgstr "znak zamknięcia nawiasu klamrowego"
+msgstr "zamknięcia nawiasu klamrowego dosłownie"
 
 #: src/quote_fmt.c:86
 msgid "tab"
-msgstr "tab"
+msgstr "tabulator"
 
 #: src/quote_fmt.c:89
 msgid "<span weight=\"bold\">commands:</span>"
@@ -18925,7 +18956,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:94
@@ -18944,9 +18976,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:96
 msgid ""
@@ -18956,8 +18988,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:98
 msgid "<span weight=\"bold\">definition of terms:</span>"
@@ -18968,7 +19002,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:100
@@ -18976,7 +19010,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:101
@@ -18986,17 +19020,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:110
 msgid "Description of symbols"
-msgstr "Opis pól zastępczych"
+msgstr "Opis symboli"
 
 #: src/quote_fmt.c:111
 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:174
 msgid "Use template when composing new messages"
@@ -19039,7 +19074,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:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
@@ -19062,88 +19097,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"
@@ -19199,11 +19234,11 @@ msgstr "Szukanie wiadomości"
 
 #: src/summary_search.c:313
 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:315
 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:436
 msgid "Body:"
@@ -19331,7 +19366,7 @@ msgstr "Brak kolorowanych wiadomości"
 
 #: src/summaryview.c:2186
 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:2195 src/summaryview.c:2228
 msgid "No labeled messages."
@@ -19390,7 +19425,7 @@ msgstr "Nieprzeczytane:"
 
 #: src/summaryview.c:2788
 msgid "Total:"
-msgstr "Wszystkie:"
+msgstr "Łącznie:"
 
 #: src/summaryview.c:2790
 msgid "Marked:"
@@ -19473,28 +19508,28 @@ msgstr "Katalog docelowy taki sam jak bieżący."
 #: src/summaryview.c:4797
 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:4848
 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:4882
 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:5046
 msgid "Append or Overwrite"
-msgstr "Dodaj lub Nadpisz"
+msgstr "Dopisać, czy zastąpić"
 
 #: src/summaryview.c:5047
 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:5048
 msgid "_Append"
@@ -19502,7 +19537,7 @@ msgstr "_Dopisz"
 
 #: src/summaryview.c:5048
 msgid "_Overwrite"
-msgstr "_Nadpisz"
+msgstr "_Zastąp"
 
 #: src/summaryview.c:5059 src/summaryview.c:5062 src/summaryview.c:5077
 #, c-format
@@ -19513,7 +19548,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:5558
 msgid "Building threads..."
@@ -19525,11 +19560,11 @@ msgstr "Pomiń te zasady"
 
 #: src/summaryview.c:5809
 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:5812
 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:5841
 msgid "Filtering"
@@ -19554,16 +19589,16 @@ msgstr "Ustawienia przetwarzania"
 #: src/summaryview.c:6105
 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:6107
 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:6108
 msgid "Reset color label"
-msgstr "Resetowanie koloru etykiet"
+msgstr "Wyzeruj kolorową etykietę"
 
 #: src/summaryview.c:6108
 msgid "Set color label"
@@ -19579,11 +19614,11 @@ msgstr "Śledzony wątek"
 
 #: src/summaryview.c:6563
 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:6565
 msgid "Replied - click to see reply"
-msgstr "Odpowiedziano - kliknij aby zobaczyć odpowiedź"
+msgstr "Odpowiedziano - naciśnij, aby zobaczyć odpowiedź"
 
 #: src/summaryview.c:6577
 msgid "To be moved"
@@ -19609,7 +19644,7 @@ msgstr "Zaszyfrowana wiadomość"
 msgid "Has attachment(s)"
 msgstr "Wiadomość posiada załącznik(i)"
 
-#: src/summaryview.c:8321
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19618,17 +19653,17 @@ msgstr ""
 "Błąd regularnego wyrażenia (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8424
+#: src/summaryview.c:8428
 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:8429
+#: src/summaryview.c:8433
 msgid "Go back to the folder list"
 msgstr "Powrót do listy katalogów"
 
 #: src/textview.c:265
 msgid "_Open in web browser"
-msgstr "_Otwórz w przeglądarce"
+msgstr "_Otwórz w przeglądarce sieciowej"
 
 #: src/textview.c:266
 msgid "Copy this _link"
@@ -19640,7 +19675,7 @@ msgstr "Odpowiedz na ten ad_res"
 
 #: src/textview.c:274
 msgid "Add to _Address book"
-msgstr "Dodaj do książki adresowej"
+msgstr "Dodaj do książki _adresowej"
 
 #: src/textview.c:275
 msgid "Copy this add_ress"
@@ -19793,11 +19828,11 @@ msgstr "Ostrzeżenie przed próbą oszustwa."
 
 #: src/toolbar.c:227 src/toolbar.c:2335
 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:2340
 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:2344
 msgid "Send Queued Messages"
@@ -19805,43 +19840,43 @@ msgstr "Wysyła zakolejkowane wcześniej wiadomości"
 
 #: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2362 src/toolbar.c:2373
 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:2417 src/toolbar.c:2427
 msgid "Reply to Message"
-msgstr "Odpowiedz na wiadomość"
+msgstr "Odpowiada na wiadomość"
 
 #: src/toolbar.c:233 src/toolbar.c:2434 src/toolbar.c:2444
 msgid "Reply to Sender"
-msgstr "Odpowiedz nadawcy"
+msgstr "Odpowiada nadawcy"
 
 #: src/toolbar.c:234 src/toolbar.c:2451 src/toolbar.c:2461
 msgid "Reply to All"
-msgstr "Odpowiedz wszystkim"
+msgstr "Odpowiada wszystkim"
 
 #: src/toolbar.c:235 src/toolbar.c:2468 src/toolbar.c:2478
 msgid "Reply to Mailing-list"
-msgstr "Odpowiedz na listę dyskusyjną"
+msgstr "Odpowiada na listę dyskusyjną"
 
 #: src/toolbar.c:236 src/toolbar.c:2356
 msgid "Open email"
-msgstr "Otwórz wiadomość"
+msgstr "Otwiera wiadomość"
 
 #: src/toolbar.c:237 src/toolbar.c:2485 src/toolbar.c:2496
 msgid "Forward Message"
-msgstr "Przekaż wiadomość"
+msgstr "Przekazuje wiadomość"
 
 #: src/toolbar.c:238 src/toolbar.c:2501
 msgid "Trash Message"
-msgstr "Wyrzuć wiadomość do kosza"
+msgstr "Wyrzuca wiadomość do kosza"
 
 #: src/toolbar.c:239 src/toolbar.c:2505
 msgid "Delete Message"
-msgstr "Usuń wiadomość"
+msgstr "Usuwa wiadomość"
 
 #: src/toolbar.c:240
 msgid "Delete duplicate messages"
@@ -19849,63 +19884,63 @@ msgstr "Usuń powielone wiadomości"
 
 #: src/toolbar.c:242 src/toolbar.c:2513
 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:2517
 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:2523
 msgid "Send Message"
-msgstr "Wyślij wiadomość"
+msgstr "Wysyła wiadomość"
 
 #: src/toolbar.c:263 src/toolbar.c:2527
 msgid "Put into queue folder and send later"
@@ -19914,63 +19949,63 @@ msgstr ""
 
 #: src/toolbar.c:264 src/toolbar.c:2531
 msgid "Save to draft folder"
-msgstr "Zapisz w katalogu roboczych"
+msgstr "Zapisuje w katalogu roboczych"
 
 #: src/toolbar.c:265 src/toolbar.c:2535
 msgid "Insert file"
-msgstr "Wstaw plik"
+msgstr "Wstawia plik"
 
 #: src/toolbar.c:266 src/toolbar.c:2539
 msgid "Attach file"
-msgstr "Załącz plik"
+msgstr "Załącza plik"
 
 #: src/toolbar.c:267 src/toolbar.c:2543
 msgid "Insert signature"
-msgstr "Wstaw podpis"
+msgstr "Wstawia podpis"
 
 #: src/toolbar.c:268 src/toolbar.c:2547
 msgid "Replace signature"
-msgstr "Zastąp podpis"
+msgstr "Zastępuje podpis"
 
 #: src/toolbar.c:269 src/toolbar.c:2551
 msgid "Edit with external editor"
-msgstr "Edytuj w zewnętrznym edytorze"
+msgstr "Edytuje w zewnętrznym edytorze"
 
 #: src/toolbar.c:270 src/toolbar.c:2555
 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:2559
 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:2568
 msgid "Check spelling"
-msgstr "Sprawdź pisownię"
+msgstr "Sprawdza pisownię"
 
 #: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2573
 msgid "Sign"
-msgstr "Podpisz"
+msgstr "Podpisuje"
 
 #: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2581
 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:2600
 msgid "Cancel receiving"
-msgstr "Odwołaj pobierania"
+msgstr "Odwołuje pobieranie"
 
 #: src/toolbar.c:281 src/toolbar.c:2608
 msgid "Cancel receiving/sending"
-msgstr "Odwołaj pobieranie/wysyłanie"
+msgstr "Odwołuje pobieranie/wysyłanie"
 
 #: src/toolbar.c:282 src/toolbar.c:2348
 msgid "Close window"
-msgstr "Zamknij okno"
+msgstr "Zamyka okno"
 
 #: src/toolbar.c:284
 msgid "Claws Mail Plugins"
@@ -19983,7 +20018,7 @@ msgstr "Kosz"
 
 #: src/toolbar.c:495
 msgid "Get Mail"
-msgstr "Pobierz pocztę"
+msgstr "Pobierz wiadomości"
 
 #: src/toolbar.c:496
 msgid "Get"
@@ -19992,20 +20027,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:2401 src/toolbar.c:2410
 msgid "Delete duplicates"
@@ -20073,11 +20108,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"
@@ -20085,7 +20120,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"
@@ -20105,11 +20140,11 @@ msgstr "Wiadomość nie zostanie zaszyfrowana"
 
 #: src/toolbar.c:2330
 msgid "Go to folder list"
-msgstr "Przejdź do listy katalogów"
+msgstr "Przejdź do spisu katalogów"
 
 #: src/toolbar.c:2336
 msgid "Receive Mail from selected Account"
-msgstr "Pobiera Poczty z wybranego konta"
+msgstr "Pobiera wiadomości z wybranego konta"
 
 #: src/toolbar.c:2352
 msgid "Open preferences"
@@ -20117,7 +20152,7 @@ msgstr "Otwórz Ustawienia"
 
 #: src/toolbar.c:2363
 msgid "Compose with selected Account"
-msgstr "Utwórz, używając wybranego konta"
+msgstr "Pisze wiadomość z wybranego konta"
 
 #: src/toolbar.c:2384
 msgid "Learn as..."
@@ -20125,11 +20160,11 @@ msgstr "Rozpoznaj jako..."
 
 #: src/toolbar.c:2394
 msgid "Learn as _Spam"
-msgstr "Zapamiętaj jako _Spam"
+msgstr "Zapamiętuje jako _Spam"
 
 #: src/toolbar.c:2395
 msgid "Learn as _Ham"
-msgstr "Zapamiętaj jako _Ham"
+msgstr "Zapamiętuje jako _Ham"
 
 #: src/toolbar.c:2402
 msgid "Delete duplicates options"
@@ -20181,17 +20216,16 @@ msgstr "W tej wiadomości nie ma żadnych adresów URL."
 
 #: src/uri_opener.c:130
 msgid "Included URLs:"
-msgstr "Załączone adresy URL:"
+msgstr "Adresy URL w treści:"
 
 #: src/uri_opener.c:210
 msgctxt "Dialog title"
 msgid "Open URLs"
-msgstr "Otwórz adresy URL"
+msgstr "Otwieranie adresów URL"
 
 #: src/uri_opener.c:238
 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:246
 msgid "Select All"
@@ -20250,28 +20284,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"
@@ -20293,34 +20327,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:975
 msgid "Your name:"
@@ -20328,7 +20362,7 @@ msgstr "Twoje imię:"
 
 #: src/wizard.c:986
 msgid "Your email address:"
-msgstr "Twój adres e-mail:"
+msgstr "Twój adres pocztowy:"
 
 #: src/wizard.c:997
 msgid "Your organization:"
@@ -20336,7 +20370,7 @@ msgstr "Twoja organizacja:"
 
 #: src/wizard.c:1031
 msgid "Mailbox name:"
-msgstr "Nazwa skrzynki:"
+msgstr "Nazwa skrzynki pocztowej:"
 
 #: src/wizard.c:1039
 msgid ""
@@ -20353,11 +20387,11 @@ msgstr "Możesz podać numer portu dopisując go na końcu: \"mail.serwer.com:25
 
 #: src/wizard.c:1113
 msgid "SMTP server address:"
-msgstr "Adres serwer SMTP:"
+msgstr "Adres serwera SMTP:"
 
 #: src/wizard.c:1128
 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:1142
 msgid "SMTP username:"
@@ -20369,7 +20403,7 @@ msgstr "Hasło SMTP:"
 
 #: src/wizard.c:1166
 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:1177 src/wizard.c:1597
 msgid "Use STARTTLS command to start encryption"
@@ -20385,7 +20419,7 @@ msgstr "Adres serwera:"
 
 #: src/wizard.c:1321
 msgid "Local mailbox:"
-msgstr "Lokalna skrzynka:"
+msgstr "Miejscowa skrzynka:"
 
 #: src/wizard.c:1490
 msgid "Server type:"
@@ -20400,15 +20434,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:1586
 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:1651
 msgid "IMAP server directory:"
-msgstr "Katalog serwera IMAP4:"
+msgstr "Katalog serwera IMAP:"
 
 #: src/wizard.c:1662
 msgid "Show only subscribed folders"
@@ -20424,7 +20458,7 @@ msgstr ""
 
 #: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
-msgstr "Pomocnik ustawiania Claws Mail"
+msgstr "Pomocnik ustawień Claws Mail"
 
 #: src/wizard.c:1821
 msgid "Welcome to Claws Mail"
@@ -20438,12 +20472,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:1841
 msgid "About You"
@@ -20474,5 +20507,40 @@ 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ć."
+
+#, 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"
+
+#~ 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ąć?"
+
+#~ msgid ""
+#~ "The entry was not saved.\n"
+#~ "Close anyway?"
+#~ msgstr ""
+#~ "Nie zapisano wpisu.\n"
+#~ "Czy zamknąć mimo tego?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 46888d2e9..c84ea8a14 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,13 +4,13 @@
 # as the Claws Mail package, see COPYING file.
 #
 #
-# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2018, 2021, 2022.
+# Frederico Goncalves Guimaraes <frederico at teia.bio.br>, 2006-2017, 2021, 2022.
 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:43+0100\n"
-"PO-Revision-Date: 2022-03-31 22:50-0300\n"
+"PO-Revision-Date: 2022-10-16 11:57-0300\n"
 "Last-Translator: Frederico Gonçalves Guimarães <frederico at teia.bio.br>\n"
 "Language-Team: Portuguese <kde-i18n-pt_BR at kde.org>\n"
 "Language: pt_BR\n"
@@ -535,7 +535,7 @@ msgstr "Enviar _mensagem para"
 
 #: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Merge"
-msgstr "Me_sclar"
+msgstr "_Mesclar"
 
 #: src/addressbook.c:442
 msgid "Import _LDIF file..."
@@ -885,7 +885,7 @@ msgstr "Coletando endereços..."
 
 #: src/addrgather.c:254
 msgid "address added by Claws Mail"
-msgstr "endereço adicionado pelo Claws-Mail"
+msgstr "endereço adicionado pelo Claws Mail"
 
 #: src/addrgather.c:285
 msgid "Addresses collected successfully."
@@ -1481,10 +1481,10 @@ msgid ""
 "\n"
 "Signing and encrypting have been disabled for this message."
 msgstr ""
-"Você optou por assinar e/ou criptografar essa mensagem, mas não selecionou "
+"Você optou por assinar e/ou criptografar esta mensagem, mas não selecionou "
 "nenhum sistema de privacidade.\n"
 "\n"
-"A assinatura e a criptografia foram desabilitadas para essa mensagem."
+"A assinatura e a criptografia foram desabilitadas para esta mensagem."
 
 #: src/compose.c:609
 msgid "_Add..."
@@ -2330,7 +2330,8 @@ 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:9742
 #, c-format
@@ -2875,8 +2876,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:491
@@ -2940,7 +2941,7 @@ msgstr ""
 
 #: src/editldap.c:600
 msgid "Max Query Age (secs)"
-msgstr "Duração máxima da consulta (s)"
+msgstr "Duração máxima da consulta (seg)"
 
 #: src/editldap.c:614
 msgid ""
@@ -3031,7 +3032,7 @@ msgstr "Exibir a senha"
 
 #: src/editldap.c:748 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout (secs)"
-msgstr "Limite de tempo (s)"
+msgstr "Limite de tempo (seg)"
 
 #: src/editldap.c:761
 msgid "The timeout period in seconds."
@@ -3561,7 +3562,7 @@ 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
@@ -3570,7 +3571,7 @@ 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
@@ -5100,7 +5101,7 @@ msgstr "Lembrar disso"
 
 #: src/gtk/logwindow.c:450
 msgid "_Go to last error"
-msgstr "Ir para o último _erro"
+msgstr "Ir para o úl_timo erro"
 
 #: src/gtk/logwindow.c:457
 msgid "Clear _Log"
@@ -5273,11 +5274,13 @@ msgstr "mensagens excluídas"
 
 #: src/gtk/quicksearch.c:482
 msgid "messages whose date is after requested date (time is optional)"
-msgstr "mensagens cuja data é posterior à data requisitada (hora é opcional)"
+msgstr ""
+"mensagens cuja data seja posterior à data solicitada (o horário é opcional)"
 
 #: src/gtk/quicksearch.c:484
 msgid "messages whose date is before requested date (time is optional)"
-msgstr "mensagens cuja data é anterior à data requisitada (hora é opcional)"
+msgstr ""
+"mensagens cuja data seja anterior à data solicitada (o horário é opcional)"
 
 #: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
@@ -5313,7 +5316,7 @@ msgstr "mensagens que contenham S no cabeçalho Message-Id"
 
 #: src/gtk/quicksearch.c:494
 msgid "messages which contain S in In-Reply-To header"
-msgstr "mensagens que contenham S no cabeçalho In-Reply-To"
+msgstr "mensagens que contenham S no cabeçalho 'In-Reply-To'"
 
 #: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
@@ -5353,15 +5356,15 @@ msgstr "mensagens que contenham S no assunto"
 
 #: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
-msgstr "mensagens com pontuação igual a # pontos"
+msgstr "mensagens com pontuação igual a #"
 
 #: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
-msgstr "mensagens com pontuação maior que # pontos"
+msgstr "mensagens com pontuação maior que #"
 
 #: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
-msgstr "mensagens com pontuação menor que # pontos"
+msgstr "mensagens com pontuação menor que #"
 
 #: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
@@ -5397,7 +5400,7 @@ msgstr "mensagens não lidas"
 
 #: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
-msgstr "mensagens que contenham S no cabeçalho References"
+msgstr "mensagens que contenham S no cabeçalho 'References'"
 
 #: src/gtk/quicksearch.c:516
 #, c-format
@@ -5408,23 +5411,23 @@ msgstr ""
 
 #: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
-msgstr "mensagens que contenham S no cabeçalho X-Label"
+msgstr "mensagens que contenham S no cabeçalho 'X-Label'"
 
 #: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
-msgstr "operador lógico E"
+msgstr "operador lógico 'E'"
 
 #: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
-msgstr "operador lógico OU"
+msgstr "operador lógico 'OU'"
 
 #: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
-msgstr "operador lógico NÃO"
+msgstr "operador lógico 'NÃO'"
 
 #: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
-msgstr "diferenciar maiúsc./minúsc."
+msgstr "a pesquisa diferencia maiúsc./minúsc."
 
 #: src/gtk/quicksearch.c:523
 msgid "match using regular expressions instead of substring search"
@@ -5513,7 +5516,7 @@ msgstr "Correto%s"
 #: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:182
 #: src/ssl_manager.c:301 src/ssl_manager.c:305
 msgid " (expired)"
-msgstr " (expirado)"
+msgstr "(expirado)"
 
 #: src/gtk/sslcertwindow.c:187
 msgid "Owner"
@@ -5990,8 +5993,8 @@ 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."
 
@@ -6038,7 +6041,7 @@ msgstr "Copiando mensagens..."
 
 #: src/imap.c:2526
 msgid "Search failed due to server error."
-msgstr "Não foi possível realizar a pesquisa devido a uma falha no servidor."
+msgstr "Não foi possível realizar a pesquisa devido a um erro no servidor."
 
 #: src/imap.c:2610
 msgid "can't set deleted flags\n"
@@ -7593,7 +7596,7 @@ msgstr "Marcar como _não-spam"
 
 #: src/mainwindow.c:730 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
-msgstr "Travar"
+msgstr "Bloquear"
 
 #: src/mainwindow.c:731 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
@@ -7725,8 +7728,8 @@ msgid "_Forget all session passwords"
 msgstr "Es_quecer todas as senhas da sessão"
 
 #: src/mainwindow.c:799
-msgid "Forget _primary passphrase"
-msgstr "Es_quecer a senha primária"
+msgid "Forget _master passphrase"
+msgstr "Es_quecer a senha mestra"
 
 #: src/mainwindow.c:803
 msgid "C_hange current account"
@@ -8596,8 +8599,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:1223
 msgid "Checking signature..."
@@ -8922,31 +8925,31 @@ msgid ""
 msgstr "OAuth2 decodificado: %s\n"
 
 #: src/password.c:128 src/password.c:129
-msgid "Input primary passphrase"
-msgstr "Digite a senha primária"
+msgid "Input master passphrase"
+msgstr "Digite a senha mestra"
 
 #: src/password.c:141
-msgid "Incorrect primary passphrase."
-msgstr "Senha primária incorreta."
+msgid "Incorrect master passphrase."
+msgstr "Senha mestra incorreta."
 
 #: src/password_gtk.c:67
 msgid "New passphrases do not match, try again."
 msgstr "As novas senhas não conferem, tente novamente."
 
 #: src/password_gtk.c:80
-msgid "Incorrect old primary passphrase entered, try again."
-msgstr "A senha primária anterior está incorreta, tente novamente."
+msgid "Incorrect old master passphrase entered, try again."
+msgstr "A senha mestra anterior está incorreta, tente novamente."
 
 #: src/password_gtk.c:144
-msgid "Changing primary passphrase"
-msgstr "Alterando a senha primária"
+msgid "Changing master passphrase"
+msgstr "Alterando a senha mestra"
 
 #: src/password_gtk.c:165
 msgid ""
-"If a primary passphrase is currently active, it\n"
+"If a master passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
-"Caso exista uma senha primária atualmente ativa,\n"
+"Caso exista uma senha mestra atualmente ativa,\n"
 "ela deve ser digitada."
 
 #: src/password_gtk.c:175
@@ -9120,7 +9123,7 @@ msgstr "Campos de onde preservar os endereços"
 #, c-format
 msgctxt "address keeper: %s stands for a header name"
 msgid "Keep addresses which appear in '%s' headers"
-msgstr "Armazenar os endereços que apareçam nos cabeçalhos '%s'"
+msgstr "Armazenar os endereços que aparecem nos cabeçalhos '%s'"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:185
 msgid ""
@@ -9629,7 +9632,7 @@ msgstr "Os anexos foram removidos de todas as %d mensagens selecionadas."
 
 #: src/plugins/att_remover/att_remover.c:503
 msgid "This message doesn't have any attachments."
-msgstr "Essa mensagem não possui nenhum anexo."
+msgstr "Essa mensagem não tem nenhum anexo."
 
 #: src/plugins/att_remover/att_remover.c:516
 msgid "Remove attachments..."
@@ -9697,9 +9700,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:87
 #: src/plugins/keyword_warner/keyword_warner_prefs.c:87
@@ -10461,7 +10463,7 @@ msgstr "Ao clicar em um link, por padrão"
 
 #: src/plugins/fancy/fancy_prefs.c:285
 msgid "Open in External Browser"
-msgstr "Abra em um navegador externo"
+msgstr "Abrir em um navegador externo"
 
 #: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
@@ -10519,7 +10521,7 @@ msgstr "%s é uma fonte malformada ou não suportada"
 
 #: src/plugins/fancy/fancy_viewer.c:759
 msgid "Search the Web"
-msgstr "Pesquisar a Web"
+msgstr "Pesquisar na Web"
 
 #: src/plugins/fancy/fancy_viewer.c:770
 msgid "Open in Viewer"
@@ -10863,8 +10865,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"
 
@@ -10883,8 +10885,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:137
 msgid "Don't check for keywords when forwarding or redirecting messages"
@@ -12285,7 +12287,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 "_No"
@@ -14150,7 +14153,7 @@ msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
 msgstr ""
-"Você não possui nenhuma conta correspondente a nenhum dos participantes.\n"
+"Você não tem nenhuma conta correspondente a nenhum dos participantes.\n"
 "Deseja responder mesmo assim?"
 
 #: src/plugins/vcalendar/vcalendar.c:1062
@@ -15771,8 +15774,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:1332 src/prefs_filtering.c:1081
 #: src/prefs_filtering.c:1139
@@ -16644,7 +16647,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 "
@@ -17295,22 +17298,22 @@ msgstr "Habilitar coloração do fundo do texto"
 #: src/prefs_msg_colors.c:256
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
-msgstr "Selecione a cor para o fundo do texto do 1º nível"
+msgstr "Escolha a cor para o fundo do texto de 1º nível"
 
 #: src/prefs_msg_colors.c:269
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
-msgstr "Selecione a cor para o fundo do texto do 2º nível"
+msgstr "Escolha a cor para o fundo do texto de 2º nível"
 
 #: src/prefs_msg_colors.c:282
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
-msgstr "Selecione a cor para o fundo do texto do 3º nível"
+msgstr "Escolha a cor para o fundo do texto de 3º nível"
 
 #: src/prefs_msg_colors.c:294
 msgctxt "Tooltip"
 msgid "Pick color for links"
-msgstr "Selecione a cor para os links"
+msgstr "Escolha a cor para os links"
 
 #: src/prefs_msg_colors.c:298
 msgid "URI link"
@@ -17319,7 +17322,7 @@ msgstr "Links URI"
 #: src/prefs_msg_colors.c:306
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
-msgstr "Selecione a cor para as assinaturas"
+msgstr "Escolha a cor para as assinaturas"
 
 #. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
 #. versions of the same text file
@@ -17330,7 +17333,7 @@ msgstr "Mensagens de patch e anexos"
 #: src/prefs_msg_colors.c:324
 msgctxt "Tooltip"
 msgid "Pick color for inserted lines"
-msgstr "Selecione a cor para linhas inseridas"
+msgstr "Escolha a cor para linhas inseridas"
 
 #: src/prefs_msg_colors.c:326
 msgid "Inserted lines"
@@ -17339,7 +17342,7 @@ msgstr "Linhas inseridas"
 #: src/prefs_msg_colors.c:333
 msgctxt "Tooltip"
 msgid "Pick color for removed lines"
-msgstr "Selecione a cor para as linhas removidas"
+msgstr "Escolha a cor para linhas removidas"
 
 #: src/prefs_msg_colors.c:336
 msgid "Removed lines"
@@ -17349,7 +17352,7 @@ msgstr "Linhas removidas"
 #: src/prefs_msg_colors.c:344
 msgctxt "Tooltip"
 msgid "Pick color for hunk lines"
-msgstr "Selecione a cor para as linhas de diferenças"
+msgstr "Escolha a cor para as linhas com as diferenças"
 
 #. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
 #: src/prefs_msg_colors.c:348
@@ -17366,9 +17369,9 @@ msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Selecione a cor para a pasta de destino. A pasta de destino é utilizada "
-"quando a opção 'Executar imediatamente ao mover ou excluir mensagens' está "
-"desativada"
+"Escolha a cor para a pasta de destino. A pasta de destino é utilizada quando"
+" a "
+"opção 'Executar imediatamente ao mover ou excluir mensagens' está desativada"
 
 #: src/prefs_msg_colors.c:362
 msgid "Target folder"
@@ -17377,7 +17380,7 @@ msgstr "Pasta de destino"
 #: src/prefs_msg_colors.c:369
 msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
-msgstr "Selecione a cor para as pastas que contenham novas mensagens"
+msgstr "Escolha a cor para as pastas que contenham novas mensagens"
 
 #: src/prefs_msg_colors.c:373
 msgid "Folder containing new messages"
@@ -17436,7 +17439,7 @@ msgstr "Seleção de cor para os links"
 #: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
-msgstr "Seleção de cor para pasta de destino"
+msgstr "Seleção de cor para pasta de destino."
 
 #: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
@@ -17446,22 +17449,22 @@ msgstr "Seleção de cor para as assinaturas"
 #: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for folder"
-msgstr "Seleção de cor para as pastas"
+msgstr "Seleção de cor para a pasta"
 
 #: src/prefs_msg_colors.c:549
 msgctxt "Dialog title"
 msgid "Pick color for inserted lines"
-msgstr "Seleção de cor para as linhas inseridas"
+msgstr "Seleção de cor para linhas inseridas"
 
 #: src/prefs_msg_colors.c:551
 msgctxt "Dialog title"
 msgid "Pick color for removed lines"
-msgstr "Seleção de cor para as linhas removidas"
+msgstr "Seleção de cor para linhas removidas"
 
 #: src/prefs_msg_colors.c:553
 msgctxt "Dialog title"
 msgid "Pick color for hunk lines"
-msgstr "Seleção de cor para as linhas de diferenças"
+msgstr "Seleção de cor para as linhas com as diferenças"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
@@ -17521,7 +17524,7 @@ msgstr "Habilitar atalhos do teclado"
 
 #: src/prefs_other.c:521
 msgid "Enable customisable keyboard shortcuts"
-msgstr "Habilitar a personalização de atalhos do teclado"
+msgstr "Habilitar atalhos de teclado personalizáveis"
 
 #: src/prefs_other.c:524
 msgid ""
@@ -17529,10 +17532,10 @@ msgid ""
 "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 ""
-"Se marcado, permite que você altere os atalhos de teclado da maioria dos "
-"itens do menu, parando o ponteiro do mouse sobre o item e pressionando uma "
-"combinação de teclas.\n"
-"Desmarque essa opção caso você deseje travar todos os atalhos de teclado."
+"Se marcada, permite que você altere os atalhos de teclado da maioria dos "
+"itens dos menu, indicando o item e pressionando a combinação de teclas.\n"
+"Desmarque essa opção caso você queira travar todos os atalhos de teclado "
+"existentes."
 
 #: src/prefs_other.c:531
 msgid " Choose preset keyboard shortcuts... "
@@ -17610,25 +17613,25 @@ msgid "Synchronise offline folders as soon as possible"
 msgstr "Sincronize as pastas off-line assim que possível"
 
 #: src/prefs_other.c:615
-msgid "Primary passphrase"
-msgstr "Senha primária"
+msgid "Master passphrase"
+msgstr "Senha mestra"
 
 #: src/prefs_other.c:618
-msgid "Use a primary passphrase"
-msgstr "Usar uma senha primária"
+msgid "Use a master passphrase"
+msgstr "Usar uma senha mestra"
 
 #: src/prefs_other.c:621
 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."
+"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."
 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 marcada, as senhas salvas das suas contas serão protegidas por uma "
+"senha mestra. Caso não exista uma senha mestra, você será solicitado a "
+"definir uma."
 
 #: src/prefs_other.c:626
-msgid "Change primary passphrase"
-msgstr "Alterar a senha primária"
+msgid "Change master passphrase"
+msgstr "Alterar a senha mestra"
 
 #: src/prefs_other.c:816
 msgid "Miscellaneous"
@@ -18040,8 +18043,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"
@@ -18554,11 +18557,11 @@ msgstr ""
 
 #: src/prefs_toolbar.c:188
 msgid "Item has no icon defined."
-msgstr "O item não possui ícone definido."
+msgstr "O item não tem ícone definido."
 
 #: src/prefs_toolbar.c:189
 msgid "Item has no text defined."
-msgstr "O item não possui texto definido."
+msgstr "O item não tem texto definido."
 
 #: src/prefs_toolbar.c:897
 msgid "Toolbar item"
@@ -18594,7 +18597,7 @@ msgstr "Ícone"
 
 #: src/prefs_toolbar.c:1011
 msgid "A_dd"
-msgstr "_Adicionar"
+msgstr "A_dicionar"
 
 #: src/prefs_toolbar.c:1231 src/prefs_toolbar.c:1245 src/prefs_toolbar.c:1259
 msgid "Toolbars"
@@ -20464,3 +20467,73 @@ msgid ""
 msgstr ""
 "O Claws Mail está pronto.\n"
 "Clique em Salvar para iniciar."
+
+#~ msgid "_New"
+#~ msgstr "_Nova"
+
+#~ msgid "_Down"
+#~ msgstr "_Baixo"
+
+#~ msgid "_Up"
+#~ msgstr "_Cima"
+
+#~ msgid "_Execute"
+#~ msgstr "E_xecutar"
+
+#~ msgid "_Stop"
+#~ msgstr "_Parar"
+
+#~ msgid "_Yes"
+#~ msgstr "_Sim"
+
+#~ msgid "_Add"
+#~ msgstr "_Adicionar"
+
+#~ msgid "_Previous"
+#~ msgstr "_Anterior"
+
+#~ msgid "_Next"
+#~ msgstr "_Próxima"
+
+#~ msgid "_Refresh"
+#~ msgstr "A_tualizar"
+
+#~ msgid "_Apply"
+#~ msgstr "_Aplicar"
+
+#~ msgid "_Quit"
+#~ msgstr "_Sair"
+
+#~ msgid "Find and _Replace"
+#~ msgstr "Procurar e _substituir"
+
+#~ msgid "_Rename"
+#~ msgstr "_Renomear"
+
+#, 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?"
+
+#~ msgid "_Top"
+#~ msgstr "_Início"
+
+#~ msgid "_Bottom"
+#~ msgstr "_Final"
+
+#~ msgid "Primary passphrase"
+#~ msgstr "Senha primária"
+
+#~ msgid "Open in browser"
+#~ msgstr "Abrir no navegador"
+
+#~ msgid "File:"
+#~ msgstr "Arquivo:"
diff --git a/po/ru.po b/po/ru.po
index bf2770a88..8e929232a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.18.0\n"
+"Project-Id-Version: Claws Mail 3.19.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-03-27 09:43+0100\n"
-"PO-Revision-Date: 2022-03-27 18:06+0300\n"
+"POT-Creation-Date: 2022-10-11 10:32+0100\n"
+"PO-Revision-Date: 2022-10-12 23:57+0300\n"
 "Last-Translator: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language-Team: Mikhail Kurinnoi <viewizard at viewizard.com>\n"
 "Language: ru\n"
@@ -123,13 +123,13 @@ msgstr "'Получить Почту' проверяет письма в ука
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1851
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:385
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
 #: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
 #: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "Имя"
 
-#: src/account.c:1637 src/prefs_account.c:1271 src/prefs_account.c:5015
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -188,10 +188,10 @@ msgstr ""
 #: src/compose.c:9783 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 "Неизвестная ошибка"
 
@@ -392,7 +392,7 @@ msgid "Duplicate email addresses"
 msgstr "Дублирующиеся почтовые адреса"
 
 #: src/addrduplicates.c:443 src/addressadd.c:235
-#: 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 "Адрес"
@@ -453,12 +453,12 @@ msgid "_Book"
 msgstr "_Книга"
 
 #: src/addressbook.c:401 src/addressbook.c:431 src/addressbook.c:456
-#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:524
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
 #: src/messageview.c:213 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Правка"
 
-#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:527
+#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:525
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Сервис"
@@ -513,7 +513,7 @@ msgid "C_ut"
 msgstr "В_ырезать"
 
 #: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
-#: src/compose.c:649 src/mainwindow.c:558 src/messageview.c:229
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Копировать"
@@ -572,7 +572,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:411
 #: src/plugins/vcalendar/month-view.c:427 src/prefs_themes.c:917
 #: src/prefs_themes.c:949 src/prefs_themes.c:950
@@ -729,7 +729,7 @@ msgstr ""
 "адреса будут перемещены в родительскую папку."
 
 #: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -841,7 +841,7 @@ msgid "Person"
 msgstr "Контакт"
 
 #: src/addressbook.c:5019 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3470 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Папка"
 
@@ -965,18 +965,18 @@ msgstr "Обновить адрес(а)"
 msgid "Update failed. Changes not written to Directory."
 msgstr "Ошибка обновления. Изменения не записаны в Каталог."
 
-#: src/alertpanel.c:141 src/compose.c:9857
+#: src/alertpanel.c:141 src/compose.c:9866 src/mimeview.c:1836
 msgid "Notice"
 msgstr "Уведомление"
 
 #: src/alertpanel.c:154 src/compose.c:5895 src/compose.c:6444
-#: src/compose.c:12266 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:863 src/plugins/pgpcore/sgpgme.c:1000
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:731
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Ошибка"
@@ -1092,63 +1092,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"
@@ -1493,7 +1493,7 @@ msgstr "_Удалить"
 msgid "_Properties..."
 msgstr "_Свойства..."
 
-#: src/compose.c:619 src/mainwindow.c:526 src/messageview.c:215
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "_Сообщение"
 
@@ -1505,7 +1505,7 @@ msgstr "_Орфография"
 msgid "_Options"
 msgstr "_Параметры"
 
-#: src/compose.c:626 src/mainwindow.c:529 src/messageview.c:217
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "_Справка"
 
@@ -1565,7 +1565,7 @@ msgstr "_С переносами"
 msgid "_Unwrapped"
 msgstr "_Без переносов"
 
-#: src/compose.c:657 src/mainwindow.c:559
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Выделить _всё"
@@ -1675,47 +1675,47 @@ msgstr "Система _Конфиденциальности"
 msgid "_Priority"
 msgstr "_Приоритет"
 
-#: src/compose.c:703 src/mainwindow.c:621 src/messageview.c:268
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Кодировка _символов"
 
-#: src/compose.c:708 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:273
 msgid "Western European"
 msgstr "Западно-европейская"
 
-#: src/compose.c:709 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Балтийская"
 
-#: src/compose.c:710 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: src/compose.c:711 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Арабская"
 
-#: src/compose.c:712 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:712 src/mainwindow.c:628 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Кириллица"
 
-#: src/compose.c:713 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:713 src/mainwindow.c:629 src/messageview.c:278
 msgid "Japanese"
 msgstr "Японская"
 
-#: src/compose.c:714 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Китайская"
 
-#: src/compose.c:715 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Корейская"
 
-#: src/compose.c:716 src/mainwindow.c:634 src/messageview.c:281
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Тайская"
 
-#: src/compose.c:719 src/mainwindow.c:744 src/messageview.c:317
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Адресная книга"
 
@@ -1723,11 +1723,11 @@ msgstr "_Адресная книга"
 msgid "_Template"
 msgstr "_Шаблон"
 
-#: src/compose.c:723 src/mainwindow.c:774 src/messageview.c:339
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Дейст_вия"
 
-#: src/compose.c:727 src/mainwindow.c:828 src/messageview.c:343
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "_О Claws Mail"
 
@@ -1763,12 +1763,12 @@ msgstr "Показать _линейку"
 msgid "_Normal"
 msgstr "_Обычный режим"
 
-#: src/compose.c:744 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_All"
 msgstr "_Всем"
 
-#: src/compose.c:745 src/mainwindow.c:676 src/messageview.c:307
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
 #: src/summaryview.c:435
 msgid "_Sender"
 msgstr "_Отправителю"
@@ -1793,27 +1793,27 @@ msgstr "Низ_кий"
 msgid "_Lowest"
 msgstr "_Самый низкий"
 
-#: src/compose.c:760 src/mainwindow.c:893 src/messageview.c:356
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Автоматически"
 
-#: src/compose.c:761 src/mainwindow.c:894 src/messageview.c:357
+#: src/compose.c:761 src/mainwindow.c:892 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7бит ASCII (US-ASCII)"
 
-#: src/compose.c:762 src/mainwindow.c:895 src/messageview.c:358
+#: src/compose.c:762 src/mainwindow.c:893 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Юникод (_UTF-8)"
 
-#: src/compose.c:766 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:766 src/mainwindow.c:897 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Центрально-европейская (ISO-8859-2)"
 
-#: src/compose.c:769 src/mainwindow.c:902 src/messageview.c:365
+#: src/compose.c:769 src/mainwindow.c:900 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/compose.c:774 src/mainwindow.c:907 src/messageview.c:370
+#: src/compose.c:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Турецкая (ISO-8859-9)"
 
@@ -1937,7 +1937,7 @@ msgstr "Вы собираетесь вставить файл размером %
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
-#: src/compose.c:3717 src/compose.c:10846 src/compose.c:11746
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "_Вставить"
 
@@ -1997,7 +1997,7 @@ msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "По умолчанию задан только адрес '%s'. Всё равно отправить?"
 
 #: src/compose.c:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
-#: src/prefs_account.c:4130 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Отправить"
 
@@ -2164,7 +2164,7 @@ msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 "Файл %s, который вы вложили в сообщение, больше не существует. Игнорировать?"
 
-#: src/compose.c:6445 src/mainwindow.c:666 src/toolbar.c:280 src/toolbar.c:2604
+#: src/compose.c:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Отменить отправку"
 
@@ -2193,9 +2193,11 @@ msgstr "Использовать <Tab> для автозавершения из
 msgid "Mime type"
 msgstr "Mime тип"
 
-#: src/compose.c:7517 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:473
+#: src/compose.c:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Размер"
 
@@ -2324,11 +2326,11 @@ msgstr "Связь через сокет с внешним редактором
 #: src/compose.c:9742
 #, 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"
 
@@ -2337,29 +2339,39 @@ msgstr ""
 msgid "External editor stopped with an error: %s"
 msgstr "Внешний редактор остановлен с ошибкой: %s"
 
-#: src/compose.c:9854
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "идентификатор процесса: %"
+
+#: src/compose.c:9858
+#, c-format
+msgid "process id: %d"
+msgstr "идентификатор процесса: %d"
+
+#: src/compose.c:9863
+#, 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:10260 src/messageview.c:1095
+#: src/compose.c:10273 src/messageview.c:1095
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail требуется доступ к сети для отправки письма."
 
-#: src/compose.c:10463
+#: src/compose.c:10476
 msgid "Could not save draft."
 msgstr "Не удалось сохранить черновик."
 
-#: src/compose.c:10467
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "Не удалось сохранить черновик"
 
-#: src/compose.c:10468
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2367,24 +2379,24 @@ msgstr ""
 "Не удалось сохранить черновик.\n"
 "Отказаться от написанного сообщения?"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "_Отменить выход"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "_Отказаться от письма"
 
-#: src/compose.c:10658 src/compose.c:10672
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:10686
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Файл '%s' не может быть прочитан."
 
-#: src/compose.c:10688
+#: src/compose.c:10704
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2393,50 +2405,50 @@ msgstr ""
 "Файл '%s' содержал неверные символы\n"
 "для текущей кодировки, вставка может быть неправильной."
 
-#: src/compose.c:10765
+#: src/compose.c:10781
 msgid "Discard message"
 msgstr "Отказаться от сообщения"
 
-#: src/compose.c:10766
+#: src/compose.c:10782
 msgid "This message has been modified. Discard it?"
 msgstr "Это сообщение было изменено. Отказаться от него?"
 
-#: src/compose.c:10767 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Отказаться"
 
-#: src/compose.c:10767 src/compose.c:10772
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "_Сохранить в Черновики"
 
-#: src/compose.c:10770 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: src/compose.c:10771
+#: src/compose.c:10787
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Это сообщение было изменено. Сохранить изменения?"
 
-#: src/compose.c:10772
+#: src/compose.c:10788
 msgid "_Don't save"
 msgstr "_Не сохранять"
 
-#: src/compose.c:10843
+#: src/compose.c:10859
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Вы хотите применить шаблон '%s' ?"
 
-#: src/compose.c:10845
+#: src/compose.c:10861
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:10846 src/prefs_actions.c:333 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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:1019
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: src/compose.c:10922
+#: src/compose.c:10938
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2445,7 +2457,7 @@ msgstr ""
 "Размер вставляемого текста превышает ограничение (%dКБ) для вставки.\n"
 "Вместо этого прикрепите как файл."
 
-#: src/compose.c:11739
+#: src/compose.c:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2463,20 +2475,20 @@ msgstr[2] ""
 "Вы хотите вставить содержимое %d файлов в тело сообщения или вложить "
 "(прикрепить) в письмо?"
 
-#: src/compose.c:11745
+#: src/compose.c:11761
 msgid "Insert or attach?"
 msgstr "Вставить или вложить?"
 
-#: src/compose.c:11746
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "_Вложить"
 
-#: src/compose.c:11964
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Неверный формат цитирования в строке %d."
 
-#: src/compose.c:12260
+#: src/compose.c:12276
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2694,7 +2706,7 @@ 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:2478
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Файл"
@@ -2778,13 +2790,13 @@ msgstr "Добавить Новый Элемент JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Правка LDAP - Выбрать Базу Поиска"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3230
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3268
 #: 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:3237
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Порт"
@@ -2845,7 +2857,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:4221
+#: src/editldap.c:470 src/prefs_account.c:4277
 msgid "TLS"
 msgstr "TLS"
 
@@ -3009,8 +3021,8 @@ msgstr "Пароль"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Пароль используется при соединении \"Привязка DN\" пользователя."
 
-#: src/editldap.c:739 src/prefs_account.c:1477 src/prefs_account.c:2108
-#: src/prefs_account.c:3042 src/prefs_account.c:3070 src/prefs_account.c:3275
+#: src/editldap.c:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
 #: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Показать пароль"
@@ -3033,7 +3045,7 @@ msgid ""
 msgstr ""
 "Максимальное число записей, которые должны возвращаться в результат поиска."
 
-#: src/editldap.c:793 src/prefs_account.c:4094
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Основные"
 
@@ -3121,11 +3133,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"
 
@@ -3189,9 +3201,9 @@ msgid "Stylesheet"
 msgstr "Таблица стилей"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
-#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1184
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
 #: src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
 #: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 msgid "None"
 msgstr "Никакой"
@@ -3202,7 +3214,7 @@ msgstr "Никакой"
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Полное"
@@ -3431,7 +3443,7 @@ msgstr "Экспорт Адресной Книги в LDIF Файл"
 msgid "Distinguished Name"
 msgstr "Характерное Имя"
 
-#: src/export.c:113 src/summaryview.c:8508
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "Экспорт в mbox файл"
 
@@ -3514,11 +3526,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 "
@@ -3527,13 +3547,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"
@@ -3541,7 +3561,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 "
@@ -3550,117 +3570,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, 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"
+"правило не относится к учётной записи, но все правила в любом случае "
+"применяются по запросу пользователя\n"
+
+#: src/filtering.c:665
+msgid ""
+"rule is account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+"правило не относится к учётной записи, но все правила в любом случае "
+"применяются по запросу пользователя\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:670
+#: 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: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"
@@ -3677,11 +3709,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"
@@ -3763,17 +3795,17 @@ msgstr "Наследовать свойства и правила обработ
 
 #: src/foldersel.c:585 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:302
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:239
-#: src/plugins/vcalendar/vcal_folder.c:2103
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' не может быть включено в имя папки."
 
 #: src/foldersel.c:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:251
-#: src/plugins/vcalendar/vcal_folder.c:2110
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Папка '%s' уже существует."
@@ -3805,7 +3837,7 @@ msgstr "Рекурсивно пометить все как непрочтённ
 msgid "R_un processing rules"
 msgstr "Зап_устить обработку"
 
-#: src/folderview.c:254 src/mainwindow.c:563
+#: src/folderview.c:254 src/mainwindow.c:561
 msgid "_Search folder..."
 msgstr "_Поиск в папке..."
 
@@ -3858,11 +3890,11 @@ msgstr "Пометить все как прочтённые"
 
 #: src/folderview.c:870
 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:872 src/summaryview.c:4293
 msgid "Do you really want to mark all mails in this folder as read?"
@@ -3874,22 +3906,22 @@ msgstr "Пометить все как непрочтённые"
 
 #: src/folderview.c:876
 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:878 src/summaryview.c:4339
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "Действительно пометить все сообщения в данной папке как непрочтённые?"
 
-#: src/folderview.c:1074 src/imap.c:4693
+#: src/folderview.c:1074 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Сканирование папки %s/%s..."
 
-#: src/folderview.c:1077 src/imap.c:4697 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Сканирование папки %s..."
@@ -3934,7 +3966,7 @@ msgstr "Открывается папка %s..."
 msgid "Folder could not be opened."
 msgstr "Папка не может быть открыта."
 
-#: src/folderview.c:2493 src/mainwindow.c:2901 src/mainwindow.c:2906
+#: src/folderview.c:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Очистить корзину"
 
@@ -3946,7 +3978,7 @@ msgstr "Удалить все сообщения в корзине?"
 msgid "_Empty trash"
 msgstr "_Очистить корзину"
 
-#: src/folderview.c:2539 src/inc.c:1669 src/toolbar.c:3085
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Автономная работа"
 
@@ -4060,7 +4092,7 @@ msgstr "Имя группы новостей"
 msgid "Messages"
 msgstr "Сообщения"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Тип"
 
@@ -4089,7 +4121,7 @@ msgstr "Готово."
 #: src/grouplistdialog.c:494
 #, c-format
 msgid "%d newsgroups received (%s read)"
-msgstr "%d групп новостей получено (%s прочтено)"
+msgstr "%d групп новостей получено (%s прочитано)"
 
 #: src/gtk/about.c:134
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
@@ -4115,7 +4147,7 @@ msgstr ""
 "GPL. Если Вы хотите оказать безвозмездную помощь проекту Claws Mail, Вы "
 "можете сделать это на:"
 
-#: src/gtk/about.c:164 src/gtk/about.c:857
+#: src/gtk/about.c:164 src/gtk/about.c:866
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4204,46 +4236,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "поддержка шифрования соединения с сервером\n"
 
 #: src/gtk/about.c:461
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr "поддержка адресов IPv6, нового протокола адресации Интернета\n"
-
-#: src/gtk/about.c:472
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "поддержка преобразования текста между различными кодировками\n"
 
-#: src/gtk/about.c:482
+#: src/gtk/about.c:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "добавляет поддержку адресов IPv6\n"
+
+#: src/gtk/about.c:481
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "поддержка адресных книг PalmOS\n"
 
-#: src/gtk/about.c:492
+#: src/gtk/about.c:491
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "поддержка адресных книг LDAP\n"
 
-#: src/gtk/about.c:502
+#: src/gtk/about.c:501
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "поддержка серверов IMAP и NNTP\n"
 
-#: src/gtk/about.c:512
+#: src/gtk/about.c:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "добавлена поддержка SVG тем\n"
+
+#: src/gtk/about.c:521
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "поддержка сессий\n"
 
-#: src/gtk/about.c:522
+#: src/gtk/about.c:531
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "поддержка изменений в состоянии сетевых подключений\n"
 
-#: src/gtk/about.c:532
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "добавлена поддержка SVG тем\n"
+#: src/gtk/about.c:541
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "добавлена поддержка аутентификации OAuth2\n"
 
-#: src/gtk/about.c:564
+#: src/gtk/about.c:573
 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 "
@@ -4254,7 +4291,7 @@ msgstr ""
 "опубликованной Free Software Foundation версии 3 либо (на ваш выбор) более "
 "поздней версии."
 
-#: src/gtk/about.c:571
+#: src/gtk/about.c:580
 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 "
@@ -4267,7 +4304,7 @@ msgstr ""
 "получения более подробной информации ознакомьтесь с GNU General Public "
 "License."
 
-#: src/gtk/about.c:590
+#: src/gtk/about.c:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4275,73 +4312,73 @@ msgstr ""
 "Вместе с данной программой вы должны были получить экземпляр GNU General "
 "Public License. Если нет, смотрите "
 
-#: src/gtk/about.c:723 src/main.c:2749
+#: src/gtk/about.c:732 src/main.c:2749
 msgid "Session statistics\n"
 msgstr "Статистика по сессиям\n"
 
-#: src/gtk/about.c:733 src/gtk/about.c:736 src/main.c:2759 src/main.c:2762
+#: src/gtk/about.c:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Начало: %s\n"
 
-#: src/gtk/about.c:743 src/main.c:2768
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Входящий трафик\n"
 
-#: src/gtk/about.c:746 src/main.c:2771
+#: src/gtk/about.c:755 src/main.c:2771
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Полученные сообщения: %d\n"
 
-#: src/gtk/about.c:753 src/main.c:2777
+#: src/gtk/about.c:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Исходящий трафик\n"
 
-#: src/gtk/about.c:756 src/main.c:2780
+#: src/gtk/about.c:765 src/main.c:2780
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Новые/переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2784
+#: src/gtk/about.c:770 src/main.c:2784
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Сообщений-ответов: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2788
+#: src/gtk/about.c:775 src/main.c:2788
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Переадресованные сообщения: %d\n"
 
-#: src/gtk/about.c:771 src/main.c:2792
+#: src/gtk/about.c:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Всего исходящих сообщений: %d\n"
 
-#: src/gtk/about.c:798
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "О программе Claws Mail"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "_Информация"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Авторы"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Features"
 msgstr "_Возможности"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Лицензия"
 
-#: src/gtk/about.c:897
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "_О релизе"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "_Статистика"
 
@@ -4815,7 +4852,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1268
 msgid "Organization"
 msgstr "Организация"
 
@@ -4949,7 +4986,7 @@ msgstr "Новое сообщение"
 
 #: src/gtk/icon_legend.c:68
 msgid "Unread message"
-msgstr "Сообщение ещё не было прочтено"
+msgstr "Сообщение ещё не было прочитано"
 
 #: src/gtk/icon_legend.c:69
 msgid "Message has been replied to"
@@ -5028,8 +5065,8 @@ msgid "Folder contains marked messages"
 msgstr "Папка содержит помеченные сообщения"
 
 #: src/gtk/icon_legend.c:92
-msgid "IMAP folder which contains sub-folders only"
-msgstr "Только папки IMAP с подпапками"
+msgid "IMAP folder which contains subfolders only"
+msgstr "Папка IMAP, содержащая только подпапки"
 
 #: src/gtk/icon_legend.c:93
 msgid "IMAP mailbox showing only subscribed folders"
@@ -5193,15 +5230,15 @@ msgstr "Загруженные модули"
 msgid "Page Index"
 msgstr "Список"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:856
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 msgid "_Hide"
 msgstr "_Скрыть"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4093 src/prefs_account.c:4111 src/prefs_account.c:4129
 #: src/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
-#: src/prefs_account.c:4201 src/prefs_account.c:4220 src/prefs_account.c:4303
-#: src/prefs_account.c:4321 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Учётная запись"
@@ -5653,8 +5690,7 @@ msgstr "(Нет поля 'Тема')"
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: src/image_viewer.c:313 src/mimeview.c:2564
-#: src/plugins/att_remover/att_remover.c:305
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Имя файла:"
@@ -5667,195 +5703,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"
@@ -5867,7 +5903,7 @@ msgstr ""
 "CRAM-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен CRAM-MD5 SASL модуль."
 
-#: src/imap.c:974
+#: src/imap.c:984
 msgid ""
 "\n"
 "\n"
@@ -5879,7 +5915,7 @@ msgstr ""
 "DIGEST-MD5 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен DIGEST-MD5 SASL модуль."
 
-#: src/imap.c:980
+#: src/imap.c:990
 msgid ""
 "\n"
 "\n"
@@ -5891,7 +5927,7 @@ msgstr ""
 "SCRAM-SHA-1 логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен SCRAM SASL модуль."
 
-#: src/imap.c:986
+#: src/imap.c:996
 msgid ""
 "\n"
 "\n"
@@ -5903,7 +5939,7 @@ msgstr ""
 "PLAIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен PLAIN SASL модуль."
 
-#: src/imap.c:992
+#: src/imap.c:1002
 msgid ""
 "\n"
 "\n"
@@ -5915,7 +5951,7 @@ msgstr ""
 "LOGIN логин работает только, если libetpan собран с поддержкой SASL и "
 "установлен LOGIN SASL модуль."
 
-#: src/imap.c:998
+#: src/imap.c:1008
 msgid ""
 "\n"
 "\n"
@@ -5925,36 +5961,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:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:884 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Незащищенное подключение"
 
-#: src/imap.c:1177 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:885 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"
@@ -5967,108 +6003,108 @@ msgstr ""
 "\n"
 "Продолжить подключение к серверу? Соединение не будет безопасным."
 
-#: src/imap.c:1183 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:891 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 "
@@ -6077,20 +6113,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"
@@ -6140,7 +6176,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 "_Отписаться..."
 
@@ -6172,21 +6208,21 @@ msgstr ""
 "а не писем, то добавьте '/' в конце имени)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:233
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, 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/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
 #: src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/vcalendar/vcal_folder.c:2094
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:257
-#: src/plugins/vcalendar/vcal_folder.c:2116
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6194,32 +6230,33 @@ 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:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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:190
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:330
+#: 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' будут удалены. Восстановление будет "
-"невозможно.\n"
+"Все папки и сообщения ниже '%s' будут удалены.\n"
+"Восстановление будет невозможно.\n"
 "\n"
 "Действительно хотите удалить папку?"
 
-#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:209
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не удалось удалить папку '%s'."
@@ -6246,7 +6283,7 @@ msgstr "_Поиск"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Выберите подпапку %s для подписки: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:690
+#: src/imap_gtk.c:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -6482,32 +6519,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)"
@@ -6515,28 +6552,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:407 src/prefs_summaries.c:647
+#: src/inc.c:727 src/prefs_matcher.c:407 src/prefs_summaries.c:647
 #: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 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)"
@@ -6544,66 +6581,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:865
+#: src/inc.c:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:894
+#: src/inc.c:897
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Учётная запись '%s': Соединение с POP3 сервером: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:931
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не удалось соединиться с POP3 сервером: %s:%d"
 
-#: src/inc.c:932
+#: src/inc.c:935
 #, 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:426
-#: src/send_message.c:519
+#: src/inc.c:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:1014
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Получение сообщений с %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1035
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:1064
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1080
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6611,16 +6648,16 @@ msgstr[0] "Получение (%d сообщение (%s) получено)"
 msgstr[1] "Получение (%d сообщения (%s) получено)"
 msgstr[2] "Получение (%d сообщений (%s) получено)"
 
-#: src/inc.c:1232
+#: src/inc.c:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Соединение с %s:%d прошло неудачно."
 
-#: src/inc.c:1237
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "Ошибка при обработки почты."
 
-#: src/inc.c:1243
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6629,37 +6666,37 @@ msgstr ""
 "Ошибка при обработки почты:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "Недостаточно места на диске."
 
-#: src/inc.c:1254
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "Не удалось записать в файл."
 
-#: src/inc.c:1259
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
-#: src/inc.c:1262
+#: src/inc.c:1265
 #, 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:1270 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:1273
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Соединение с %s:%d прервано удалённым узлом."
 
-#: src/inc.c:1275
+#: src/inc.c:1278
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик заблокирован."
 
-#: src/inc.c:1279
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6668,11 +6705,11 @@ msgstr ""
 "Почтовый ящик заблокирован:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6681,7 +6718,7 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1299 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6689,48 +6726,48 @@ msgstr ""
 "Превышено время ожидания. Вы можете попробовать исправить эту проблему, "
 "увеличив время ожидания в /Настройки/Параметры/Другие/Разное."
 
-#: src/inc.c:1301
+#: src/inc.c:1304
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Соединение с %s:%d прошло неудачно."
 
-#: src/inc.c:1339
+#: src/inc.c:1342
 msgid "Incorporation cancelled\n"
 msgstr "Слияние отменено\n"
 
-#: src/inc.c:1634 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
 #: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr "секунд"
 
-#: src/inc.c:1644 src/inc.c:1654
+#: src/inc.c:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
 msgstr[1] "минуты"
 msgstr[2] "минут"
 
-#: src/inc.c:1647
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часа"
 msgstr[2] "часов"
 
-#: src/inc.c:1659
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr "%s%sВы работаете автономно. Отменить это на %d %s?"
 
-#: src/inc.c:1665
+#: src/inc.c:1668
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sВы работаете автономно. Отменить?"
 
-#: src/inc.c:1672
+#: src/inc.c:1675
 msgid "On_ly once"
 msgstr "Одн_ократно"
 
@@ -7156,830 +7193,830 @@ msgstr "NetworkManager: сеть доступна.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: сеть недоступна.\n"
 
-#: src/mainwindow.c:523 src/messageview.c:212
+#: src/mainwindow.c:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Файл"
 
-#: src/mainwindow.c:525 src/messageview.c:214 src/summaryview.c:448
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "_Вид"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "_Настройки"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "_Добавить почтовый ящик"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "В формате MH..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Изменить порядок папок..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "_Импортировать mbox-файл..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "_Экспорт в mbox..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "_Экспорт выбранных сообщений в mbox..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
 msgstr "Очистить все _Корзины"
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Сохранить сообщение как..."
 
-#: src/mainwindow.c:547 src/messageview.c:222
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Сохранить часть как..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Параметры страницы..."
 
-#: src/mainwindow.c:551 src/messageview.c:224
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "Синхронизировать папки"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "В_ыход"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "Выделить _цепочку"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "_Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "_Быстрый поиск"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "Показывать или ск_рывать"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "_Панель инструментов"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Отображаемые _столбцы"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "В _списке папок..."
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "В _списке сообщений..."
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "Ра_сположение"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "_Сортировка"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "_Сгруппировать по теме"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "Р_азвернуть все цепочки"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "Св_ернуть все цепочки"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Перейти к"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Предыдущему сообщению"
 
-#: src/mainwindow.c:588 src/messageview.c:237
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Следующему сообщению"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:588 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "П_редыдущему непрочтённому сообщению"
 
-#: src/mainwindow.c:591 src/messageview.c:240
+#: src/mainwindow.c:589 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Сле_дующему непрочтённому сообщению"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:591 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Предыдущему но_вому сообщению"
 
-#: src/mainwindow.c:594 src/messageview.c:243
+#: src/mainwindow.c:592 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Сл_едующему новому сообщению"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:594 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Предыдущему _помеченному сообщению"
 
-#: src/mainwindow.c:597 src/messageview.c:246
+#: src/mainwindow.c:595 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Следующему п_омеченному сообщению"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:597 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Предыдущему с _цветной меткой"
 
-#: src/mainwindow.c:600 src/messageview.c:249
+#: src/mainwindow.c:598 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Следующему с цв_етной меткой"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:600
 msgid "Previously opened message"
 msgstr "Предыдущее открытое сообщение"
 
-#: src/mainwindow.c:603 src/messageview.c:252
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Следующее открытое сообщение"
 
-#: src/mainwindow.c:605 src/messageview.c:254
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Сообщению на уровень выше"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:605 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Следующей непрочтённой _папке"
 
-#: src/mainwindow.c:608 src/messageview.c:257
+#: src/mainwindow.c:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "П_апка..."
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:608 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Следующая часть"
 
-#: src/mainwindow.c:611 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:609 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Предыдущая часть"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Прокрутка сообщения"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Предыдущая строка"
 
-#: src/mainwindow.c:616 src/messageview.c:263
+#: src/mainwindow.c:614 src/messageview.c:263
 msgid "Next line"
 msgstr "Следующая строка"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:476
+#: src/mainwindow.c:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: src/mainwindow.c:618 src/messageview.c:265 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: src/mainwindow.c:636 src/messageview.c:283
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Декодировать"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:641
 msgid "Open in new _window"
 msgstr "Открыть в новом окне"
 
-#: src/mainwindow.c:644 src/messageview.c:290
+#: src/mainwindow.c:642 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Исхо_дный текст сообщения"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "Часть сообщения"
 
-#: src/mainwindow.c:647 src/messageview.c:292
+#: src/mainwindow.c:645 src/messageview.c:292
 msgid "View as text"
 msgstr "Показать как текст"
 
-#: src/mainwindow.c:648 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Открыть"
 
-#: src/mainwindow.c:650 src/messageview.c:295
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "Открыть с помощью..."
 
-#: src/mainwindow.c:654 src/messageview.c:298
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Цитирование"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "_Обновить сводку"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "Получ_ить"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "Получить для _текущей учётной записи"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "Получить для _всех учётных записей"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "Отменить получени_е"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "_Отправить сообщения из очереди"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "Составить по_чтовое сообщение"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:669
 msgid "Compose a news message"
 msgstr "Составить сообщение новостей"
 
-#: src/mainwindow.c:673 src/messageview.c:304
+#: src/mainwindow.c:671 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: src/mainwindow.c:674 src/messageview.c:305 src/summaryview.c:433
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
 msgstr "Отве_тить"
 
-#: src/mainwindow.c:677 src/messageview.c:308 src/summaryview.c:436
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
 msgstr "Список _рассылки"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:676
 msgid "Follow-up and reply to"
 msgstr "Дополнить и ответить"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:679 src/messageview.c:311 src/summaryview.c:438
 #: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "_Переслать"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
 #: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr "Пер_еслать как вложение"
 
-#: src/mainwindow.c:683 src/messageview.c:313 src/summaryview.c:440
+#: src/mainwindow.c:681 src/messageview.c:313 src/summaryview.c:440
 #: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "Перенаправи_ть"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
 msgstr "Список _Рассылки"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Написать"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "Справка"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "View archive"
 msgstr "Смотреть архив"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Contact owner"
 msgstr "Связаться с владельцем"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "П_ереместить..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:700
 msgid "Move to _trash"
 msgstr "Переместить в _корзину"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "_Удалить..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
 msgstr "Переместить цепочку в ко_рзину"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "Удалить ц_епочку"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Отменить сообщение новостей"
 
-#: src/mainwindow.c:709 src/mainwindow.c:710 src/summaryview.c:441
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "_Пометить"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "_Снять пометку"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "Пометить как прочтё_нное"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "Пометить как непрочт_ённое"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Пометить в папке все как прочтённые"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:716
 msgid "Mark all unread in folder"
 msgstr "Пометить в папке все как непрочтённые"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Игнорировать цепочку"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Unignore thread"
 msgstr "Перестать игнорировать цепочку"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Следить за цепочкой"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Перестать отслеживать цепочку"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "Пометить как _спам"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:725
 msgid "Mark as _ham"
 msgstr "Пометить как _не спам"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:177 src/toolbar.c:517
+#: src/mainwindow.c:728 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: src/mainwindow.c:731 src/prefs_filtering_action.c:178 src/toolbar.c:518
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Разблокировать"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "Цветные ме_тки"
 
-#: src/mainwindow.c:734 src/summaryview.c:443
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "Те_ги"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "Заново _отредактировать"
 
-#: src/mainwindow.c:740 src/messageview.c:314 src/mimeview.c:1044
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "Проверить подпись"
 
-#: src/mainwindow.c:745 src/messageview.c:318
+#: src/mainwindow.c:743 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Добавить отправителя в адресную кн_игу"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "C_ollect addresses"
 msgstr "С_обрать адреса"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "Из текущей _папки..."
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "Из выделенных _сообщений..."
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "_Фильтровать все сообщения в папке"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "Фильтровать _выделенные сообщения"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "Запустить обр_аботку писем"
 
-#: src/mainwindow.c:756 src/messageview.c:321
+#: src/mainwindow.c:754 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "_Создать правило фильтрации"
 
-#: src/mainwindow.c:757 src/mainwindow.c:764 src/messageview.c:322
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Автоматически"
 
-#: src/mainwindow.c:758 src/mainwindow.c:765 src/mainwindow.c:873
+#: src/mainwindow.c:756 src/mainwindow.c:763 src/mainwindow.c:871
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "По _Отправителю"
 
-#: src/mainwindow.c:759 src/mainwindow.c:766 src/mainwindow.c:874
+#: src/mainwindow.c:757 src/mainwindow.c:764 src/mainwindow.c:872
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "По _Получателю"
 
-#: src/mainwindow.c:760 src/mainwindow.c:767 src/messageview.c:325
+#: src/mainwindow.c:758 src/mainwindow.c:765 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "По _Теме"
 
-#: src/mainwindow.c:761 src/mainwindow.c:768 src/messageview.c:326
+#: src/mainwindow.c:759 src/mainwindow.c:766 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "По О_тправителю"
 
-#: src/mainwindow.c:763 src/messageview.c:328 src/summaryview.c:446
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "Создать правило обработки"
 
-#: src/mainwindow.c:771 src/messageview.c:336
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Список _Ссылок..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "Ch_eck for new messages in all folders"
 msgstr "Проверить новые сообщения для всех папок"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Delete du_plicated messages"
 msgstr "Удалить ко_пии сообщений"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "В текущей папке"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "Во всех папках"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "В_ыполнить"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "Сте_реть удалённые"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "TLS cer_tificates"
 msgstr "Серти_фикаты TLS"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Журнал Фил_ьтрации"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Журнал _Сети"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "Журнал _Отладки"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "_Забыть все пароли текущей сессии"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Forget _primary passphrase"
 msgstr "Забыть основную _парольную фразу"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "И_зменить текущую учётную запись"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "_Параметры текущей учётной записи..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "Создать _новую учётную запись..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "_Редактировать учётные записи..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "П_араметры..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "Начальная об_работка..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "Пост-обр_аботка..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Фильтрация..."
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "_Шаблоны..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "_Действия..."
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "Теги..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "Модули..."
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Руководство"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "ЧАВО (онлайн)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "Объяснение _Значков"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Установить в качестве почтового клиента по умолчанию"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "Автономный _режим"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "Стр_ока меню"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "_Просмотр сообщения"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "Стр_ока состояния"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Заголовки столбцов"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "Пр_осмотр в виде цепочек"
 
-#: src/mainwindow.c:840 src/prefs_summaries.c:669
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Скрыть прочтённые цепочки"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "_Скрыть прочтённые"
 
-#: src/mainwindow.c:842 src/prefs_summaries.c:675
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Скрыть удалённые сообщения"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "Во весь _экран"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Показать все _заголовки"
 
-#: src/mainwindow.c:845 src/messageview.c:349
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Свернуть все цепочки"
 
-#: src/mainwindow.c:846 src/messageview.c:350
+#: src/mainwindow.c:844 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Свернуть по _второму уровню"
 
-#: src/mainwindow.c:847 src/messageview.c:351
+#: src/mainwindow.c:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Свернуть по _третьему уровню"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Текст _под значками"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Текст р_ядом со значками"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "_Только значки"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "_Только текст"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "_Стандартное (классическое)"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "_Три колонки"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "_Широкий просмотр сообщений"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "Ш_ирокий список сообщений"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "Д_ля небольшого экрана"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "По _номеру"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "По р_азмеру"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "По _дате"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "По дате цепочки"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "По т_еме"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "По _цветным меткам"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "По тегу"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "По _пометке"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "По _статусу"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "По в_ложению"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "По счёту"
 
-#: src/mainwindow.c:882
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "По блокировке"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "Н_е сортировать"
 
-#: src/mainwindow.c:887 src/prefs_summaries.c:656
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "По возрастанию"
 
-#: src/mainwindow.c:888 src/prefs_summaries.c:657
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "По убыванию"
 
-#: src/mainwindow.c:930 src/messageview.c:393
+#: src/mainwindow.c:928 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Автоопределение"
 
-#: src/mainwindow.c:1308 src/summaryview.c:6511
+#: src/mainwindow.c:1306 src/summaryview.c:6511
 msgid "Modify tags..."
 msgstr "Изменить теги..."
 
-#: src/mainwindow.c:1966
+#: src/mainwindow.c:1964
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Произошли ошибки. Нажмите здесь для просмотра журнала."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1979
 msgid "You are online. Click the icon to go offline"
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно"
 
-#: src/mainwindow.c:1984
+#: src/mainwindow.c:1982
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться"
 
-#: src/mainwindow.c:1998
+#: src/mainwindow.c:1996
 msgid "Select account"
 msgstr "Выберите учётную запись"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Журнал сети"
 
-#: src/mainwindow.c:2029
+#: src/mainwindow.c:2027
 msgid "Filtering/Processing debug log"
 msgstr "Журнал отладки фильтрации/обработки"
 
-#: src/mainwindow.c:2048 src/prefs_logging.c:378
+#: src/mainwindow.c:2046 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "журнал фильтрации включён\n"
 
-#: src/mainwindow.c:2050 src/prefs_logging.c:380
+#: src/mainwindow.c:2048 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "журнал фильтрации выключен\n"
 
-#: src/mainwindow.c:2484 src/mainwindow.c:2491 src/mainwindow.c:2534
-#: src/mainwindow.c:2567 src/mainwindow.c:2599 src/mainwindow.c:2644
+#: src/mainwindow.c:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1149
 msgid "Untitled"
 msgstr "Безымянный"
 
-#: src/mainwindow.c:2645 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "никакой"
 
-#: src/mainwindow.c:2902 src/mainwindow.c:2907
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения в корзине?"
 
-#: src/mainwindow.c:2903
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "Отменить выход"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7993,18 +8030,18 @@ msgstr ""
 "Если указан существующий почтовый ящик, он\n"
 "будет проверен автоматически."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:2953 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -8014,47 +8051,47 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или у вас нет прав на запись в "
 "указанный каталог."
 
-#: src/mainwindow.c:3420
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Отправлять не разрешено"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Ошибка импорта mbox файла."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "Неудачный экспорт в mbox файл."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Выйти из Claws Mail?"
 
-#: src/mainwindow.c:4262
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Синхронизация папок"
 
-#: src/mainwindow.c:4263
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Вы хотите синхронизировать ваши папки сейчас?"
 
-#: src/mainwindow.c:4264
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "_Синхронизировать"
 
-#: src/mainwindow.c:4746
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Удаление копий сообщений..."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4754
 msgid "No duplicate message found in selected folder.\n"
 msgstr "В выбранной папке дубликатов сообщений не найдено.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4760
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8062,7 +8099,7 @@ msgstr[0] "Удален %d дубликат сообщений в выбранн
 msgstr[1] "Удалено %d дубликата сообщений в выбранной папке.\\\n"
 msgstr[2] "Удалено %d дубликатов сообщений в выбранной папке.\\\n"
 
-#: src/mainwindow.c:4766
+#: src/mainwindow.c:4764
 #, 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"
@@ -8070,11 +8107,11 @@ msgstr[0] "Помечен %d дубликат сообщений для удал
 msgstr[1] "Помечено %d дубликата сообщений для удаления в выбранной папке.\n"
 msgstr[2] "Помечено %d дубликатов сообщений для удаления в выбранной папке.\n"
 
-#: src/mainwindow.c:4804
+#: src/mainwindow.c:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Удаление дубликатов сообщений во всех папках..."
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4808
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8082,50 +8119,50 @@ msgstr[0] "Удалено %d копий сообщения в %d папках.\n
 msgstr[1] "Удалено %d копии сообщений в %d папках.\n"
 msgstr[2] "Удалено %d копий сообщений в %d папках.\n"
 
-#: src/mainwindow.c:4815
+#: src/mainwindow.c:4813
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "Не найдено дубликатов сообщений в %d папках.\n"
 
-#: src/mainwindow.c:4977 src/messageview.c:2648
+#: src/mainwindow.c:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Выберите папку для перехода"
 
-#: src/mainwindow.c:5080 src/summaryview.c:5952
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 msgid "Processing rules to apply before folder rules"
 msgstr "Обработка правил для применения перед правилами папки"
 
-#: src/mainwindow.c:5088
+#: src/mainwindow.c:5086
 msgid "Processing rules to apply after folder rules"
 msgstr "Обработка правил для применения после правил папки"
 
-#: src/mainwindow.c:5096 src/summaryview.c:5963
+#: src/mainwindow.c:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Настройка фильтрации"
 
-#: src/mainwindow.c:5209
+#: src/mainwindow.c:5207
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: не удалось "
 "определить путь к программе."
 
-#: src/mainwindow.c:5300
+#: src/mainwindow.c:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail установлен в качестве почтового клиента по умолчанию."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5300
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 "Не удалось установить Claws Mail почтовым клиентом по умолчанию: невозможно "
 "произвести запись в реестр."
 
-#: src/mainwindow.c:5316 src/setup.c:91
+#: src/mainwindow.c:5314 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Сканирование папки %s%c%s..."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5458
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8455,7 +8492,7 @@ msgstr ""
 "  Сообщение было удалено или перемещено в другую папку"
 
 #: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4424
-#: src/summaryview.c:7314
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "При обучении произошла ошибка.\n"
 
@@ -8579,8 +8616,8 @@ msgstr "Проверка подписи..."
 msgid "Go back to email"
 msgstr "Вернуться к письму"
 
-#: src/mimeview.c:1712 src/mimeview.c:1804 src/mimeview.c:2046
-#: src/mimeview.c:2082 src/mimeview.c:2194 src/plugins/fancy/fancy_viewer.c:452
+#: src/mimeview.c:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Не удалось сохранить часть составного сообщения: %s"
@@ -8590,28 +8627,28 @@ msgstr "Не удалось сохранить часть составного 
 msgid "Overwrite existing file '%s'?"
 msgstr "Перезаписать существующий файл '%s'?"
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1816
 #, 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 произошла ошибка. Вы хотите отменить "
-"операцию или пропустить ошибку и продолжить?"
+"Произошла ошибка при сохранении части сообщения %d. Вы хотите отменить "
+"сохранение или проигнорировать ошибку и продолжить?"
 
-#: src/mimeview.c:1818
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
 msgstr "Ошибка при сохранении всех частей сообщения"
 
-#: src/mimeview.c:1819
-msgid "Skip"
-msgstr "Пропустить"
+#: src/mimeview.c:1820
+msgid "Ignore"
+msgstr "Игнорировать"
 
-#: src/mimeview.c:1819
-msgid "Skip all"
-msgstr "Пропустить все"
+#: src/mimeview.c:1820
+msgid "Ignore all"
+msgstr "Игнорировать все"
 
-#: src/mimeview.c:1829
+#: src/mimeview.c:1832
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8619,7 +8656,7 @@ msgstr[0] "%d файл сохранен успешно."
 msgstr[1] "%d файла сохранено успешно."
 msgstr[2] "%d файлов сохранено успешно."
 
-#: src/mimeview.c:1837
+#: src/mimeview.c:1844
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8627,7 +8664,7 @@ msgstr[0] "%d файл сохранен успешно"
 msgstr[1] "%d файла сохранено успешно"
 msgstr[2] "%d файлов сохранено успешно"
 
-#: src/mimeview.c:1842
+#: src/mimeview.c:1849
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8635,26 +8672,26 @@ msgstr[0] "%s, %d файл сохранён неудачно."
 msgstr[1] "%s, %d файла сохранено неудачно."
 msgstr[2] "%s, %d файлов сохранено неудачно."
 
-#: src/mimeview.c:1875 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1886 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Выберите папку назначения"
 
-#: src/mimeview.c:1882 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1893 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' не является каталогом."
 
-#: src/mimeview.c:1999 src/plugins/fancy/fancy_viewer.c:708
+#: src/mimeview.c:2011 src/plugins/fancy/fancy_viewer.c:708
 #: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Сохранить как"
 
-#: src/mimeview.c:2129 src/mimeview.c:2136
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
 msgstr "Открыть с помощью"
 
-#: src/mimeview.c:2130 src/mimeview.c:2137
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8663,7 +8700,7 @@ msgstr ""
 "Введите команду для открытия файла:\n"
 "('%s' будет заменено на имя файла)"
 
-#: src/mimeview.c:2232
+#: src/mimeview.c:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8674,11 +8711,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Запустить программу?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8690,20 +8727,20 @@ msgstr ""
 "\n"
 "Вы уверены, что хотите запустить этот файл?"
 
-#: src/mimeview.c:2245
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "Запустить программу"
 
-#: src/mimeview.c:2549 src/plugins/att_remover/att_remover.c:303
+#: src/mimeview.c:2561
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/mimeview.c:2550 src/plugins/att_remover/att_remover.c:304
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2789
+#: src/mimeview.c:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/mimeview.c:2564 src/plugins/vcalendar/vcalendar.c:1243
+#: src/mimeview.c:2576 src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
@@ -8814,77 +8851,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"
@@ -9381,7 +9418,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 "_Выбрать"
 
@@ -9553,6 +9590,10 @@ msgstr "Переименовать"
 msgid "Choose this option to delete mails after archiving"
 msgstr "Удалить сообщения после архивирования"
 
+#: src/plugins/att_remover/att_remover.c:305
+msgid "Filename"
+msgstr "Имя файла"
+
 #: src/plugins/att_remover/att_remover.c:336
 msgid "Remove attachments"
 msgstr "Удалить вложения"
@@ -9856,7 +9897,7 @@ msgstr "Сообщения превышающий указанный разме
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1748
 msgid "KiB"
 msgstr "КБ"
 
@@ -10379,7 +10420,7 @@ msgstr "Открыть в Просмотрщике (внешнее содерж
 msgid "Do nothing (remote content is disabled)"
 msgstr "Ничего не делать (внешнее содержимое отключено)"
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4304
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4360
 #: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Прокси"
@@ -10431,7 +10472,7 @@ msgstr "CSS в этом файле будет применяться для вс
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: 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:2510
+#: src/prefs_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Просмотр"
@@ -10755,7 +10796,7 @@ 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/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 msgid "Authentication"
 msgstr "Аутентификация"
 
@@ -10974,8 +11015,8 @@ msgid "Cache refresh interval"
 msgstr "Период обновления кэша"
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:324 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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "часов"
 
@@ -11165,15 +11206,6 @@ 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:438
 msgid "No Sieve auth method available\n"
 msgstr "Не найдено подходящего метода аутентификации Sieve\n"
@@ -11361,7 +11393,7 @@ msgstr ""
 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:1292
 msgid "Server information"
 msgstr "Информация о сервере"
 
@@ -11412,28 +11444,28 @@ msgstr "Укажите аутентификацию"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1487
+#: src/prefs_account.c:2108
 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:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1466
-#: src/prefs_account.c:2095 src/prefs_account.c:3038 src/prefs_account.c:3066
-#: src/prefs_account.c:3263 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
 #: src/wizard.c:1635
 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 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/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Автоматически"
@@ -11450,20 +11482,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 "
@@ -11480,7 +11512,7 @@ msgstr ""
 "\n"
 "Текущий журнал %s"
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "Журнал событий"
 
@@ -11740,7 +11772,7 @@ msgid "Show banner"
 msgstr "Показывать баннер"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: 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 "Никогда"
@@ -12362,8 +12394,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: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/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "минут"
 
@@ -12428,64 +12460,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"
@@ -12970,8 +13002,8 @@ msgstr "Показать Python консоль..."
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3027
-#: src/prefs_account.c:3055 src/prefs_account.c:3493 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Просмотр"
@@ -13298,7 +13330,7 @@ msgstr "Получать комментарии для постов не ста
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1687 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "дней"
 
@@ -13448,7 +13480,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 (Требуется авторизация)"
 
@@ -13457,7 +13489,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 (Документ не найден)"
 
@@ -14148,63 +14180,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"
@@ -14213,21 +14245,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"
@@ -14240,7 +14272,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"
@@ -14251,46 +14283,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 "Удалить подписку"
 
@@ -14764,95 +14796,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:396 src/prefs_account.c:1631 src/prefs_account.c:2955
+#: src/prefs_account.c:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2970
+#: src/prefs_account.c:416 src/prefs_account.c:1804 src/prefs_account.c:3008
 #: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Новости (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1501
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Локальный mbox файл"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Никакой (только SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Имя учётной записи"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Использовать по умолчанию"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1256
 msgid "Full name"
 msgstr "Полное имя"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1262
 msgid "Mail address"
 msgstr "Почтовый адрес"
 
-#: src/prefs_account.c:1298 src/wizard.c:1524
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Авто-настройка"
 
-#: src/prefs_account.c:1300 src/wizard.c:1525
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14860,81 +14892,81 @@ msgstr ""
 "Предупреждение: эта версия Claws Mail\n"
 "была собрана без поддержки IMAP и NNTP."
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "This server requires authentication"
 msgstr "Этот сервер требует аутентификацию"
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Удостоверять при подключении"
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Сервер для получения"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Локальный ящик"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "SMTP сервер (отправка)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1471
 msgid "Use mail command rather than SMTP server"
 msgstr "Использовать почтовую команду, а не SMTP сервер"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1480
 msgid "command to send mails"
 msgstr "команда для отправки почты"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Локальный узел"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 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:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Неотфильтрованные сообщения помещаются в эту папку"
 
-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1661
 msgid "Authenticate before POP connection"
 msgstr "Аутентифицировать перед POP подключением"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1696
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после получения"
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1707
 msgid "Remove after"
 msgstr "Удалить по истечении"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 дней 0 часов : удалять немедленно"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1737
 msgid "Receive size limit"
 msgstr "Ограничение размера получаемых сообщений"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1740
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14942,95 +14974,95 @@ msgstr ""
 "Сообщения, превышающие данный лимит загружаются частично. При их выборе, "
 "возможно получить полное сообщение, либо удалить его."
 
-#: src/prefs_account.c:1750 src/prefs_account.c:2985
+#: src/prefs_account.c:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Максимальное количество статей для загрузки"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "неограниченно, если указан 0"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(обычно пусто)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Показывать только подписанные папки"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1864
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Режим экономии трафика (не получать теги с сервера)"
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1866
 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:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Автоматическая проверка"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Использовать глобальные настройки"
 
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Проверять ящик каждые"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1921
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при получении"
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1937
 msgid "Allow filtering using plugins on receiving"
 msgstr "Использовать модули фильтрации при получении"
 
-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1941
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Получить почту' проверяет наличие новых сообщений данной учётной записи"
 
-#: src/prefs_account.c:1998 src/prefs_customheader.c:210
+#: src/prefs_account.c:2031 src/prefs_customheader.c:210
 #: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account.c:2000
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "Генерировать идентификатор сообщения"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2036
 msgid "Send account mail address in Message-ID"
 msgstr "Включать почтовый адрес в идентификатор сообщения"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2039
 msgid "Add user agent header"
 msgstr "Добавить заголовок агента пользователя"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Добавить заданный заголовок"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Аутентификация (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15038,217 +15070,217 @@ msgstr ""
 "Пустое поле означает использовать имя пользователя и пароль те же, что и при "
 "получении."
 
-#: src/prefs_account.c:2138
+#: src/prefs_account.c:2174
 msgid "Authenticate with POP before sending"
 msgstr "Авторизация с POP перед отправкой"
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "Время ожидания аутентификации POP"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2270
 msgid "Authorization"
 msgstr "Авторизация"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2287
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Выберите Поставщика Услуг OAuth2 Почты"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2327
 msgid "Client ID"
 msgstr "ID клиента"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2333
 msgid "Client secret"
 msgstr "Секрет клиента"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2365
 msgid "Obtain authorization code"
 msgstr "Получить код авторизации"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2369
 msgid "Open default browser with request"
 msgstr "Открыть браузер по умолчанию с запросом"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2375
 msgid "Copy link"
 msgstr "Копировать ссылку"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2387
 msgid "Authorization code"
 msgstr "Код авторизации"
 
-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2395
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr ""
 "Вставьте полный URL из браузера или предоставленный токен аутентификации"
 
-#: src/prefs_account.c:2365
+#: src/prefs_account.c:2402
 msgid "Complete authorization"
 msgstr "Завершить авторизацию"
 
-#: src/prefs_account.c:2369
+#: src/prefs_account.c:2406
 msgid "Authorize"
 msgstr "Авторизовать"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2502
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account.c:2459
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
 msgstr "Автоматически вставлять подпись"
 
-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "Отделять подпись"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
 msgstr "Автоматически установить следующие адреса"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
 msgstr "Словари проверки орфографии"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1176
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Словарь по умолчанию"
 
-#: src/prefs_account.c:2597 src/prefs_folder_item.c:1210
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Альтернативный словарь по умолчанию"
 
-#: src/prefs_account.c:2683 src/prefs_account.c:4166
+#: src/prefs_account.c:2721 src/prefs_account.c:4222
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
 #: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Составление"
 
-#: src/prefs_account.c:2698 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
+#: src/prefs_account.c:2736 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/prefs_account.c:2713 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2751 src/prefs_filtering_action.c:185
 #: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Система конфиденциальности по умолчанию"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1250
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "Всегда подписывать сообщения"
 
-#: src/prefs_account.c:2791 src/prefs_folder_item.c:1282
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "Всегда шифровать сообщения"
 
-#: src/prefs_account.c:2793
+#: src/prefs_account.c:2831
 msgid "Always sign messages when replying to a signed message"
 msgstr "Всегда подписывать сообщение при ответе на подписанное сообщение"
 
-#: src/prefs_account.c:2796
+#: src/prefs_account.c:2834
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Всегда шифровать сообщение при ответе на зашифрованное сообщение"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2837
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Шифровать отправленные сообщения своим ключом в дополнение к ключу получателя"
 
-#: src/prefs_account.c:2801
+#: src/prefs_account.c:2839
 msgid "Save sent encrypted messages as clear text"
 msgstr "Сохранять отправленные зашифрованные сообщения как простой текст"
 
-#: src/prefs_account.c:2959 src/prefs_account.c:2974 src/prefs_account.c:2988
+#: src/prefs_account.c:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
 msgid "Don't use TLS"
 msgstr "Не использовать TLS"
 
-#: src/prefs_account.c:2962 src/prefs_account.c:2977 src/prefs_account.c:2997
-#: src/prefs_account.c:3008
+#: src/prefs_account.c:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: src/prefs_account.c:2965 src/prefs_account.c:2980 src/prefs_account.c:3011
+#: src/prefs_account.c:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Использовать команду STARTTLS для запуска зашифрованной сессии"
 
-#: src/prefs_account.c:3001
+#: src/prefs_account.c:3039
 msgid "Send (SMTP)"
 msgstr "Отправка (SMTP)"
 
-#: src/prefs_account.c:3005
+#: src/prefs_account.c:3043
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "Не использовать TLS (но при необходимости, использовать STARTTLS)"
 
-#: src/prefs_account.c:3016
+#: src/prefs_account.c:3054
 msgid "Client certificates"
 msgstr "Клиентские сертификаты"
 
-#: src/prefs_account.c:3024
+#: src/prefs_account.c:3062
 msgid "Certificate for receiving"
 msgstr "Сертификат для получения"
 
-#: src/prefs_account.c:3029 src/prefs_account.c:3031 src/prefs_account.c:3057
-#: src/prefs_account.c:3059
+#: src/prefs_account.c:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "Клиентский сертификат в виде файла PKCS12 или PEM"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Certificate for sending"
 msgstr "Сертификат для отправки"
 
-#: src/prefs_account.c:3092
+#: src/prefs_account.c:3130
 msgid "Automatically accept valid TLS certificates"
 msgstr "Автоматически принимать действительный TLS сертификат"
 
-#: src/prefs_account.c:3095
+#: src/prefs_account.c:3133
 msgid "Use non-blocking TLS"
 msgstr "Использовать неблокируемый TLS"
 
-#: src/prefs_account.c:3107
+#: src/prefs_account.c:3145
 msgid "Turn this off if you have TLS connection problems"
 msgstr "Отключите при обнаружении проблем с TLS соединением"
 
-#: src/prefs_account.c:3199 src/prefs_proxy.c:75
+#: src/prefs_account.c:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Использовать прокси сервер"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3246
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr "Использовать значения по умолчанию"
 
-#: src/prefs_account.c:3210
+#: src/prefs_account.c:3248
 msgid "Use global proxy server settings"
 msgstr "Использовать глобальные настройки прокси сервера"
 
-#: src/prefs_account.c:3247 src/prefs_proxy.c:117 src/wizard.c:1119
+#: src/prefs_account.c:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
-#: src/prefs_account.c:3252 src/prefs_proxy.c:125
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: src/prefs_account.c:3286
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Использовать прокси сервер для отправки"
 
-#: src/prefs_account.c:3288
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15256,27 +15288,27 @@ msgstr ""
 "Если выключено, сообщения будут отправлены через прямое подключение, "
 "игнорируя все настройки прокси сервера."
 
-#: src/prefs_account.c:3400
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "Порт POP"
 
-#: src/prefs_account.c:3414
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "Порт IMAP"
 
-#: src/prefs_account.c:3421
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account.c:3427
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account.c:3430
+#: src/prefs_account.c:3468
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15284,156 +15316,177 @@ msgstr ""
 "Доменное имя будет использоваться в сгенерированном Message-ID, и при "
 "подключении к серверам SMTP."
 
-#: src/prefs_account.c:3444
+#: src/prefs_account.c:3482
 msgid "Use command to communicate with server"
 msgstr "Использовать команду для связи с сервером"
 
-#: src/prefs_account.c:3453
+#: src/prefs_account.c:3491
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Пометить перекрёстные сообщения как прочтённые и цветом:"
 
-#: src/prefs_account.c:3506
+#: src/prefs_account.c:3544
 msgid "Put sent messages in"
 msgstr "Поместить отправленные сообщения в"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Поместить исходящие сообщения в"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Поместить черновые сообщения в"
 
-#: src/prefs_account.c:3512
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Поместить удалённые сообщения в"
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "Имя учётной записи не введено."
 
-#: src/prefs_account.c:3573
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "Почтовый адрес не введён."
 
-#: src/prefs_account.c:3581
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "SMTP сервер не введён."
 
-#: src/prefs_account.c:3586
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "Имя пользователя не введено."
 
-#: src/prefs_account.c:3591
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "POP сервер не введён."
 
-#: src/prefs_account.c:3611
+#: src/prefs_account.c:3649
 msgid "The default Inbox folder doesn't exist."
 msgstr "Папка по умолчанию 'Входящие' не существует."
 
-#: src/prefs_account.c:3617
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "IMAP сервер не введён."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "NNTP сервер не введён."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3666
 msgid "local mailbox filename is not entered."
 msgstr "имя файла локального ящика не введено."
 
-#: src/prefs_account.c:3634
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "команда приёма почты не введена."
 
-#: src/prefs_account.c:3644
+#: src/prefs_account.c:3682
 msgid "User ID cannot contain a newline character."
 msgstr "Имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3651
+#: src/prefs_account.c:3689
 msgid "Password cannot contain a newline character."
 msgstr "Пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3686
+#: src/prefs_account.c:3726
 msgid "SMTP user ID cannot contain a newline character."
 msgstr "SMTP имя пользователя не может содержать символ новой строки."
 
-#: src/prefs_account.c:3691
+#: src/prefs_account.c:3731
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP пароль не может содержать символ новой строки."
 
-#: src/prefs_account.c:3783
+#: src/prefs_account.c:3826
 msgid "domain is not specified."
 msgstr "домен не указан."
 
-#: src/prefs_account.c:3788
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "папка отправки не выбрана."
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "папка очереди не выбрана."
 
-#: src/prefs_account.c:3798
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "папка черновиков не выбрана."
 
-#: src/prefs_account.c:3803
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "папка мусорной корзины не выбрана."
 
-#: src/prefs_account.c:4112
+#: src/prefs_account.c:4166
 msgid "Receive"
 msgstr "Получить"
 
-#: src/prefs_account.c:4148
+#: src/prefs_account.c:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Отправить"
+
+#: src/prefs_account.c:4203
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4184 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_account.c:4202
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
-#: src/prefs_account.c:4322
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Дополнительные"
 
-#: src/prefs_account.c:4682
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Параметры для новой учётной записи"
 
-#: src/prefs_account.c:4684
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
 msgstr "Параметры учётной записи - %s"
 
-#: src/prefs_account.c:4803 src/wizard.c:1389
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Ошибка (неправильный адрес)"
 
-#: src/prefs_account.c:4888
+#: src/prefs_account.c:4946
 msgid "Select signature file"
 msgstr "Выбрать файл подписи"
 
-#: src/prefs_account.c:4906 src/prefs_account.c:4923 src/wizard.c:1066
+#: src/prefs_account.c:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Выбрать файл сертификата"
 
-#: src/prefs_account.c:5019
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: src/prefs_account.c:5336
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (модуль не загружен)"
 
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Авторизация завершена"
+
+#: src/prefs_account.c:6278
+msgid "Your OAuth2 authorisation code has been received by Claws Mail"
+msgstr "Ваш код авторизации OAuth2 получен Claws Mail"
+
+#: src/prefs_account.c:6281
+msgid "Authorisation NOT completed"
+msgstr "Авторизация НЕ завершена"
+
+#: src/prefs_account.c:6282
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "Ваш код авторизации OAuth2 не был получен Claws Mail"
+
 #: src/prefs_actions.c:227
 msgid "Actions configuration"
 msgstr "Настроить действия"
@@ -15561,15 +15614,15 @@ msgid "Entry not saved"
 msgstr "Запись не сохранена"
 
 #: src/prefs_actions.c:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
-#: src/prefs_filtering.c:1531 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Запись не была сохранена. Всё равно закрыть?"
 
 #: src/prefs_actions.c:922 src/prefs_actions.c:927 src/prefs_actions.c:953
-#: src/prefs_actions.c:1324 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1510 src/prefs_filtering.c:1532
-#: src/prefs_matcher.c:2173 src/prefs_template.c:574 src/prefs_template.c:599
-#: src/prefs_template.c:604
+#: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
+#: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Продолжить редактирование"
 
@@ -15766,8 +15819,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "Предупреждать при вставке файла размером более"
 
 #: src/prefs_compose_writing.c:208
-msgid "KiB into message body "
-msgstr "КБ в тело сообщения "
+msgid "KiB into message body"
+msgstr "КБ в тело сообщения"
 
 #: src/prefs_compose_writing.c:214
 msgid "Replying"
@@ -15824,65 +15877,69 @@ msgid "Header name is not set."
 msgstr "Имя заголовка не указано."
 
 #: src/prefs_customheader.c:514
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Двоеточие (:) не допускается в пользовательском заголовке."
+
+#: src/prefs_customheader.c:519
 msgid "This Header name is not allowed as a custom header."
 msgstr "Это имя Заголовка не допускается как пользовательский заголовок."
 
-#: src/prefs_customheader.c:561
+#: src/prefs_customheader.c:566
 msgid "Choose a PNG file"
 msgstr "Выбрать PNG файл"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Выбрать XBM файл"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Выбрать текстовый файл"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Файл не является изображением."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "Неверный размер изображения (48х48)."
 
-#: src/prefs_customheader.c:589
+#: src/prefs_customheader.c:594
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "Изображение слишком большое; должно быть максимум 725 байт."
 
-#: src/prefs_customheader.c:594
+#: src/prefs_customheader.c:599
 msgid "The image isn't in the correct format (PNG)."
 msgstr "Неверный формат изображения (PNG)."
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:608
 msgid "The image isn't in the correct format (XBM)."
 msgstr "Неверный формат изображения (XBM)."
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:617
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 "Не удалось выполнить `compface`. Убедитесь, что путь к нему есть в вашем "
 "$PATH."
 
-#: src/prefs_customheader.c:618
+#: src/prefs_customheader.c:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "Ошибка compface: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Этот файл содержит новые строки."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Удалить заголовок"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 msgid "Do you really want to delete this header?"
 msgstr "Действительно удалить этот заголовок?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:880
 msgid "Current custom headers"
 msgstr "Текущие пользовательские заголовки"
 
@@ -16378,7 +16435,7 @@ msgstr ""
 
 #: src/prefs_folder_item.c:547
 msgid "Skip folder when searching for unread or new messages"
-msgstr "Пропускать папку при поиске непрочтенных или новых сообщений"
+msgstr "Пропускать папку при поиске непрочитанных или новых сообщений"
 
 #: src/prefs_folder_item.c:549
 msgid ""
@@ -16386,7 +16443,7 @@ msgid ""
 "unread or new messages"
 msgstr ""
 "Включите эту опцию, если хотите игнорировать эту папку во время поиска "
-"непрочтенных или новых сообщений"
+"непрочитанных или новых сообщений"
 
 #: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
@@ -17015,14 +17072,6 @@ msgstr "тип"
 msgid "Program returns"
 msgstr "Код возврата"
 
-#: src/prefs_matcher.c:2171
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"Запись не была сохранена.\n"
-"Все равно закрыть?"
-
 #: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Тип совпадения: 'Тест'"
@@ -17798,8 +17847,8 @@ msgstr ""
 "Укажите Content-Transfer-Encoding для тела сообщений, содержащих не-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:420 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Отправка"
 
@@ -18975,88 +19024,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"
@@ -19526,7 +19575,7 @@ msgstr "Зашифровано"
 msgid "Has attachment(s)"
 msgstr "Сообщение с вложениями"
 
-#: src/summaryview.c:8321
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19535,11 +19584,11 @@ msgstr ""
 "Ошибка в регулярном выражении (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8424
+#: src/summaryview.c:8428
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Вернуться к списку папок (у Вас есть непрочтённые сообщения)"
 
-#: src/summaryview.c:8429
+#: src/summaryview.c:8433
 msgid "Go back to the folder list"
 msgstr "Вернуться к списку папок"
 
diff --git a/po/sk.po b/po/sk.po
index e71dd17db..b243d37de 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:43+0100\n"
-"PO-Revision-Date: 2022-03-27 11:57+0200\n"
+"POT-Creation-Date: 2022-10-11 10:32+0100\n"
+"PO-Revision-Date: 2022-10-15 12:23+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: Gtranslator 41.0\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:403 src/account.c:470
@@ -114,13 +114,13 @@ msgstr "Tlačidlo „Prijať poštu” prijme poštu z označených účtov"
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1851
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:385
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
 #: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
 #: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:1637 src/prefs_account.c:1271 src/prefs_account.c:5015
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -179,10 +179,10 @@ msgstr ""
 #: src/compose.c:9783 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"
 
@@ -382,7 +382,7 @@ msgid "Duplicate email addresses"
 msgstr "Duplicitné adresy"
 
 #: src/addrduplicates.c:443 src/addressadd.c:235
-#: 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"
@@ -443,12 +443,12 @@ msgid "_Book"
 msgstr "_Adresár"
 
 #: src/addressbook.c:401 src/addressbook.c:431 src/addressbook.c:456
-#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:524
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
 #: src/messageview.c:213 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:527
+#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:525
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Nástroje"
@@ -503,7 +503,7 @@ msgid "C_ut"
 msgstr "_Vystrihnúť"
 
 #: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
-#: src/compose.c:649 src/mainwindow.c:558 src/messageview.c:229
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopírovať"
@@ -562,7 +562,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:411
 #: src/plugins/vcalendar/month-view.c:427 src/prefs_themes.c:917
 #: src/prefs_themes.c:949 src/prefs_themes.c:950
@@ -719,7 +719,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:332 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Odstrániť zložku"
 
@@ -831,7 +831,7 @@ msgid "Person"
 msgstr "Osoba"
 
 #: src/addressbook.c:5019 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3470 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Zložka"
 
@@ -954,18 +954,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:141 src/compose.c:9857
+#: src/alertpanel.c:141 src/compose.c:9866 src/mimeview.c:1836
 msgid "Notice"
 msgstr "Upozornenie"
 
 #: src/alertpanel.c:154 src/compose.c:5895 src/compose.c:6444
-#: src/compose.c:12266 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:863 src/plugins/pgpcore/sgpgme.c:1000
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:731
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Chyba"
@@ -1086,63 +1086,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"
@@ -1487,7 +1487,7 @@ msgstr "_Odstrániť"
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/compose.c:619 src/mainwindow.c:526 src/messageview.c:215
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "Sp_ráva"
 
@@ -1499,7 +1499,7 @@ msgstr "P_ravopis"
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: src/compose.c:626 src/mainwindow.c:529 src/messageview.c:217
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -1559,7 +1559,7 @@ msgstr "_Zalomené"
 msgid "_Unwrapped"
 msgstr "_Nezalomené"
 
-#: src/compose.c:657 src/mainwindow.c:559
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Vy_brať všetko"
@@ -1669,47 +1669,47 @@ msgstr "_Súkromie"
 msgid "_Priority"
 msgstr "Pri_orita"
 
-#: src/compose.c:703 src/mainwindow.c:621 src/messageview.c:268
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Kódovanie znakov"
 
-#: src/compose.c:708 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:273
 msgid "Western European"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/compose.c:709 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Pobaltské"
 
-#: src/compose.c:710 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebrejské"
 
-#: src/compose.c:711 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabské"
 
-#: src/compose.c:712 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:712 src/mainwindow.c:628 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Cyrilika"
 
-#: src/compose.c:713 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:713 src/mainwindow.c:629 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonské"
 
-#: src/compose.c:714 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Čínske"
 
-#: src/compose.c:715 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Kórejské"
 
-#: src/compose.c:716 src/mainwindow.c:634 src/messageview.c:281
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Thajské"
 
-#: src/compose.c:719 src/mainwindow.c:744 src/messageview.c:317
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adresár"
 
@@ -1717,11 +1717,11 @@ msgstr "_Adresár"
 msgid "_Template"
 msgstr "Šabló_na"
 
-#: src/compose.c:723 src/mainwindow.c:774 src/messageview.c:339
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "A_kcie"
 
-#: src/compose.c:727 src/mainwindow.c:828 src/messageview.c:343
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "_O programe"
 
@@ -1757,12 +1757,12 @@ msgstr "Zobraziť p_ravítko"
 msgid "_Normal"
 msgstr "_Normálny"
 
-#: src/compose.c:744 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_All"
 msgstr "_Všetkým"
 
-#: src/compose.c:745 src/mainwindow.c:676 src/messageview.c:307
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
 #: src/summaryview.c:435
 msgid "_Sender"
 msgstr "Odo_sielateľ"
@@ -1787,27 +1787,27 @@ msgstr "_Nízka"
 msgid "_Lowest"
 msgstr "Na_jnižšia"
 
-#: src/compose.c:760 src/mainwindow.c:893 src/messageview.c:356
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automaticky"
 
-#: src/compose.c:761 src/mainwindow.c:894 src/messageview.c:357
+#: src/compose.c:761 src/mainwindow.c:892 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:762 src/mainwindow.c:895 src/messageview.c:358
+#: src/compose.c:762 src/mainwindow.c:893 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:766 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:766 src/mainwindow.c:897 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:769 src/mainwindow.c:902 src/messageview.c:365
+#: src/compose.c:769 src/mainwindow.c:900 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Grécke (ISO-8859-_7)"
 
-#: src/compose.c:774 src/mainwindow.c:907 src/messageview.c:370
+#: src/compose.c:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turecké (ISO-8859-_9)"
 
@@ -1931,7 +1931,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:3717 src/compose.c:10846 src/compose.c:11746
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "_Vložiť"
 
@@ -1991,7 +1991,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:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
-#: src/prefs_account.c:4130 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Odoslať"
 
@@ -2155,7 +2155,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:6445 src/mainwindow.c:666 src/toolbar.c:280 src/toolbar.c:2604
+#: src/compose.c:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Zrušiť posielanie"
 
@@ -2184,9 +2184,11 @@ msgstr "Na automatické doplnenie z adresára použite <TAB>"
 msgid "Mime type"
 msgstr "Typ MIME"
 
-#: src/compose.c:7517 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:473
+#: src/compose.c:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -2315,11 +2317,11 @@ msgstr "Socketová komunikácia s externým editorom nie je vo Windows dostupná
 #: src/compose.c:9742
 #, 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 edittora:\n"
 "%s\n"
 "%s"
 
@@ -2328,29 +2330,39 @@ msgstr ""
 msgid "External editor stopped with an error: %s"
 msgstr "Externý editor skončil chybou: %s"
 
-#: src/compose.c:9854
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "id procesu: %"
+
+#: src/compose.c:9858
+#, c-format
+msgid "process id: %d"
+msgstr "id procesu: %d"
+
+#: src/compose.c:9863
+#, 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:10260 src/messageview.c:1095
+#: src/compose.c:10273 src/messageview.c:1095
 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:10463
+#: src/compose.c:10476
 msgid "Could not save draft."
 msgstr "Koncept nemožno uložiť."
 
-#: src/compose.c:10467
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "Koncept nemožno uložiť"
 
-#: src/compose.c:10468
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2358,24 +2370,24 @@ msgstr ""
 "Koncept nemožno uložiť.\n"
 "Chcete pokračovať v písaní, alebo zahodiť rozpísanú správu?"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "+_Zrušiť skončenie"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "_Zahodiť správu"
 
-#: src/compose.c:10658 src/compose.c:10672
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Zvoľte súbor"
 
-#: src/compose.c:10686
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor „%s” nemožno čítať."
 
-#: src/compose.c:10688
+#: src/compose.c:10704
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2384,50 +2396,50 @@ msgstr ""
 "Súbor „%s” obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
-#: src/compose.c:10765
+#: src/compose.c:10781
 msgid "Discard message"
 msgstr "Zahodiť správu"
 
-#: src/compose.c:10766
+#: src/compose.c:10782
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
-#: src/compose.c:10767 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: src/compose.c:10767 src/compose.c:10772
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
-#: src/compose.c:10770 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: src/compose.c:10771
+#: src/compose.c:10787
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Táto správa bola zmenená. Uložiť posledné zmeny?"
 
-#: src/compose.c:10772
+#: src/compose.c:10788
 msgid "_Don't save"
 msgstr "_Neukladať"
 
-#: src/compose.c:10843
+#: src/compose.c:10859
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "Chcete použiť šablónu „%s”?"
 
-#: src/compose.c:10845
+#: src/compose.c:10861
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:10846 src/prefs_actions.c:333 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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:1019
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: src/compose.c:10922
+#: src/compose.c:10938
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2436,7 +2448,7 @@ msgstr ""
 "Veľkosť vkladaného textu prekročila limit (%d kiB) vloženia.\n"
 "Namiesto toho pridajte prílohu."
 
-#: src/compose.c:11739
+#: src/compose.c:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2454,20 +2466,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:11745
+#: src/compose.c:11761
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
-#: src/compose.c:11746
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "_Pripojiť"
 
-#: src/compose.c:11964
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Chyba v tvare citácie na riadku %d."
 
-#: src/compose.c:12260
+#: src/compose.c:12276
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2684,7 +2696,7 @@ msgid " Check File "
 msgstr " Skontrolovať súbor "
 
 #: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2478
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Súbor"
@@ -2769,13 +2781,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:173 src/editldap.c:441 src/prefs_account.c:3230
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3268
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Meno počítača"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3237
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2836,7 +2848,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:4221
+#: src/editldap.c:470 src/prefs_account.c:4277
 msgid "TLS"
 msgstr "TLS"
 
@@ -2997,8 +3009,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:739 src/prefs_account.c:1477 src/prefs_account.c:2108
-#: src/prefs_account.c:3042 src/prefs_account.c:3070 src/prefs_account.c:3275
+#: src/editldap.c:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
 #: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Zobraziť heslo"
@@ -3020,7 +3032,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:793 src/prefs_account.c:4094
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Základné"
 
@@ -3107,11 +3119,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"
 
@@ -3175,9 +3187,9 @@ msgid "Stylesheet"
 msgstr "Štýlopis"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
-#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1184
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
 #: src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
 #: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 msgid "None"
 msgstr "Žiadna"
@@ -3188,7 +3200,7 @@ msgstr "Žiadna"
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Plné"
@@ -3416,7 +3428,7 @@ msgstr "Exportovať adresár do súboru LDIF"
 msgid "Distinguished Name"
 msgstr "Distguished Name"
 
-#: src/export.c:113 src/summaryview.c:8508
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
@@ -3498,11 +3510,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 "
@@ -3511,13 +3531,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"
@@ -3525,7 +3545,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 "
@@ -3534,114 +3554,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, but all rules are applied on user request anyway\n"
+msgstr ""
+"pravidlo nie je závislé na účte, ale na žiadosť používateľa sú aplikované "
+"všetky pravidlá\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 ""
-"pravidlo nie je závislé na účte, na žiadosť používateľa boli i tak "
-"aplikované všetky pravidlá\n"
+"pravidlo je závislé na účte, ale na žiadosť používateľa sú aplikované všetky "
+"pravidlá\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 ""
 "pravidlo je závislé na účte [id=%d, názov='%s'], ale na žiadosť používateľa "
-"boli aplikované všetky pravidlá\n"
+"sú aplikované všetky pravidlá\n"
 
-#: src/filtering.c:670
+#: 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: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"
@@ -3658,11 +3689,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"
@@ -3744,17 +3775,17 @@ msgstr "Zdediť vlastnosti a pravidlá spracovania z rodičovskej zložky"
 
 #: src/foldersel.c:585 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:302
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:239
-#: src/plugins/vcalendar/vcal_folder.c:2103
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov zložky nemôže obsahovať „%c”."
 
 #: src/foldersel.c:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:251
-#: src/plugins/vcalendar/vcal_folder.c:2110
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Zložka „%s” už existuje."
@@ -3786,7 +3817,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:563
+#: src/folderview.c:254 src/mainwindow.c:561
 msgid "_Search folder..."
 msgstr "Pre_hľadať zložku..."
 
@@ -3839,7 +3870,7 @@ msgstr "Označiť všetky ako prečítané"
 
 #: src/folderview.c:870
 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 "
@@ -3855,7 +3886,7 @@ msgstr "Označiť všetky ako neprečítané"
 
 #: src/folderview.c:876
 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 "
@@ -3865,12 +3896,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:1074 src/imap.c:4693
+#: src/folderview.c:1074 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "Prehľadávanie zložky %s/%s..."
 
-#: src/folderview.c:1077 src/imap.c:4697 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Prehľadávanie zložky %s..."
@@ -3917,7 +3948,7 @@ msgstr "Otváram zložku %s..."
 msgid "Folder could not be opened."
 msgstr "Zložku nemožno otvoriť."
 
-#: src/folderview.c:2493 src/mainwindow.c:2901 src/mainwindow.c:2906
+#: src/folderview.c:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
@@ -3929,7 +3960,7 @@ msgstr "Vymazať všetky správy z koša?"
 msgid "_Empty trash"
 msgstr "_Vyprázdniť kôš"
 
-#: src/folderview.c:2539 src/inc.c:1669 src/toolbar.c:3085
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Varovanie odpojenia"
 
@@ -4043,7 +4074,7 @@ msgstr "Názov diskusnej skupiny"
 msgid "Messages"
 msgstr "Správy"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Typ"
 
@@ -4097,7 +4128,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:857
+#: src/gtk/about.c:164 src/gtk/about.c:866
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4186,46 +4217,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "pridáva podporu šifrovaných spojení so serverom\n"
 
 #: src/gtk/about.c:461
-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:472
 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:482
+#: src/gtk/about.c:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "pridáva podporu adries IPv6\n"
+
+#: src/gtk/about.c:481
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "pridáva podporu adresárov PalmOS\n"
 
-#: src/gtk/about.c:492
+#: src/gtk/about.c:491
 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:502
+#: src/gtk/about.c:501
 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:512
+#: src/gtk/about.c:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "pridáva podporu tém SVG\n"
+
+#: src/gtk/about.c:521
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "pridáva podporu správy relácií\n"
 
-#: src/gtk/about.c:522
+#: src/gtk/about.c:531
 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:532
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "pridáva podporu tém SVG\n"
+#: src/gtk/about.c:541
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "pridáva podporu autentifikácie OAuth2\n"
 
-#: src/gtk/about.c:564
+#: src/gtk/about.c:573
 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 "
@@ -4236,7 +4272,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:571
+#: src/gtk/about.c:580
 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 "
@@ -4247,7 +4283,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:590
+#: src/gtk/about.c:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4255,73 +4291,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:723 src/main.c:2749
+#: src/gtk/about.c:732 src/main.c:2749
 msgid "Session statistics\n"
 msgstr "Štatistiky relácie\n"
 
-#: src/gtk/about.c:733 src/gtk/about.c:736 src/main.c:2759 src/main.c:2762
+#: src/gtk/about.c:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Začatá: %s\n"
 
-#: src/gtk/about.c:743 src/main.c:2768
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Došlá komunikácia\n"
 
-#: src/gtk/about.c:746 src/main.c:2771
+#: src/gtk/about.c:755 src/main.c:2771
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Prijaté správy: %d\n"
 
-#: src/gtk/about.c:753 src/main.c:2777
+#: src/gtk/about.c:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Odoslaná komunikácia\n"
 
-#: src/gtk/about.c:756 src/main.c:2780
+#: src/gtk/about.c:765 src/main.c:2780
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Nové/presmerované správy: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2784
+#: src/gtk/about.c:770 src/main.c:2784
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Odpovede na správy: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2788
+#: src/gtk/about.c:775 src/main.c:2788
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Presmerované správy: %d\n"
 
-#: src/gtk/about.c:771 src/main.c:2792
+#: src/gtk/about.c:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Odoslané správy celkom: %d\n"
 
-#: src/gtk/about.c:798
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "O programe Claws Mail"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "_Informácie"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Autori"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Features"
 msgstr "_Vlastnosti"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Licencia"
 
-#: src/gtk/about.c:897
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "_Poznámky k verzii"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "Štati_stiky"
 
@@ -4795,7 +4831,7 @@ msgstr "Precedence"
 msgid "Precedence:"
 msgstr "Precedence:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1268
 msgid "Organization"
 msgstr "Organizácia"
 
@@ -5008,7 +5044,7 @@ msgid "Folder contains marked messages"
 msgstr "Zložka obsahuje označené správy"
 
 #: src/gtk/icon_legend.c:92
-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:93
@@ -5172,15 +5208,15 @@ msgstr "Načítané zásuvné moduly"
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:856
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 msgid "_Hide"
 msgstr "_Skryť"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4093 src/prefs_account.c:4111 src/prefs_account.c:4129
 #: src/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
-#: src/prefs_account.c:4201 src/prefs_account.c:4220 src/prefs_account.c:4303
-#: src/prefs_account.c:4321 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Účet"
@@ -5629,8 +5665,7 @@ msgstr "(bez Predmetu)"
 msgid "Error:"
 msgstr "Chyba:"
 
-#: src/image_viewer.c:313 src/mimeview.c:2564
-#: src/plugins/att_remover/att_remover.c:305
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Názov súboru:"
@@ -5643,194 +5678,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"
@@ -5842,7 +5877,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"
@@ -5854,7 +5889,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"
@@ -5866,7 +5901,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"
@@ -5878,7 +5913,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"
@@ -5890,7 +5925,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"
@@ -5900,36 +5935,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:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:884 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: src/imap.c:1177 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:885 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"
@@ -5943,108 +5978,108 @@ msgstr ""
 "Chcete pokračovať v pripájaní na tento server? Komunikácia nebude "
 "zabezpečená."
 
-#: src/imap.c:1183 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:891 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 "
@@ -6053,20 +6088,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"
@@ -6117,7 +6152,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..."
 
@@ -6149,21 +6184,21 @@ msgstr ""
 "teda bez správ, pridajte na koniec mena „/”)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:233
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadajte nový názov pre „%s”:"
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
 #: src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/vcalendar/vcal_folder.c:2094
 msgid "Rename folder"
 msgstr "Premenovať zložku"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:257
-#: src/plugins/vcalendar/vcal_folder.c:2116
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6171,32 +6206,33 @@ msgstr ""
 "Nemožno premenovať zložku.\n"
 "Nový názov je neprípustný."
 
-#: 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:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:330
+#: 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:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:209
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemožno odstrániť zložku „%s”."
@@ -6223,7 +6259,7 @@ msgstr "_Hľadať"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "Zvoľte podzložku %s, ktorú chcete odoberať: "
 
-#: src/imap_gtk.c:536 src/mainwindow.c:690
+#: src/imap_gtk.c:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Odoberať"
 
@@ -6457,32 +6493,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)"
@@ -6490,28 +6526,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:407 src/prefs_summaries.c:647
+#: src/inc.c:727 src/prefs_matcher.c:407 src/prefs_summaries.c:647
 #: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 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)"
@@ -6519,66 +6555,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:865
+#: src/inc.c:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:894
+#: src/inc.c:897
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "Účet „%s”: Pripájanie k serveru POP3: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:931
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d"
 
-#: src/inc.c:932
+#: src/inc.c:935
 #, 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:1012 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autentifikácia..."
 
-#: src/inc.c:1014
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Prijímanie správ z %s (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1035
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:1064
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1080
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
@@ -6586,16 +6622,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:1232
+#: src/inc.c:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1237
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty nastala chyba."
 
-#: src/inc.c:1243
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6604,37 +6640,37 @@ msgstr ""
 "Pri spracovávaní pošty nastala chyba:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1254
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "Nemožno zapisovať do súboru."
 
-#: src/inc.c:1259
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1262
+#: src/inc.c:1265
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Chyba soketu pri pripojení k %s:%d."
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1270 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:1270
+#: src/inc.c:1273
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Vzdialený hostiteľ %s:%d ukončil spojenie."
 
-#: src/inc.c:1275
+#: src/inc.c:1278
 msgid "Mailbox is locked."
 msgstr "Poštová schránka je zamknutá."
 
-#: src/inc.c:1279
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6643,11 +6679,11 @@ msgstr ""
 "Poštová schránka je zamknutá:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autentifikácia zlyhala."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6656,7 +6692,7 @@ msgstr ""
 "Autentifikácia zlyhala:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1299 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6664,48 +6700,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:1301
+#: src/inc.c:1304
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Spojenie k %s:%d zlyhalo."
 
-#: src/inc.c:1339
+#: src/inc.c:1342
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1634 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
 #: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr "sekúnd"
 
-#: src/inc.c:1644 src/inc.c:1654
+#: src/inc.c:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minúta"
 msgstr[1] "minúty"
 msgstr[2] "minúty"
 
-#: src/inc.c:1647
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hodina"
 msgstr[1] "hodiny"
 msgstr[2] "hodín"
 
-#: src/inc.c:1659
+#: src/inc.c:1662
 #, 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:1665
+#: src/inc.c:1668
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sPracujete odpojený. Pripojiť?"
 
-#: src/inc.c:1672
+#: src/inc.c:1675
 msgid "On_ly once"
 msgstr "_Len raz"
 
@@ -7132,829 +7168,829 @@ msgstr "NetworkManager: sieť je pripojená.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: sieť nie je pripojená.\n"
 
-#: src/mainwindow.c:523 src/messageview.c:212
+#: src/mainwindow.c:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/mainwindow.c:525 src/messageview.c:214 src/summaryview.c:448
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "Zo_braziť"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "Nastav_enie"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "Pridať m_ailbox"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Zmeniť poradie schránok..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "_Importovať súbor mbox..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "Exportovať _výber do súboru mbox..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
 msgstr "Vyčistiť všetky _koše"
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Uložiť email ako..."
 
-#: src/mainwindow.c:547 src/messageview.c:222
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Uložiť časť ako..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Nastavenie strany..."
 
-#: src/mainwindow.c:551 src/messageview.c:224
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "S_ynchronizovať zložky"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "_Skončiť"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "Zvoliť _vlákno"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "_Nájsť v aktuálnej správe..."
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "_Rýchle vyhľadanie"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "_Ukázať alebo skryť"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "Panel nás_trojov"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Nastav_iť zobrazované stĺpce"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "V _zozname zložiek..."
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "V zozname _správ.."
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "Rozmiestnenie _okien"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "_Radiť"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "Pre_jsť na"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Predošlá správa"
 
-#: src/mainwindow.c:588 src/messageview.c:237
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "Ďa_lšia správa"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:588 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "P_redchádzajúca neprečítaná správa"
 
-#: src/mainwindow.c:591 src/messageview.c:240
+#: src/mainwindow.c:589 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "Ďalšia _neprečítaná správa"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:591 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Predchádzajúca no_vá správa"
 
-#: src/mainwindow.c:594 src/messageview.c:243
+#: src/mainwindow.c:592 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "Ďalšia no_vá správa"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:594 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Predchádzajúca _označená správa"
 
-#: src/mainwindow.c:597 src/messageview.c:246
+#: src/mainwindow.c:595 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Ďalšia _označená správa"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:597 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Predchádzajúca správa s návestí_m"
 
-#: src/mainwindow.c:600 src/messageview.c:249
+#: src/mainwindow.c:598 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Ďalšia správa s návestí_m"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:600
 msgid "Previously opened message"
 msgstr "Naposledy otvorená správa"
 
-#: src/mainwindow.c:603 src/messageview.c:252
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Ďalšia o_tvorená správa"
 
-#: src/mainwindow.c:605 src/messageview.c:254
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Rodičovská správa"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:605 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Ďalšia nepr_ečítaná zložka"
 
-#: src/mainwindow.c:608 src/messageview.c:257
+#: src/mainwindow.c:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "_Zložka..."
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:608 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Ďalšia časť"
 
-#: src/mainwindow.c:611 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:609 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Predošlá časť"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Posúvanie správy"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Predošlý riadok"
 
-#: src/mainwindow.c:616 src/messageview.c:263
+#: src/mainwindow.c:614 src/messageview.c:263
 msgid "Next line"
 msgstr "Ďalší riadok"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:476
+#: src/mainwindow.c:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Predošlá strana"
 
-#: src/mainwindow.c:618 src/messageview.c:265 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Ďalšia strana"
 
-#: src/mainwindow.c:636 src/messageview.c:283
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Dekódovať"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:641
 msgid "Open in new _window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/mainwindow.c:644 src/messageview.c:290
+#: src/mainwindow.c:642 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Zdrojový kód správ_y"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "Správová časť"
 
-#: src/mainwindow.c:647 src/messageview.c:292
+#: src/mainwindow.c:645 src/messageview.c:292
 msgid "View as text"
 msgstr "Zobraziť ako text"
 
-#: src/mainwindow.c:648 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/mainwindow.c:650 src/messageview.c:295
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "Otvoriť pomocou..."
 
-#: src/mainwindow.c:654 src/messageview.c:298
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citácia"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "_Aktualizovať sumár"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "P_rijať"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "Prijať z _aktuálneho účtu"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "Prijať zo _všetkých účtov"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "_Zrušiť prijímanie"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "Odoslať _správy z fronty"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "_Napísať novú správu"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:669
 msgid "Compose a news message"
 msgstr "Napísať nový príspevok"
 
-#: src/mainwindow.c:673 src/messageview.c:304
+#: src/mainwindow.c:671 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: src/mainwindow.c:674 src/messageview.c:305 src/summaryview.c:433
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
 msgstr "O_dpovedať komu"
 
-#: src/mainwindow.c:677 src/messageview.c:308 src/summaryview.c:436
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
 msgstr "Emai_lová konferencia"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:676
 msgid "Follow-up and reply to"
 msgstr "Sledovať a odpovedať na"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:679 src/messageview.c:311 src/summaryview.c:438
 #: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "_Poslať ďalej"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
 #: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr "Poslať ďale_j ako prílohu"
 
-#: src/mainwindow.c:683 src/messageview.c:313 src/summaryview.c:440
+#: src/mainwindow.c:681 src/messageview.c:313 src/summaryview.c:440
 #: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "P_resmerovať"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
 msgstr "Emai_lová-Konferencia"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Pošta"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "_Pomocník"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "_Odhlásiť sa"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "View archive"
 msgstr "Zobraziť archív"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Contact owner"
 msgstr "Kontaktovať vlastníka"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "Pre_sunúť..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:700
 msgid "Move to _trash"
 msgstr "Presunúť _do koša"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "Z_mazať..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
 msgstr "Presunúť vlákno do _koša"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "_Zmazať vlákno"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Zrušiť príspevo_k"
 
-#: src/mainwindow.c:709 src/mainwindow.c:710 src/summaryview.c:441
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "O_značiť"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "O_dznačiť"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "Označiť ako _prečítané"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "Označiť ako n_eprečítané"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Označiť všetky v priečinku ako prečítané"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:716
 msgid "Mark all unread in folder"
 msgstr "Označiť všetky v priečinku ako neprečítané"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Unignore thread"
 msgstr "Zrušiť ignorovanie vlákna"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Sledovať vlákno"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Zrušiť sledovanie vlákna"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "Označiť ako _spam"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:725
 msgid "Mark as _ham"
 msgstr "Označiť ako _nie spam"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:177 src/toolbar.c:517
+#: src/mainwindow.c:728 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/mainwindow.c:731 src/prefs_filtering_action.c:178 src/toolbar.c:518
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Odomknúť"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "_Farebné označenie"
 
-#: src/mainwindow.c:734 src/summaryview.c:443
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "Z_načky"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "Znova _upraviť"
 
-#: src/mainwindow.c:740 src/messageview.c:314 src/mimeview.c:1044
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "Overiť podpis"
 
-#: src/mainwindow.c:745 src/messageview.c:318
+#: src/mainwindow.c:743 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Pridať odosielateľa _do adresára"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "C_ollect addresses"
 msgstr "Zoz_bierať adresy"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "Z aktuálnej _zložky..."
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "Z vybraných _správ..."
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "Filtrovať _všetky správy v zložke"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "Filtrovať _zvolené správy"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "Spustiť sprac_ovanie pravidiel"
 
-#: src/mainwindow.c:756 src/messageview.c:321
+#: src/mainwindow.c:754 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Vytvor_iť pravidlo filtra"
 
-#: src/mainwindow.c:757 src/mainwindow.c:764 src/messageview.c:322
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Automaticky"
 
-#: src/mainwindow.c:758 src/mainwindow.c:765 src/mainwindow.c:873
+#: src/mainwindow.c:756 src/mainwindow.c:763 src/mainwindow.c:871
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "Podľa _autora"
 
-#: src/mainwindow.c:759 src/mainwindow.c:766 src/mainwindow.c:874
+#: src/mainwindow.c:757 src/mainwindow.c:764 src/mainwindow.c:872
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "Podľa a_dresáta"
 
-#: src/mainwindow.c:760 src/mainwindow.c:767 src/messageview.c:325
+#: src/mainwindow.c:758 src/mainwindow.c:765 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:761 src/mainwindow.c:768 src/messageview.c:326
+#: src/mainwindow.c:759 src/mainwindow.c:766 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Podľa _odosielateľa"
 
-#: src/mainwindow.c:763 src/messageview.c:328 src/summaryview.c:446
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "Vytvoriť pravidlo spracovania"
 
-#: src/mainwindow.c:771 src/messageview.c:336
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Zobraziť všetky _URL..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "Ch_eck for new messages in all folders"
 msgstr "Skontrolovať nové správy vo všetkých pri_ečinkoch"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Delete du_plicated messages"
 msgstr "Zmazať du_plikované správy"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "V zvolenej zložke"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "Vo všetkých zložkách"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "Vyko_nať"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "V_ymazať"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "TLS cer_tificates"
 msgstr "Cer_tifikáty TLS"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Záznam _filtra"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Záznam _siete"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "_Ladiaci záznam"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "_Zabudnúť všetky heslá relácie"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Forget _primary passphrase"
 msgstr "Zabudnúť _hlavnú tajnú vetu"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "Z_meniť aktívny účet"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "Nastavenie aktívneho _účtu..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "Vytvoriť _nový účet..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "_Upraviť účty..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "Nas_tavenia..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "Pred-sprac_ovanie..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "Po-spra_covanie..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Filtrovanie..."
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "Ša_blóny..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "_Akcie..."
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "Z_načky..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "Zásuvné _moduly..."
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Manuál"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "_Online používateľské FAQ"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "_Legenda k ikonám"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Nastaviť ako predvoleného klienta"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "Odpojený reži_m"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "Panel nástr_ojov"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "Zobraze_nie správy"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "Stavový ria_dok"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Hlavičky stĺpcov"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "Zobraziť _vlákna"
 
-#: src/mainwindow.c:840 src/prefs_summaries.c:669
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Skryť prečítané vlákna"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "S_kryť prečítané správy"
 
-#: src/mainwindow.c:842 src/prefs_summaries.c:675
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Skryť vymazané správy"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "_Celá obrazovka"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:845 src/messageview.c:349
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Zba_liť všetky"
 
-#: src/mainwindow.c:846 src/messageview.c:350
+#: src/mainwindow.c:844 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "Zbaliť od úrovne _2"
 
-#: src/mainwindow.c:847 src/messageview.c:351
+#: src/mainwindow.c:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Zbaliť od úrovne _3"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Text _pod ikonami"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Text _vedľa ikon"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "Len _ikony"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "Len _text"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "Šta_ndardný"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "_Tri stĺpce"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "Š_iroká správa"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "Široký _zoznam správ"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "_Malá obrazovka"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "Podľa _čísla"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "Podľa _veľkosti"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "Podľa _dátumu"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "Podľa dátumu v_lákna"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "Podľa _predmetu"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "Podľa _farebnej menovky"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "Podľa _značky"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "Podľa _označenia"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "Podľa _stavu"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "Podľa _prílohy"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "Podľa s_kóre"
 
-#: src/mainwindow.c:882
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "Podľa _zamknutia"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "_Neradiť"
 
-#: src/mainwindow.c:887 src/prefs_summaries.c:656
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: src/mainwindow.c:888 src/prefs_summaries.c:657
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Zostupne"
 
-#: src/mainwindow.c:930 src/messageview.c:393
+#: src/mainwindow.c:928 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Automaticky zistiť"
 
-#: src/mainwindow.c:1308 src/summaryview.c:6511
+#: src/mainwindow.c:1306 src/summaryview.c:6511
 msgid "Modify tags..."
 msgstr "Zmeniť značky..."
 
-#: src/mainwindow.c:1966
+#: src/mainwindow.c:1964
 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:1981
+#: src/mainwindow.c:1979
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
-#: src/mainwindow.c:1984
+#: src/mainwindow.c:1982
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
-#: src/mainwindow.c:1998
+#: src/mainwindow.c:1996
 msgid "Select account"
 msgstr "Zvoliť účet"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Záznam komunikácie"
 
-#: src/mainwindow.c:2029
+#: src/mainwindow.c:2027
 msgid "Filtering/Processing debug log"
 msgstr "Záznam ladenia filtrovania/spracovania"
 
-#: src/mainwindow.c:2048 src/prefs_logging.c:378
+#: src/mainwindow.c:2046 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "záznam filtrovania zapnutý\n"
 
-#: src/mainwindow.c:2050 src/prefs_logging.c:380
+#: src/mainwindow.c:2048 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "záznam filtrovania vypnutý\n"
 
-#: src/mainwindow.c:2484 src/mainwindow.c:2491 src/mainwindow.c:2534
-#: src/mainwindow.c:2567 src/mainwindow.c:2599 src/mainwindow.c:2644
+#: src/mainwindow.c:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1149
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:2645 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:2902 src/mainwindow.c:2907
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
-#: src/mainwindow.c:2903
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "Neskončiť"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Pridať poštovú schránku"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7968,18 +8004,18 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, táto bude\n"
 "automaticky prehľadaná."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Schránka „%s” už existuje."
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: src/mainwindow.c:2953 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7988,47 +8024,47 @@ msgstr ""
 "Nemožno vytvoriť schránku.\n"
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte právo zápisu."
 
-#: src/mainwindow.c:3420
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Zlyhal import súboru mbox."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "Zlyhal export do mbox."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Skončiť"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Skončiť Claws Mail?"
 
-#: src/mainwindow.c:4262
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Synchronizácia zložiek"
 
-#: src/mainwindow.c:4263
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať svoje zložky?"
 
-#: src/mainwindow.c:4264
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "_Synchronizovať"
 
-#: src/mainwindow.c:4746
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplicitné správy..."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4754
 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:4762
+#: src/mainwindow.c:4760
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
@@ -8036,7 +8072,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:4766
+#: src/mainwindow.c:4764
 #, 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"
@@ -8044,11 +8080,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:4804
+#: src/mainwindow.c:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Mažem duplicitné správy vo všetkých zložkách..."
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4808
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
@@ -8056,48 +8092,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:4815
+#: src/mainwindow.c:4813
 #, 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:4977 src/messageview.c:2648
+#: src/mainwindow.c:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Zvoľte zložku na prechod"
 
-#: src/mainwindow.c:5080 src/summaryview.c:5952
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracovania použité pred pravidlami zložky"
 
-#: src/mainwindow.c:5088
+#: src/mainwindow.c:5086
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracovania použité po pravidlách zložky"
 
-#: src/mainwindow.c:5096 src/summaryview.c:5963
+#: src/mainwindow.c:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
-#: src/mainwindow.c:5209
+#: src/mainwindow.c:5207
 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:5300
+#: src/mainwindow.c:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail bol zaregistrovaný ako predvolený klient."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5300
 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:5316 src/setup.c:91
+#: src/mainwindow.c:5314 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "Prehľadávanie zložky %s%c%s..."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5458
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8423,7 +8459,7 @@ msgstr ""
 "  Správa bola odstránená alebo presunutá do inej zložky"
 
 #: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4424
-#: src/summaryview.c:7314
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
@@ -8544,8 +8580,8 @@ msgstr "Overovanie podpisu..."
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
-#: src/mimeview.c:1712 src/mimeview.c:1804 src/mimeview.c:2046
-#: src/mimeview.c:2082 src/mimeview.c:2194 src/plugins/fancy/fancy_viewer.c:452
+#: src/mimeview.c:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Nemožno uložiť časť viacdielnej správy: %s"
@@ -8555,28 +8591,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:1815
+#: src/mimeview.c:1816
 #, 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ť?"
+"Pri ukladaní časti správy %d nastala chyba. Chcete zrušiť operáciu alebo "
+"ignorovať chybu a pokračovať?"
 
-#: src/mimeview.c:1818
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
 msgstr "Chyba pri ukladaní všetkých častí správy"
 
-#: src/mimeview.c:1819
-msgid "Skip"
-msgstr "Preskočiť"
+#: src/mimeview.c:1820
+msgid "Ignore"
+msgstr "Ignorovať"
 
-#: src/mimeview.c:1819
-msgid "Skip all"
-msgstr "Preskočiť všetko"
+#: src/mimeview.c:1820
+msgid "Ignore all"
+msgstr "Ignorovať všetko"
 
-#: src/mimeview.c:1829
+#: src/mimeview.c:1832
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
@@ -8584,7 +8620,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:1837
+#: src/mimeview.c:1844
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
@@ -8592,7 +8628,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:1842
+#: src/mimeview.c:1849
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
@@ -8600,26 +8636,26 @@ msgstr[0] "%s, súbor zlyhal."
 msgstr[1] "%s, %d súbory zlyhali."
 msgstr[2] "%s, %d súborov zlyhalo."
 
-#: src/mimeview.c:1875 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1886 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:1882 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1893 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s” nie je zložka."
 
-#: src/mimeview.c:1999 src/plugins/fancy/fancy_viewer.c:708
+#: src/mimeview.c:2011 src/plugins/fancy/fancy_viewer.c:708
 #: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: src/mimeview.c:2129 src/mimeview.c:2136
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:2130 src/mimeview.c:2137
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8628,7 +8664,7 @@ msgstr ""
 "Zadajte príkazový na otvorenie súboru:\n"
 "(„%s” bude nahradené názvom súboru)"
 
-#: src/mimeview.c:2232
+#: src/mimeview.c:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8639,11 +8675,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Spustiť neznámy binárny súbor?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8655,20 +8691,20 @@ msgstr ""
 "\n"
 "Naozaj chcete spustiť tento súbor?"
 
-#: src/mimeview.c:2245
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "Spustiť binárny súbor"
 
-#: src/mimeview.c:2549 src/plugins/att_remover/att_remover.c:303
+#: src/mimeview.c:2561
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/mimeview.c:2550 src/plugins/att_remover/att_remover.c:304
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2789
+#: src/mimeview.c:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/mimeview.c:2564 src/plugins/vcalendar/vcalendar.c:1243
+#: src/mimeview.c:2576 src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
@@ -8779,77 +8815,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 obnovavací 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"
@@ -8864,7 +8900,7 @@ msgstr "Zadajte hlavnú tajnú vetu"
 
 #: src/password.c:141
 msgid "Incorrect primary passphrase."
-msgstr "Nesprávne hlavná tajná vetu."
+msgstr "Nesprávna hlavná tajná veta."
 
 #: src/password_gtk.c:67
 msgid "New passphrases do not match, try again."
@@ -8883,7 +8919,7 @@ msgid ""
 "If a primary passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
-"Ak ste mali nastavenú hlavnú tajnú vetu, je\n"
+"Ak je nastavená hlavná tajná veta, je\n"
 "nutné ju zadať."
 
 #: src/password_gtk.c:175
@@ -9345,7 +9381,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ť"
 
@@ -9518,6 +9554,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:305
+msgid "Filename"
+msgstr "Názov súboru"
+
 #: src/plugins/att_remover/att_remover.c:336
 msgid "Remove attachments"
 msgstr "Odstrániť prílohy"
@@ -9823,7 +9863,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:389 src/prefs_account.c:1718
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1748
 msgid "KiB"
 msgstr "kiB"
 
@@ -10348,7 +10388,7 @@ msgstr "Otvoriť v prehliadači (vzdialený obsah je zapnutý)"
 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:4304
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4360
 #: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Proxy"
@@ -10400,7 +10440,7 @@ msgstr "CSS v tomto súbore bude použité na všetky časti HTML"
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: 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:2510
+#: src/prefs_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "P_rehliadať"
@@ -10726,7 +10766,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:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 msgid "Authentication"
 msgstr "Autentifikácia"
 
@@ -10944,8 +10984,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: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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "hodín"
 
@@ -11134,15 +11174,6 @@ msgstr ""
 "Ak zadáte názov existujúcej schránky, bude\n"
 "táto automaticky prehľadaná."
 
-#: 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 ""
-"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"
@@ -11329,7 +11360,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:1265
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1292
 msgid "Server information"
 msgstr "Informácie o servere"
 
@@ -11381,28 +11412,28 @@ msgstr "Zadať autentifikáciu"
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1487
+#: src/prefs_account.c:2108
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1466
-#: src/prefs_account.c:2095 src/prefs_account.c:3038 src/prefs_account.c:3066
-#: src/prefs_account.c:3263 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
 #: src/wizard.c:1635
 msgid "Password"
 msgstr "Heslo"
 
-#: 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 msgid "Authentication method"
 msgstr "Metóda autentifikácie"
 
-#: 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/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Automatické"
@@ -11419,20 +11450,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 "
@@ -11449,7 +11480,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"
 
@@ -11721,7 +11752,7 @@ msgid "Show banner"
 msgstr "Zobraziť titulkový pruh"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: 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"
@@ -12344,8 +12375,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: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/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minút"
 
@@ -12408,64 +12439,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"
@@ -12947,8 +12978,8 @@ msgstr "Zobraziť konzolu Python..."
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3027
-#: src/prefs_account.c:3055 src/prefs_account.c:3493 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Prechádzať"
@@ -13271,7 +13302,7 @@ msgstr "Sťahovať komentáre príspevkov novšie ako"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1687 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dní"
 
@@ -13417,7 +13448,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)"
 
@@ -13426,7 +13457,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é)"
 
@@ -14114,63 +14145,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"
@@ -14179,21 +14210,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"
@@ -14206,7 +14237,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"
@@ -14217,46 +14248,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"
 
@@ -14732,95 +14763,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:396 src/prefs_account.c:1631 src/prefs_account.c:2955
+#: src/prefs_account.c:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2970
+#: src/prefs_account.c:416 src/prefs_account.c:1804 src/prefs_account.c:3008
 #: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1501
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Žiadne (len SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Názov účtu"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Nastaviť ako predvolené"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1256
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1262
 msgid "Mail address"
 msgstr "Emailová adresa"
 
-#: src/prefs_account.c:1298 src/wizard.c:1524
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Automatická konfigurácia"
 
-#: src/prefs_account.c:1300 src/wizard.c:1525
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14828,81 +14859,81 @@ msgstr ""
 "Varovanie: táto verzia Claws Mail\n"
 "bola zostavená bez podpory protokolu IMAP a News."
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentifikáciu"
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Autentifikovať pri pripojení"
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Lokálna poštová schránka"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1471
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1480
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Lokálne"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 msgid "Default Inbox"
 msgstr "Predvolený inbox"
 
-#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tejto zložke"
 
-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1661
 msgid "Authenticate before POP connection"
 msgstr "Autentifikovať pred pripojením POP"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
 msgid "Select"
 msgstr "Zvoliť"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1696
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na servere po ich prijatí"
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1707
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 dní a 0 hodín: mazať ihneď"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1737
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1740
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14910,94 +14941,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:1750 src/prefs_account.c:2985
+#: src/prefs_account.c:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "neobmedzené, ak je zadané 0"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Prostý text"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "Zložka servera IMAP"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Zobraziť len odoberané zložky"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1864
 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:1833
+#: src/prefs_account.c:1866
 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:1840 src/prefs_receive.c:164
+#: src/prefs_account.c:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Automatická kontrola"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Použiť globálne nastavenia"
 
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Automaticky kontrolovať novú poštu každých"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1921
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1937
 msgid "Allow filtering using plugins on receiving"
 msgstr "Filtrovať správy pri prijatí aj pomocou zásuvných modulov"
 
-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1941
 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:1998 src/prefs_customheader.c:210
+#: src/prefs_account.c:2031 src/prefs_customheader.c:210
 #: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account.c:2000
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2036
 msgid "Send account mail address in Message-ID"
 msgstr "Poslať emailovú adresu účtu v Message-ID"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2039
 msgid "Add user agent header"
 msgstr "Pridať hlavičku „user agent”"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Pridať používateľom definované hlavičky"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentifikácia SMTP (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -15005,216 +15036,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:2138
+#: src/prefs_account.c:2174
 msgid "Authenticate with POP before sending"
 msgstr "Autentifikovať cez POP pred odosielaním"
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "Časový limit autentifikácie POP"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2270
 msgid "Authorization"
 msgstr "Autorizácia"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2287
 msgid "Select OAuth2 Email Service Provider"
 msgstr "Zvoľte Poskytovateľa OAuth2 emailovej služby"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2327
 msgid "Client ID"
 msgstr "ID klienta"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2333
 msgid "Client secret"
 msgstr "Heslo klienta"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2365
 msgid "Obtain authorization code"
 msgstr "Získať autorizačný kód"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2369
 msgid "Open default browser with request"
 msgstr "Otvoriť predvolený prehliadač s požiadavkou"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2375
 msgid "Copy link"
 msgstr "Kopírovať odkaz"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2387
 msgid "Authorization code"
 msgstr "Autorizačný kód"
 
-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2395
 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:2365
+#: src/prefs_account.c:2402
 msgid "Complete authorization"
 msgstr "Dokončiť autorizáciu"
 
-#: src/prefs_account.c:2369
+#: src/prefs_account.c:2406
 msgid "Authorize"
 msgstr "Autororizovať"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2502
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account.c:2459
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
 msgstr "Automaticky vložiť podpis"
 
-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
 msgstr "Slovníky kontroly preklepov"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1176
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Predvolený slovník"
 
-#: src/prefs_account.c:2597 src/prefs_folder_item.c:1210
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Prednastavený alternatívny slovník"
 
-#: src/prefs_account.c:2683 src/prefs_account.c:4166
+#: src/prefs_account.c:2721 src/prefs_account.c:4222
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
 #: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Nová"
 
-#: src/prefs_account.c:2698 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
+#: src/prefs_account.c:2736 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/prefs_account.c:2713 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2751 src/prefs_filtering_action.c:185
 #: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Predvolený systém súkromia"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1250
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
-#: src/prefs_account.c:2791 src/prefs_folder_item.c:1282
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
-#: src/prefs_account.c:2793
+#: src/prefs_account.c:2831
 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:2796
+#: src/prefs_account.c:2834
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2837
 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:2801
+#: src/prefs_account.c:2839
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť odoslané zašifrované správy ako prostý text"
 
-#: src/prefs_account.c:2959 src/prefs_account.c:2974 src/prefs_account.c:2988
+#: src/prefs_account.c:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
 msgid "Don't use TLS"
 msgstr "Nepoužívať TLS"
 
-#: src/prefs_account.c:2962 src/prefs_account.c:2977 src/prefs_account.c:2997
-#: src/prefs_account.c:3008
+#: src/prefs_account.c:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
 msgid "Use TLS"
 msgstr "Použiť TLS"
 
-#: src/prefs_account.c:2965 src/prefs_account.c:2980 src/prefs_account.c:3011
+#: src/prefs_account.c:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Použiť príkaz STARTTLS na vytvorenie šifrovanej relácie"
 
-#: src/prefs_account.c:3001
+#: src/prefs_account.c:3039
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account.c:3005
+#: src/prefs_account.c:3043
 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:3016
+#: src/prefs_account.c:3054
 msgid "Client certificates"
 msgstr "Certifikáty klienta"
 
-#: src/prefs_account.c:3024
+#: src/prefs_account.c:3062
 msgid "Certificate for receiving"
 msgstr "Certifikát na prijímanie"
 
-#: src/prefs_account.c:3029 src/prefs_account.c:3031 src/prefs_account.c:3057
-#: src/prefs_account.c:3059
+#: src/prefs_account.c:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 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:3052
+#: src/prefs_account.c:3090
 msgid "Certificate for sending"
 msgstr "Certifikát na odosielanie"
 
-#: src/prefs_account.c:3092
+#: src/prefs_account.c:3130
 msgid "Automatically accept valid TLS certificates"
 msgstr "Automaticky akceptovať platné certifikáty TLS"
 
-#: src/prefs_account.c:3095
+#: src/prefs_account.c:3133
 msgid "Use non-blocking TLS"
 msgstr "Použiť neblokujúce TLS"
 
-#: src/prefs_account.c:3107
+#: src/prefs_account.c:3145
 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:3199 src/prefs_proxy.c:75
+#: src/prefs_account.c:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Použiť proxy server"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3246
 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:3210
+#: src/prefs_account.c:3248
 msgid "Use global proxy server settings"
 msgstr "Použiť globálne nastavenia proxy servera"
 
-#: src/prefs_account.c:3247 src/prefs_proxy.c:117 src/wizard.c:1119
+#: src/prefs_account.c:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: src/prefs_account.c:3252 src/prefs_proxy.c:125
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Používateľské meno"
 
-#: src/prefs_account.c:3286
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Na odosielanie použiť proxy server"
 
-#: src/prefs_account.c:3288
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15222,27 +15253,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:3400
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "POP port"
 
-#: src/prefs_account.c:3414
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "IMAP port"
 
-#: src/prefs_account.c:3421
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "NNTP port"
 
-#: src/prefs_account.c:3427
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Doménové meno"
 
-#: src/prefs_account.c:3430
+#: src/prefs_account.c:3468
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15250,156 +15281,177 @@ msgstr ""
 "Názov domény bude použitý na generovanie Message-ID, a pri pripájaní k "
 "serverom SMTP."
 
-#: src/prefs_account.c:3444
+#: src/prefs_account.c:3482
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz na komunikáciu so serverom"
 
-#: src/prefs_account.c:3453
+#: src/prefs_account.c:3491
 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:3506
+#: src/prefs_account.c:3544
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account.c:3512
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov účtu."
 
-#: src/prefs_account.c:3573
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná emailová adresa."
 
-#: src/prefs_account.c:3581
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account.c:3586
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "Nebolo zadané ID používateľa."
 
-#: src/prefs_account.c:3591
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "Nebol zadaný POP server."
 
-#: src/prefs_account.c:3611
+#: src/prefs_account.c:3649
 msgid "The default Inbox folder doesn't exist."
 msgstr "Predvolená zložka doručených správ neexistuje."
 
-#: src/prefs_account.c:3617
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "Nebol zadaný IMAP server."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3666
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
-#: src/prefs_account.c:3634
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
-#: src/prefs_account.c:3644
+#: src/prefs_account.c:3682
 msgid "User ID cannot contain a newline character."
 msgstr "ID používateľa nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3651
+#: src/prefs_account.c:3689
 msgid "Password cannot contain a newline character."
 msgstr "Heslo nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3686
+#: src/prefs_account.c:3726
 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:3691
+#: src/prefs_account.c:3731
 msgid "SMTP password cannot contain a newline character."
 msgstr "Heslo SMTP nesmie obsahovať znak nového riadku."
 
-#: src/prefs_account.c:3783
+#: src/prefs_account.c:3826
 msgid "domain is not specified."
 msgstr "nie je zadaná doména."
 
-#: src/prefs_account.c:3788
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "nie je zvolená zložka odoslaných."
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "nie je zvolená zložka fronty."
 
-#: src/prefs_account.c:3798
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "nie je zvolená zložka konceptov."
 
-#: src/prefs_account.c:3803
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "nie je zvolená zložka koša."
 
-#: src/prefs_account.c:4112
+#: src/prefs_account.c:4166
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:4148
+#: src/prefs_account.c:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Odoslať"
+
+#: src/prefs_account.c:4203
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4184 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_account.c:4202
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account.c:4322
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account.c:4682
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Nastavenie nového účtu"
 
-#: src/prefs_account.c:4684
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s – Nastavenie účtu"
 
-#: src/prefs_account.c:4803 src/wizard.c:1389
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Zlyhalo (zlá adresa)"
 
-#: src/prefs_account.c:4888
+#: src/prefs_account.c:4946
 msgid "Select signature file"
 msgstr "Vyberte súbor so podpisom"
 
-#: src/prefs_account.c:4906 src/prefs_account.c:4923 src/wizard.c:1066
+#: src/prefs_account.c:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Zvoľte súbor certifikátu"
 
-#: src/prefs_account.c:5019
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: src/prefs_account.c:5336
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (zásuvný modul nie je načítaný)"
 
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Autorizácia dokončená"
+
+#: src/prefs_account.c:6278
+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:6281
+msgid "Authorisation NOT completed"
+msgstr "Autorizácia nebola dokončená"
+
+#: src/prefs_account.c:6282
+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:227
 msgid "Actions configuration"
 msgstr "Nastavenie akcií"
@@ -15527,15 +15579,15 @@ msgid "Entry not saved"
 msgstr "Záznam nebol uložený"
 
 #: src/prefs_actions.c:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
-#: src/prefs_filtering.c:1531 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Záznam nebol uložený. Zavrieť napriek tomu?"
 
 #: src/prefs_actions.c:922 src/prefs_actions.c:927 src/prefs_actions.c:953
-#: src/prefs_actions.c:1324 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1510 src/prefs_filtering.c:1532
-#: src/prefs_matcher.c:2173 src/prefs_template.c:574 src/prefs_template.c:599
-#: src/prefs_template.c:604
+#: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
+#: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Pokračovať v úprave"
 
@@ -15733,7 +15785,7 @@ msgid "Warn when inserting a file larger than"
 msgstr "Upozorniť pri vložení súboru väčšieho ako"
 
 #: src/prefs_compose_writing.c:208
-msgid "KiB into message body "
+msgid "KiB into message body"
 msgstr "kiB do tela správy"
 
 #: src/prefs_compose_writing.c:214
@@ -15791,63 +15843,67 @@ msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
 #: src/prefs_customheader.c:514
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Dvojbodky (:) nie je vo vlastnej hlavičke povolená."
+
+#: src/prefs_customheader.c:519
 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:561
+#: src/prefs_customheader.c:566
 msgid "Choose a PNG file"
 msgstr "Vyberte súbor PNG"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Vyberte súbor XBM"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Vyberte textový súbor"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Toto nie je obrázkový súbor."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 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:589
+#: src/prefs_customheader.c:594
 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:594
+#: src/prefs_customheader.c:599
 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:603
+#: src/prefs_customheader.c:608
 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:612
+#: src/prefs_customheader.c:617
 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:618
+#: src/prefs_customheader.c:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "Chyba compface: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Tento súbor obsahuje zalomenia riadkov."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Zmazať hlavičku"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 msgid "Do you really want to delete this header?"
 msgstr "Naozaj chcete zmazať túto hlavičku?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:880
 msgid "Current custom headers"
 msgstr "Aktuálne dodatočné hlavičky"
 
@@ -16976,14 +17032,6 @@ msgstr "typ je"
 msgid "Program returns"
 msgstr "Návratová hodnota programu"
 
-#: src/prefs_matcher.c:2171
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"Pravidlo nebolo uložené.\n"
-"Zavrieť napriek tomu?"
-
 #: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Typ zhody: „Test”"
@@ -17752,8 +17800,8 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá, keď bude "
 "správa obsahovať iné znaky ako 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:420 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Odosielanie"
 
@@ -18920,88 +18968,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"
@@ -19462,7 +19510,7 @@ msgstr "Zašifrované"
 msgid "Has attachment(s)"
 msgstr "Má prílohu(y)"
 
-#: src/summaryview.c:8321
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19471,11 +19519,11 @@ msgstr ""
 "Chyba v regulárnom výraze:\n"
 "%s"
 
-#: src/summaryview.c:8424
+#: src/summaryview.c:8428
 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:8429
+#: src/summaryview.c:8433
 msgid "Go back to the folder list"
 msgstr "Prejsť naspäť na zoznam zložiek"
 
@@ -20321,3 +20369,87 @@ msgid ""
 msgstr ""
 "Program Claws Mail je pripravený.\n"
 "Kliknite na Uložiť a začnite."
+
+#, 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"
+
+#~ 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 ""
+#~ "The entry was not saved.\n"
+#~ "Close anyway?"
+#~ msgstr ""
+#~ "Pravidlo nebolo uložené.\n"
+#~ "Zavrieť napriek tomu?"
+
+#~ 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 "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 "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á."
+
+#~ msgid "Available URLs:"
+#~ msgstr "Dostupné linky:"
+
+#~ msgid "Please select the URL to open."
+#~ msgstr "Prosím zvoľte linku."
+
+#~ 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..a56700c9d 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-11 14:18+0200\n"
+"PO-Revision-Date: 2022-10-11 14:52+0200\n"
 "Last-Translator: Andreas Rönnquist <andreas at ronnquist.net>\n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
@@ -20,9 +20,9 @@ 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
+#: src/account.c:403 src/account.c:470
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -30,15 +30,15 @@ msgstr ""
 "Det finns något \"Skriv meddelande\"-fönster öppet.\n"
 "Stäng alla \"Skriv meddelande\"-fönster innan du redigerar konton."
 
-#: src/account.c:447
+#: src/account.c:448
 msgid "Can't create folder."
 msgstr "Kan inte skapa mapp."
 
-#: src/account.c:735
+#: src/account.c:738
 msgid "Edit accounts"
 msgstr "Redigera konton"
 
-#: src/account.c:752
+#: src/account.c:755
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -48,61 +48,85 @@ msgstr ""
 "listan, kryssrutan indikerar vilka konton som kommer att inkluderas. Fet "
 "stil anger standardkontot."
 
-#: src/account.c:823
+#: src/account.c:789
+msgid "Create a new account"
+msgstr "Skapa ett nytt konto"
+
+#: src/account.c:797
+msgid "Edit preferences for the selected account"
+msgstr "Redigera inställningar för valt konto"
+
+#: src/account.c:805
+msgid "Delete the selected account from the list"
+msgstr "Ta bort det valda kontot från listan"
+
+#: src/account.c:813
+msgid "Create a new copy of the selected account"
+msgstr "Skapa en ny kopia av det valda kontot"
+
+#: src/account.c:821
+msgid "Move the selected account down"
+msgstr "Flytta ner valt konto"
+
+#: src/account.c:829
+msgid "Move the selected account up"
+msgstr "Flytta upp valt konto"
+
+#: src/account.c:836
 msgid " _Set as default account "
 msgstr " _Sätt som standardkonto "
 
-#: src/account.c:915
+#: src/account.c:928
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Konton med fjärrmappar kan inte kopieras."
 
-#: src/account.c:922
+#: src/account.c:935
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopia av %s"
 
-#: src/account.c:1125
+#: src/account.c:1139
 #, 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:1141
 msgid "(Untitled)"
 msgstr "(Ingen titel)"
 
-#: src/account.c:1128
+#: src/account.c:1142
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: src/account.c:1602
+#: src/account.c:1616
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "H"
 
-#: src/account.c:1608
+#: src/account.c:1622
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hämta e-post' hämtar e-post från valda e-postkonton"
 
-#: src/account.c: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/account.c:1629 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7523 src/editaddress.c:1477
+#: src/editaddress.c:1506 src/editaddress.c:1522
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
-#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
-#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
-#: src/prefs_themes.c:990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1851
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
+#: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
+#: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "Namn"
 
-#: src/account.c:1623 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1645 src/ssl_manager.c:109
 msgid "Server"
 msgstr "Server"
 
@@ -142,7 +166,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 +177,36 @@ 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:5305 src/compose.c:5310 src/compose.c:9744
+#: src/compose.c:9783 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:1395
 msgid "Completed"
 msgstr "Färdigt"
 
-#: src/action.c:1254
+#: src/action.c:1259
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Kör: %s\n"
 
-#: src/action.c:1258
+#: src/action.c:1263
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Avslutades: %s\n"
 
-#: src/action.c:1304
+#: src/action.c:1309
 msgid "Action's input/output"
 msgstr "Aktivitets in/ut data"
 
-#: src/action.c:1636
+#: src/action.c:1647
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -192,11 +217,11 @@ msgstr ""
 "('%%h' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1641
+#: src/action.c:1652
 msgid "Action's hidden user argument"
 msgstr "Aktivitets gömda användarargument"
 
-#: src/action.c:1645
+#: src/action.c:1656
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -207,24 +232,24 @@ msgstr ""
 "('%%u' kommer att ersättas av argumentet)\n"
 "  %s"
 
-#: src/action.c:1650
+#: src/action.c:1661
 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/addr_compl.c:699 src/addressbook.c:5007
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "Grupp"
@@ -297,15 +322,15 @@ 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
+#: src/addrcustomattr.c:217 src/addressbook.c:432 src/addressbook.c:457
+#: src/addressbook.c:474 src/edittags.c:298
+#: src/plugins/archive/archiver_gtk.c:1310 src/prefs_actions.c:1112
+#: src/prefs_filtering.c:1704 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:218 src/edittags.c:299 src/prefs_actions.c:1113
+#: src/prefs_filtering.c:1705 src/prefs_template.c:1113
 msgid "Delete _all"
 msgstr "Ta bort _alla"
 
@@ -313,20 +338,20 @@ msgstr "Ta bort _alla"
 msgid "_Reset to default"
 msgstr "_Återställ till standardval"
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:411
 msgid "Attribute name is not set."
 msgstr "Attributnamn är inte angivet."
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:470
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "Ändra attributnamn"
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:484
 msgid "New attribute name:"
 msgstr "Nytt attributnamn:"
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:521
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -361,8 +386,8 @@ 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/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:480
+#: src/toolbar.c:540
 msgid "Address"
 msgstr "Adress"
 
@@ -370,11 +395,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:1431 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,7 +407,7 @@ 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:1432
 msgid "This address data is read-only and cannot be deleted."
 msgstr "Adressdatan är skrivskyddad och kan därför inte tas bort."
 
@@ -394,8 +419,8 @@ msgstr "Lägg till i adressboken"
 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:246 src/addressbook.c:130 src/editaddress.c:1260
+#: src/editaddress.c:1304 src/editgroup.c:292
 msgid "Remarks"
 msgstr "Kommentarer"
 
@@ -403,265 +428,265 @@ msgstr "Kommentarer"
 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:3254 src/addressbook.c:3305
 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:4995 src/editaddress.c:1249
+#: src/editaddress.c:1287 src/editgroup.c:291 src/expldifdlg.c:517
+#: 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
+#: src/addressbook.c:401 src/addressbook.c:431 src/addressbook.c:456
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
+#: src/messageview.c:213 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:625 src/mainwindow.c:525
+#: 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:637
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "_Spara"
 
-#: src/addressbook.c:427 src/compose.c:635 src/messageview.c:225
+#: src/addressbook.c:422 src/compose.c:641 src/messageview.c:226
 #: 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/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: 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:650 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:411
+#: src/plugins/vcalendar/month-view.c:427 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:643 src/prefs_other.c:493
+#: src/toolbar.c:272 src/toolbar.c:2563
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:1109 src/editldap.c:794
+#: src/addressbook.c:1104 src/editldap.c:794
 msgid "Search"
 msgstr "Sök"
 
-#: src/addressbook.c:1481
+#: src/addressbook.c:1476
 msgid "Delete group"
 msgstr "Ta bort grupp"
 
-#: src/addressbook.c:1482
+#: src/addressbook.c:1477
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -669,26 +694,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:2204
 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:2214
 msgid "Cannot paste into an address group."
 msgstr "Kan inte klistra in i en adressgrupp."
 
-#: src/addressbook.c:2956
+#: src/addressbook.c:2951
 #, 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:2954 src/addressbook.c:2980 src/addressbook.c:2987
+#: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:173
+#: 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 +722,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:333 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:2967
 msgid "Delete folder and _addresses"
 msgstr "Ta bort mapp och _adresser"
 
-#: src/addressbook.c:2983
+#: src/addressbook.c:2978
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -719,7 +744,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:2985
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -728,28 +753,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:3099
 #, c-format
 msgid "Search '%s'"
 msgstr "Sök '%s'"
 
-#: src/addressbook.c:3242 src/addressbook.c:3291
+#: src/addressbook.c:3237 src/addressbook.c:3286
 msgid "New Contacts"
 msgstr "Ny Kontakt"
 
-#: src/addressbook.c:4128
+#: src/addressbook.c:4125
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara innehållsfil."
 
-#: src/addressbook.c:4132
+#: src/addressbook.c:4129
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:4142
+#: src/addressbook.c:4139
 msgid "Old address book converted successfully."
 msgstr "Gammal adressbok framgångsrikt konverterad."
 
-#: src/addressbook.c:4147
+#: src/addressbook.c:4144
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -757,7 +782,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil."
 
-#: src/addressbook.c:4160
+#: src/addressbook.c:4157
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -765,7 +790,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:4166
+#: src/addressbook.c:4163
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -773,7 +798,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa ny adressindexfil."
 
-#: src/addressbook.c:4171
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -781,57 +806,57 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:4178 src/addressbook.c:4184
+#: src/addressbook.c:4175 src/addressbook.c:4181
 msgid "Addressbook conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:4299
+#: src/addressbook.c:4296
 msgid "Addressbook Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:4300
+#: src/addressbook.c:4297
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:4631
+#: src/addressbook.c:4629
 msgid "Busy searching..."
 msgstr "Upptagen med att söka..."
 
-#: src/addressbook.c:4961 src/prefs_send.c:220
+#: src/addressbook.c:4959 src/prefs_send.c:220
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:4973
+#: src/addressbook.c:4971
 msgid "Address Books"
 msgstr "Adressböcker"
 
-#: src/addressbook.c:4985
+#: src/addressbook.c:4983
 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:5019 src/exporthtml.c:881 src/folderview.c:362
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:5033
+#: src/addressbook.c:5031
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5045 src/addressbook.c:5057
+#: src/addressbook.c:5043 src/addressbook.c:5055
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5069
+#: src/addressbook.c:5067
 msgid "LDAP servers"
 msgstr "LDAP-servrar"
 
-#: src/addressbook.c:5081
+#: src/addressbook.c:5079
 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/exporthtml.c:981 src/importldif.c:541
 msgid "Address Book"
 msgstr "Adressbok"
 
@@ -933,27 +958,27 @@ 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:141 src/compose.c:9866 src/mimeview.c:1836
 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:154 src/compose.c:5895 src/compose.c:6444
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 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:167 src/alertpanel.c:190 src/compose.c:5836 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:191 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "_Visa logg"
 
-#: src/alertpanel.c:346
+#: src/alertpanel.c:343
 msgid "Show this message next time"
 msgstr "Visa detta meddelande nästa gång"
 
@@ -1006,14 +1031,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 +1046,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 +1073,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 +1081,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:86
+#: src/gtk/sslcertwindow.c:93 src/gtk/sslcertwindow.c:108
+#: src/gtk/sslcertwindow.c:113 src/gtk/sslcertwindow.c:120
+#: src/gtk/sslcertwindow.c:135
 msgid "<not in certificate>"
 msgstr "<inte i certifikat>"
 
@@ -1211,237 +1236,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:197
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1453,372 +1478,372 @@ msgstr ""
 "\n"
 "Signering och kryptering har inaktiverats för detta meddelande."
 
-#: src/compose.c:603
+#: src/compose.c:609
 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:610 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:360
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: src/compose.c:606 src/folderview.c:254
+#: src/compose.c:612 src/folderview.c:255
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: src/compose.c:613 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: src/compose.c:616
+#: src/compose.c:622
 msgid "_Spelling"
 msgstr "_Stavning"
 
-#: src/compose.c:618 src/compose.c:685
+#: src/compose.c:624 src/compose.c:691
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: src/compose.c:620 src/mainwindow.c:528 src/messageview.c:216
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: src/compose.c:622
+#: src/compose.c:628
 msgid "S_end"
 msgstr "Skicka"
 
-#: src/compose.c:623
+#: src/compose.c:629
 msgid "Send _later"
 msgstr "Skicka senare"
 
-#: src/compose.c:626
+#: src/compose.c:632
 msgid "_Attach file"
 msgstr "_Bifoga fil"
 
-#: src/compose.c:627
+#: src/compose.c:633
 msgid "_Insert file"
 msgstr "_Infoga fil"
 
-#: src/compose.c:628
+#: src/compose.c:634
 msgid "Insert si_gnature"
 msgstr "Infoga si_gnatur"
 
-#: src/compose.c:629
+#: src/compose.c:635
 msgid "_Replace signature"
 msgstr "E_rsätt signatur"
 
-#: src/compose.c:633
+#: src/compose.c:639
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:644 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:645 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:648 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: src/compose.c:646
+#: src/compose.c:652
 msgid "_Special paste"
 msgstr "Klistra in _special"
 
-#: src/compose.c:647
+#: src/compose.c:653
 msgid "As _quotation"
 msgstr "Som _citat"
 
-#: src/compose.c:648
+#: src/compose.c:654
 msgid "_Wrapped"
 msgstr "_Radbruten"
 
-#: src/compose.c:649
+#: src/compose.c:655
 msgid "_Unwrapped"
 msgstr "Ej radbr_uten"
 
-#: src/compose.c:651 src/mainwindow.c:558
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Markera _alla"
 
-#: src/compose.c:653
+#: src/compose.c:659
 msgid "A_dvanced"
 msgstr "Avancerat"
 
-#: src/compose.c:654
+#: src/compose.c:660
 msgid "Move a character backward"
 msgstr "Flytta ett tecken bakåt"
 
-#: src/compose.c:655
+#: src/compose.c:661
 msgid "Move a character forward"
 msgstr "Flytta ett tecken framåt"
 
-#: src/compose.c:656
+#: src/compose.c:662
 msgid "Move a word backward"
 msgstr "Flytta ett ord bakåt"
 
-#: src/compose.c:657
+#: src/compose.c:663
 msgid "Move a word forward"
 msgstr "Flytta ett ord framåt"
 
-#: src/compose.c:658
+#: src/compose.c:664
 msgid "Move to beginning of line"
 msgstr "Flytta till början av rad"
 
-#: src/compose.c:659
+#: src/compose.c:665
 msgid "Move to end of line"
 msgstr "Flytta till slutet på rad"
 
-#: src/compose.c:660
+#: src/compose.c:666
 msgid "Move to previous line"
 msgstr "Flytta till föregående rad"
 
-#: src/compose.c:661
+#: src/compose.c:667
 msgid "Move to next line"
 msgstr "Flytta till nästa rad"
 
-#: src/compose.c:662
+#: src/compose.c:668
 msgid "Delete a character backward"
 msgstr "Ta bort ett tecken bakåt"
 
-#: src/compose.c:663
+#: src/compose.c:669
 msgid "Delete a character forward"
 msgstr "Ta bort ett tecken framåt"
 
-#: src/compose.c:664
+#: src/compose.c:670
 msgid "Delete a word backward"
 msgstr "Ta bort ett ord bakåt"
 
-#: src/compose.c:665
+#: src/compose.c:671
 msgid "Delete a word forward"
 msgstr "Ta bort ett ord framåt"
 
-#: src/compose.c:666
+#: src/compose.c:672
 msgid "Delete line"
 msgstr "Ta bort rad"
 
-#: src/compose.c:667
+#: src/compose.c:673
 msgid "Delete to end of line"
 msgstr "Ta bort till slutet av raden"
 
-#: src/compose.c:670 src/messageview.c:231
+#: src/compose.c:676 src/messageview.c:232
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "_Sök"
 
-#: src/compose.c:673
+#: src/compose.c:679
 msgid "_Wrap current paragraph"
 msgstr "Radbryt _stycke"
 
-#: src/compose.c:674
+#: src/compose.c:680
 msgid "Wrap all long _lines"
 msgstr "Radbryt alla _långa rader"
 
-#: src/compose.c:676
+#: src/compose.c:682
 msgid "Edit with e_xternal editor"
 msgstr "Redigera med e_xtern redigerare"
 
-#: src/compose.c:679
+#: src/compose.c:685
 msgid "_Check all or check selection"
 msgstr "_Kontrollera alla eller kontrollera markering"
 
-#: src/compose.c:680
+#: src/compose.c:686
 msgid "_Highlight all misspelled words"
 msgstr "_Markera alla felstavade ord"
 
-#: src/compose.c:681
+#: src/compose.c:687
 msgid "Check _backwards misspelled word"
 msgstr "Kontrollera felstavade ord _bakåt"
 
-#: src/compose.c:682
+#: src/compose.c:688
 msgid "_Forward to next misspelled word"
 msgstr "_Hoppa till nästa felstavade ord"
 
-#: src/compose.c:689
+#: src/compose.c:695
 msgid "Reply _mode"
 msgstr "_Svarsläge"
 
-#: src/compose.c:691
+#: src/compose.c:697
 msgid "Privacy _System"
 msgstr "Sekretess_system"
 
-#: src/compose.c:695
+#: src/compose.c:701
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: src/compose.c:697 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "_Teckenkodning"
 
-#: src/compose.c:702 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:708 src/mainwindow.c:624 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:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: src/compose.c:704 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: src/compose.c:705 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arabiska"
 
-#: src/compose.c:706 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:712 src/mainwindow.c:628 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:713 src/mainwindow.c:629 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:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: src/compose.c:709 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Koreanska"
 
-#: src/compose.c:710 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Thai"
 
-#: src/compose.c:713 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adressbok"
 
-#: src/compose.c:715
+#: src/compose.c:721
 msgid "_Template"
 msgstr "_Mall"
 
-#: src/compose.c:717 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "Aktiviteter"
 
-#: src/compose.c:721 src/mainwindow.c:825 src/messageview.c:340
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "_Om"
 
-#: src/compose.c:726
+#: src/compose.c:732
 msgid "Aut_o wrapping"
 msgstr "Automatiskt radbrytning"
 
-#: src/compose.c:727
+#: src/compose.c:733
 msgid "Auto _indent"
 msgstr "Automatiskt _indrag"
 
-#: src/compose.c:728
+#: src/compose.c:734
 msgid "Si_gn"
 msgstr "Signera"
 
-#: src/compose.c:729
+#: src/compose.c:735
 msgid "_Encrypt"
 msgstr "Kryptera"
 
-#: src/compose.c:730
+#: src/compose.c:736
 msgid "_Request Return Receipt"
 msgstr "Begär läskvitto"
 
-#: src/compose.c:731
+#: src/compose.c:737
 msgid "Remo_ve references"
 msgstr "Ta b_ort referenser"
 
-#: src/compose.c:732
+#: src/compose.c:738
 msgid "Show _ruler"
 msgstr "Visa linjal"
 
-#: src/compose.c:737 src/compose.c:747
+#: src/compose.c:743 src/compose.c:753
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:738 src/mainwindow.c:674 src/messageview.c:305
-#: src/summaryview.c:433
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
+#: src/summaryview.c:434
 msgid "_All"
 msgstr "_Alla"
 
-#: src/compose.c:739 src/mainwindow.c:675 src/messageview.c:306
-#: src/summaryview.c:434
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
+#: src/summaryview.c:435
 msgid "_Sender"
 msgstr "Av_sändare"
 
-#: src/compose.c:740
+#: src/compose.c:746
 msgid "_Mailing-list"
 msgstr "_Sändlista"
 
-#: src/compose.c:745
+#: src/compose.c:751
 msgid "_Highest"
 msgstr "_Högsta"
 
-#: src/compose.c:746
+#: src/compose.c:752
 msgid "Hi_gh"
 msgstr "Hö_g"
 
-#: src/compose.c:748
+#: src/compose.c:754
 msgid "Lo_w"
 msgstr "L_åg"
 
-#: src/compose.c:749
+#: src/compose.c:755
 msgid "_Lowest"
 msgstr "_Lägsta"
 
-#: src/compose.c:754 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Automatiskt"
 
-#: src/compose.c:755 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:761 src/mainwindow.c:892 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:762 src/mainwindow.c:893 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:766 src/mainwindow.c:897 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:769 src/mainwindow.c:900 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:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:1055
+#: src/compose.c:1061
 msgid "New message From format error."
 msgstr "Nytt meddelande Från-formatfel."
 
-#: src/compose.c:1148
+#: src/compose.c:1154
 msgid "New message subject format error."
 msgstr "Nytt meddelande ärende-formatfel."
 
-#: src/compose.c:1180 src/quote_fmt.c:563
+#: src/compose.c:1186 src/quote_fmt.c:563
 #, 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:1455
 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:1640 src/quote_fmt.c:580
 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:1689 src/quote_fmt.c:583
 #, 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:1830 src/compose.c:2031 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
@@ -1826,56 +1851,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:1891 src/quote_fmt.c:603
 #, 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:2074
 msgid "Fw: multiple emails"
 msgstr "Vb: många meddelande"
 
-#: src/compose.c:2577
+#: src/compose.c:2596
 #, 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:2667 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/compose.c:2651 src/gtk/headers.h:15
+#: src/compose.c:2670 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: src/compose.c:2654 src/gtk/headers.h:12
+#: src/compose.c:2673 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:2676 src/compose.c:5054 src/compose.c:5056
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: src/compose.c:2660 src/gtk/headers.h:34
+#: src/compose.c:2679 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "Uppföljning Till:"
 
-#: src/compose.c:2663 src/gtk/headers.h:17
+#: src/compose.c:2682 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/compose.c:2686 src/compose.c:5051 src/compose.c:5059
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "Till:"
 
-#: src/compose.c:2857
+#: src/compose.c:2876
 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:2882
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1890,16 +1915,16 @@ msgstr[1] ""
 "Följande filer har bifogats: \n"
 "%s"
 
-#: src/compose.c:3143
+#: src/compose.c:3162
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "\"Citattecknen\" av mallen är ogiltiga."
 
-#: src/compose.c:3672
+#: src/compose.c:3695
 #, 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:3713
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
@@ -1907,57 +1932,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:3716
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: src/compose.c:3694 src/compose.c:10859 src/compose.c:11753
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: src/compose.c:3819
+#: src/compose.c:3842
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:3820
+#: src/compose.c:3843
 msgid "Empty file"
 msgstr "Tom fil"
 
-#: src/compose.c:3821
+#: src/compose.c:3844
 msgid "_Attach anyway"
 msgstr "Bifog_a ändå"
 
-#: src/compose.c:3830
+#: src/compose.c:3853
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan inte läsa %s."
 
-#: src/compose.c:3857
+#: src/compose.c:3880
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:4867 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4895 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:4874 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4902 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:4905 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:4907 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "Skriv meddelande"
 
-#: src/compose.c:4906 src/messageview.c:887
+#: src/compose.c:4934 src/messageview.c:892
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1965,59 +1990,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:5151 src/compose.c:5188
 #, 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:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
+#: 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:5155 src/compose.c:5192 src/compose.c:5229 src/compose.c:5272
+#: src/compose.c:5837 src/folderview.c:2553 src/messageview.c:864
+#: src/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3107
 msgid "_Send"
 msgstr "_Skicka"
 
-#: src/compose.c:5181
+#: src/compose.c:5209
 msgid "Recipient is not specified."
 msgstr "Mottagare har inte specificerats."
 
-#: src/compose.c:5196
+#: src/compose.c:5224
 #, 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:5225 src/compose.c:5268
+#: 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:5226 src/compose.c:5269
+#: 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:5228 src/compose.c:5271 src/toolbar.c:531
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:5201 src/compose.c:5244
+#: src/compose.c:5229 src/compose.c:5272
 msgid "_Queue"
 msgstr "_Kö"
 
-#: src/compose.c:5239
+#: src/compose.c:5267
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "Skickar till %d mottagare. %s"
 
-#: src/compose.c:5268
+#: src/compose.c:5296
 msgid "Could not queue message."
 msgstr "Kunde inte köa meddelandet."
 
-#: src/compose.c:5271
+#: src/compose.c:5299
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2028,7 +2056,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:5275
+#: src/compose.c:5303
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2039,7 +2067,7 @@ msgstr ""
 "\n"
 "Signeringsfel: %s"
 
-#: src/compose.c:5280
+#: src/compose.c:5308
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2050,7 +2078,7 @@ msgstr ""
 "\n"
 "Kryptering misslyckades: %s"
 
-#: src/compose.c:5285
+#: src/compose.c:5313
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2060,7 +2088,7 @@ msgstr ""
 "\n"
 "Fel vid omvandling av teckenuppsättning."
 
-#: src/compose.c:5289
+#: src/compose.c:5317
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -2070,7 +2098,7 @@ msgstr ""
 "\n"
 "Kunde inte få tag i mottagarens krypteringsnyckel."
 
-#: src/compose.c:5352 src/compose.c:5412
+#: src/compose.c:5380 src/compose.c:5440
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2078,7 +2106,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:5436
 #, c-format
 msgid ""
 "%s\n"
@@ -2087,7 +2115,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:5833
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2098,7 +2126,7 @@ msgstr ""
 "till den specificerade %s kodningen.\n"
 "Skicka som det %s?"
 
-#: src/compose.c:5867
+#: src/compose.c:5891
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2111,98 +2139,100 @@ msgstr ""
 "\n"
 "Skicka ändå?"
 
-#: src/compose.c:6102
+#: src/compose.c:6130
 msgid "Encryption warning"
 msgstr "Varning om kryptering"
 
-#: src/compose.c:6103
+#: src/compose.c:6131
 msgid "C_ontinue"
 msgstr "F_ortsätt"
 
-#: src/compose.c:6152
+#: src/compose.c:6180
 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:6189
 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:6443
 #, 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:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Avbryt sändning"
 
-#: src/compose.c:6417
+#: src/compose.c:6445
 msgid "Ignore attachment"
 msgstr "Ignorera bilaga"
 
-#: src/compose.c:6473
+#: src/compose.c:6501
 #, c-format
 msgid "Original %s part"
 msgstr "Ursprunglig %s del"
 
-#: src/compose.c:7073
+#: src/compose.c:7108
 msgid "Add to address _book"
 msgstr "Lägg till i adress_boken"
 
-#: src/compose.c:7240
+#: src/compose.c:7275
 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:7279 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 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:7511
 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:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:7544
+#: src/compose.c:7579
 msgid "Save Message to "
 msgstr "Spara meddelande i "
 
-#: src/compose.c:7575 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7610 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/importpine.c:238 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
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: src/compose.c:7591
+#: src/compose.c:7626
 msgid "Select folder to save message to"
 msgstr "Välj mapp att spara meddelande till"
 
-#: src/compose.c:8048
+#: src/compose.c:8083
 msgid "Hea_der"
 msgstr "Brevhuvud"
 
-#: src/compose.c:8053
+#: src/compose.c:8088
 msgid "_Attachments"
 msgstr "Bilagor"
 
-#: src/compose.c:8067
+#: src/compose.c:8102
 msgid "Othe_rs"
 msgstr "Öv_rigt"
 
-#: src/compose.c:8082
+#: src/compose.c:8117
 msgid "S_ubject:"
 msgstr "Ämne:"
 
-#: src/compose.c:8306
+#: src/compose.c:8341
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2211,19 +2241,19 @@ msgstr ""
 "Felstavningsprogram kunde inte starta.\n"
 "%s"
 
-#: src/compose.c:8453
+#: src/compose.c:8488
 msgid "_From:"
 msgstr "_Från:"
 
-#: src/compose.c:8470
+#: src/compose.c:8505
 msgid "Account to use for this email"
 msgstr "Konto att använda för denna e-post"
 
-#: src/compose.c:8472
+#: src/compose.c:8507
 msgid "Sender address to be used"
 msgstr "Avsändaradress att användas"
 
-#: src/compose.c:8654
+#: src/compose.c:8689
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
@@ -2232,75 +2262,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:8800 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
 msgstr "Ingen"
 
-#: src/compose.c:8866 src/prefs_template.c:752
+#: src/compose.c:8901 src/prefs_template.c:752
 #, 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:8998
 #, 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:9423
 msgid "Invalid MIME type."
 msgstr "Felaktig MIME-typ."
 
-#: src/compose.c:9402
+#: src/compose.c:9438
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:9476
+#: src/compose.c:9512
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:9494
+#: src/compose.c:9530
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: src/compose.c:9527
+#: src/compose.c:9563
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:9547
+#: src/compose.c:9583
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:9548
+#: src/compose.c:9584
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:9807
+#: src/compose.c:9680
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+"Kunde inte skriva brödtexten till fil:\n"
+"%s"
+
+#: src/compose.c:9709
+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:9742
+#, c-format
+msgid ""
+"Could not spawn the following external editor command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Kunde inte förgrena för att exekvera följande kommando i extern editor:\n"
+"%s\n"
+"%s"
+
+#: src/compose.c:9782
+#, c-format
+msgid "External editor stopped with an error: %s"
+msgstr "Extern redigerare stoppade med ett fel: %s"
+
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "processid: %"
+
+#: src/compose.c:9858
+#, c-format
+msgid "process id: %d"
+msgstr "processid: %d"
+
+#: src/compose.c:9863
 #, 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:10273 src/messageview.c:1095
 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:10476
 msgid "Could not save draft."
 msgstr "Kunde inte spara utkast."
 
-#: src/compose.c:10477
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "Kunde inte spara utkast"
 
-#: src/compose.c:10478
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2308,24 +2379,24 @@ msgstr ""
 "Kunde inte spara utkast.\n"
 "Vill du avbryta avsluta eller kasta denna e-post?"
 
-#: src/compose.c:10480
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "_Avbryt avslutande"
 
-#: src/compose.c:10480
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "_Överge e-post"
 
-#: src/compose.c:10669 src/compose.c:10683
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:10697
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Filen '%s' kunde inte läsas."
 
-#: src/compose.c:10699
+#: src/compose.c:10704
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2334,50 +2405,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:10781
 msgid "Discard message"
 msgstr "Överge meddelande"
 
-#: src/compose.c:10779
+#: src/compose.c:10782
 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:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Överge"
 
-#: src/compose.c:10780 src/compose.c:10785
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "_Spara till Utkast"
 
-#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: src/compose.c:10784
+#: src/compose.c:10787
 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:10788
 msgid "_Don't save"
 msgstr "_Spara inte"
 
-#: src/compose.c:10856
+#: src/compose.c:10859
 #, 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:10861
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:10859 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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/prefs_toolbar.c:1019
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:11746
+#: src/compose.c:10938
+#, 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:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2392,20 +2472,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:11761
 msgid "Insert or attach?"
 msgstr "Infoga eller bifoga?"
 
-#: src/compose.c:11753
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:11971
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "Citatformatfel på rad %d."
 
-#: src/compose.c:12267
+#: src/compose.c:12276
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2419,11 +2499,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 +2512,23 @@ 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/toolbar.c:550
 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"
 
@@ -2516,7 +2596,7 @@ msgstr "En e-postadress måste anges."
 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:1857
 msgid "Discard"
 msgstr "_Överge"
 
@@ -2524,15 +2604,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,58 +2621,58 @@ 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:1051
 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:1098 src/editaddress.c:1100 src/expldifdlg.c:516
+#: 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:1109 src/editaddress.c:1113 src/ldif.c:759
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
+#: src/editaddress.c:1110 src/editaddress.c:1112 src/ldif.c:755
 msgid "First Name"
 msgstr "Förnamn"
 
-#: src/editaddress.c:1115 src/editaddress.c:1117
+#: src/editaddress.c:1116 src/editaddress.c:1118
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: src/editaddress.c:1253 src/editaddress.c:1294
+#: src/editaddress.c:1255 src/editaddress.c:1296
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
+#: src/editaddress.c:1482 src/editaddress.c:1515 src/editaddress.c:1531
 #: src/editaddress_other_attributes_ldap.c:376
 #: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
 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"
@@ -2622,8 +2702,8 @@ 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/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
+#: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Fil"
 
@@ -2639,7 +2719,7 @@ msgstr "Ett gruppnamn måste anges."
 msgid "Edit Group Data"
 msgstr "Redigera gruppdata"
 
-#: src/editgroup.c:326 src/exporthtml.c:598
+#: src/editgroup.c:326 src/exporthtml.c:594
 msgid "Group Name"
 msgstr "Gruppnamn"
 
@@ -2671,13 +2751,13 @@ msgstr "Redigera mapp"
 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:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c: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:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:130
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2705,14 +2785,14 @@ msgstr "Lägg till nytt JPilotfält"
 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:173 src/editldap.c:441 src/prefs_account.c:3268
+#: 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/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
+#: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
 
@@ -2772,9 +2852,9 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:470 src/prefs_account.c:3831
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#: src/editldap.c:470 src/prefs_account.c:4277
+msgid "TLS"
+msgstr "TLS"
 
 #: src/editldap.c:474
 msgid ""
@@ -2790,13 +2870,13 @@ msgstr ""
 
 #: src/editldap.c:479
 msgid ""
-"Enable secure connection to the LDAP server via SSL/TLS. If connection "
-"fails, be sure to check the correct configuration in ldap.conf "
-"(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
 msgid "The port number that the server listens on. Port 389 is the default."
@@ -2935,13 +3015,13 @@ msgstr "Bindlösenord"
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "Lösenord som ska användas vid anslutning som \"Bind DN\" användaren."
 
-#: src/editldap.c: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:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
+#: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Visa lösenord"
 
-#: src/editldap.c:748
+#: src/editldap.c:748 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout (secs)"
 msgstr "Väntetid (sek.)"
 
@@ -2958,11 +3038,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Maximalt antal poster som ska returneras i sökresultatet."
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr "Utökat"
 
@@ -2970,48 +3050,61 @@ msgstr "Utökat"
 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:136
+msgctxt "Window title"
+msgid "Tags configuration"
+msgstr "Etikettkonfiguration"
+
+#: src/edittags.c:141
+msgctxt "Window title"
+msgid "Modify tags"
+msgstr "Redigera etiketter"
+
+#: src/edittags.c:204 src/prefs_filtering_action.c:1403
+#: src/prefs_summaries.c:642
 msgid "Tag"
 msgstr "Etikett"
 
-#: src/edittags.c:221
+#: src/edittags.c:233
 msgid "Delete tag"
 msgstr "Ta bort etikett"
 
-#: src/edittags.c:222
+#: src/edittags.c:234
 msgid "Do you really want to delete this tag?"
 msgstr "Vill du verkligen ta bort denna etikett?"
 
-#: src/edittags.c:257
+#: src/edittags.c:269
 msgid "Delete all tags"
 msgstr "Ta bort alla etiketter"
 
-#: src/edittags.c:258
+#: src/edittags.c:270
 msgid "Do you really want to delete all tags?"
 msgstr "Vill du verkligen ta bort alla etiketter?"
 
-#: src/edittags.c:430
+#: src/edittags.c:444
 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."
-
-#: src/edittags.c:550
-msgctxt "Dialog title"
-msgid "Apply tags"
-msgstr "Lägg till etiketter"
+"Du matade in ett reserverat etikettnamn, vänligen välj ett annat istället."
 
-#: src/edittags.c:567
+#: src/edittags.c:575
 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:587
+msgid "Add the new tag"
+msgstr "Lägg till den nya etiketten"
+
+#: src/edittags.c:592
+msgid "Delete the selected tag"
+msgstr "Ta bort vald etikett"
+
+#: src/edittags.c:611
+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
 msgid "File does not appear to be vCard format."
@@ -3033,11 +3126,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"
 
@@ -3100,22 +3193,22 @@ msgstr "B_läddra"
 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:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
+#: src/plugins/archive/archiver_prefs.c:312
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 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/exphtmldlg.c:454 src/prefs_folder_item.c:529
+#: src/prefs_folder_item.c:1260 src/prefs_folder_item.c:1292
 #: src/prefs_other.c:129 src/prefs_other.c:417
 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:455 src/plugins/pgpcore/select-keys.c:242
+#: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Fullst. namn"
 
@@ -3343,7 +3436,7 @@ msgstr "Exportera adressbok till LDIF-fil"
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "Exportera till mbox-fil"
 
@@ -3379,46 +3472,46 @@ msgstr "Välj exportfil"
 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:981
 #: 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 +3519,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 +3540,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 +3554,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 +3563,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 +3698,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 +3711,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:325
 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:328
 msgid "Queue"
 msgstr "Kö"
 
-#: src/folder.c:1607 src/prefs_folder_item.c:323
+#: src/folder.c:1608 src/prefs_folder_item.c:329
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:321
+#: src/folder.c:1612 src/prefs_folder_item.c:327
 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:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:131
 msgid "NewFolder"
 msgstr "Nymapp"
 
-#: src/foldersel.c:576 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:575 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:585 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:302
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
+#: src/plugins/rssyl/rssyl_cb_menu.c:239
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, 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:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, 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/foldersel.c:607 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/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:561
 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:402 src/summaryview.c:6559
 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:401 src/summaryview.c:6561
+#: 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:474
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:783
+#: src/folderview.c:784
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:869 src/summaryview.c:4292
 msgid "Mark all as read"
 msgstr "Markera alla som lästa"
 
-#: src/folderview.c:869
+#: src/folderview.c:870
 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:872 src/summaryview.c:4293
 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:875 src/summaryview.c:4338
 msgid "Mark all as unread"
 msgstr "Markera alla som olästa"
 
-#: src/folderview.c:875
+#: src/folderview.c:876
 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:878 src/summaryview.c:4339
 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:1074 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:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "Avsöker mapp %s...."
 
-#: src/folderview.c:1101
+#: src/folderview.c:1108
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapplista"
 
-#: src/folderview.c:1102
+#: src/folderview.c:1109
 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:1119
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapplistan..."
 
-#: src/folderview.c:1114
+#: src/folderview.c:1121
 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:2240
 #, c-format
 msgid "Closing folder %s..."
 msgstr "Stänger mapp %s..."
 
-#: src/folderview.c:2328
+#: src/folderview.c:2335
 #, c-format
 msgid "Opening folder %s..."
 msgstr "Öppnar mapp %s..."
 
-#: src/folderview.c:2346
+#: src/folderview.c:2353
 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:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Töm papperskorg"
 
-#: src/folderview.c:2487
+#: src/folderview.c:2494
 msgid "Delete all messages in trash?"
 msgstr "Ta bort alla meddelande från papperskorgen?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2495
 msgid "_Empty trash"
 msgstr "_Töm papperskorg"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Varning om frånkopplat läge"
 
-#: src/folderview.c:2533 src/toolbar.c:3033
+#: src/folderview.c:2540 src/toolbar.c:3086
 msgid "You're working offline. Override?"
 msgstr "Du arbetar frånkopplad. Åsidosätta?"
 
-#: src/folderview.c:2544 src/toolbar.c:3052
+#: src/folderview.c:2551 src/toolbar.c:3105
 msgid "Send queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: src/folderview.c:2545 src/toolbar.c:3053
+#: src/folderview.c:2552 src/toolbar.c:3106
 msgid "Send all queued messages?"
 msgstr "Skicka alla köade meddelanden?"
 
-#: src/folderview.c:2554 src/toolbar.c:3072
+#: src/folderview.c:2561 src/toolbar.c:3125
 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:2564 src/main.c:2925 src/toolbar.c:3128
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3885,64 +3998,64 @@ msgstr ""
 "Några fel uppstod vid skickande av köade meddelanden:\n"
 "%s"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2645
 #, 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:2646
 #, 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:2648
 msgid "Copy folder"
 msgstr "Kopiera mapp"
 
-#: src/folderview.c:2635
+#: src/folderview.c:2648
 msgid "Move folder"
 msgstr "Flytta mapp"
 
-#: src/folderview.c:2646
+#: src/folderview.c:2659
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopiera %s till %s..."
 
-#: src/folderview.c:2646
+#: src/folderview.c:2659
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Flyttar %s till %s..."
 
-#: src/folderview.c:2680
+#: src/folderview.c:2693
 msgid "Source and destination are the same."
 msgstr "Källa och destination är de samma."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2696
 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:2697
 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:2700
 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:2703
 msgid "Copy failed!"
 msgstr "Kopiering misslyckades!"
 
-#: src/folderview.c:2690
+#: src/folderview.c:2703
 msgid "Move failed!"
 msgstr "Flytt misslyckades!"
 
-#: src/folderview.c:2740
+#: src/folderview.c:2753
 #, 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:3190 src/summaryview.c:4747 src/summaryview.c:4853
 msgid "The destination folder can only be used to store subfolders."
 msgstr "Destinationsmappen kan bara användas till att spara undermappar."
 
@@ -3970,7 +4083,7 @@ msgstr "Namn på diskussionsgrupp"
 msgid "Messages"
 msgstr "Meddelande"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Typ"
 
@@ -3979,10 +4092,10 @@ msgid "moderated"
 msgstr "modererad"
 
 #: src/grouplistdialog.c:348
-msgid "readonly"
+msgid "read-only"
 msgstr "skrivskyddad"
 
-#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:301
 #: src/plugins/vcalendar/vcal_manager.c:115
 #: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
@@ -3992,7 +4105,7 @@ msgstr "okänd"
 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:461 src/gtk/gtkutils.c:1867 src/summaryview.c:1682
 msgid "Done."
 msgstr "Färdig."
 
@@ -4001,22 +4114,22 @@ msgstr "Färdig."
 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 +4137,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:866
 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 +4160,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 +4169,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 +4178,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:253 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:272
 msgid "Previous team members"
 msgstr "Före detta lagmedlemmar"
 
-#: src/gtk/about.c:286
+#: src/gtk/about.c:291
 msgid "The translation team"
 msgstr "Översättarlaget"
 
-#: src/gtk/about.c:305
+#: src/gtk/about.c:310
 msgid "Documentation team"
 msgstr "Dokumentationslaget"
 
-#: src/gtk/about.c:323
+#: src/gtk/about.c:328
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:342
+#: src/gtk/about.c:347
 msgid "Icons"
 msgstr "Ikoner"
 
-#: src/gtk/about.c:361
+#: src/gtk/about.c:366
 msgid "Contributors"
 msgstr "Medarbetare"
 
-#: src/gtk/about.c:409
+#: src/gtk/about.c:414
 msgid "Compiled-in Features"
 msgstr "Inbyggda Funktioner"
 
-#: src/gtk/about.c:426
+#: src/gtk/about.c:431
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "compface|tillhandahåller stöd för X-Face-brevhuvudet\n"
 
-#: src/gtk/about.c:436
+#: src/gtk/about.c:441
 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:451
 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:461
 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:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "tillhandahåller stöd för IPv6-adresser\n"
+
+#: src/gtk/about.c:481
 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:491
 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:501
 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:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "tillhandahåller stöd för SVG-teman\n"
+
+#: src/gtk/about.c:521
 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:531
 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:541
+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:573
 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 +4282,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:580
 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 +4294,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:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4186,149 +4302,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:732 src/main.c:2749
 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:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Startat: %s\n"
 
-#: src/gtk/about.c:738 src/main.c:2734
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Inkommande trafik\n"
 
-#: src/gtk/about.c:741 src/main.c:2737
+#: src/gtk/about.c:755 src/main.c:2771
 #, 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:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Utgående trafik\n"
 
-#: src/gtk/about.c:751 src/main.c:2746
+#: src/gtk/about.c:765 src/main.c:2780
 #, 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:770 src/main.c:2784
 #, 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:775 src/main.c:2788
 #, 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:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Totalt utgående meddelanden: %d\n"
 
-#: src/gtk/about.c:793
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "Om Claws Mail"
 
-#: src/gtk/about.c:866
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Författare"
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:892
 msgid "_Features"
 msgstr "F_unktioner"
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Licens"
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "Ve_rsionsinformation"
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "_Statistik"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:364
 msgid "Orange"
 msgstr "Orange"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:368
 msgid "Red"
 msgstr "Röd"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:372
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:376
 msgid "Sky blue"
 msgstr "Himmelsblå"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:380
 msgid "Blue"
 msgstr "Blå"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:384
 msgid "Green"
 msgstr "Grön"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:388
 msgid "Brown"
 msgstr "Brun"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:392
 msgid "Grey"
 msgstr "Grå"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:396
 msgid "Light brown"
 msgstr "Ljusbrun"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:48 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:49 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:50 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:51 src/prefs_common.c:412
 msgid "Gold"
 msgstr "Guld"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:52 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:53 src/prefs_common.c:420
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:242
 msgid "Set mailbox order"
 msgstr "Sorteringsordning för brevlådor"
 
-#: src/gtk/foldersort.c:277
+#: src/gtk/foldersort.c:278
 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:312
 msgid "Mailboxes"
 msgstr "Brevlådor"
 
+#: src/gtk/foldersort.c:328
+msgid "Move the selected mailbox up"
+msgstr "Flytta upp vald postlåda"
+
+#: src/gtk/foldersort.c:334
+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."
@@ -4351,16 +4475,16 @@ msgstr "Kunde inte initiera %s ordlista:"
 msgid "No misspelled word found."
 msgstr "Inga felstavade ord hittades."
 
-#: src/gtk/gtkaspell.c:1451
+#: src/gtk/gtkaspell.c:1452
 msgid "Replace unknown word"
 msgstr "Ersätt okänt ord"
 
-#: src/gtk/gtkaspell.c:1467
+#: src/gtk/gtkaspell.c:1468
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "Ersätt \"%s\" med: "
 
-#: src/gtk/gtkaspell.c:1510
+#: src/gtk/gtkaspell.c:1512
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -4368,55 +4492,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:1813 src/gtk/gtkaspell.c:1951
 msgid "More..."
 msgstr "Mer..."
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1869
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" okänd i ordlistan '%s'"
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1885
 msgid "Accept in this session"
 msgstr "Acceptera för denna session"
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1895
 msgid "Add to personal dictionary"
 msgstr "Lägg till i egen ordlista"
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1905
 msgid "Replace with..."
 msgstr "Ersätt med..."
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1918
 #, c-format
 msgid "Check with %s"
 msgstr "Kontrollera med %s"
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1940
 msgid "(no suggestions)"
 msgstr "(inga förslag)"
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2014
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Ordlista: %s"
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2029
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Använd alternativ (%s)"
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2040
 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:2056 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "Kontrollera medan jag skriver"
 
-#: src/gtk/gtkaspell.c:2154
+#: src/gtk/gtkaspell.c:2156
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4425,7 +4549,7 @@ msgstr ""
 "Rättstavningsprogrammet kunde inte byta ordlista.\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2210
+#: src/gtk/gtkaspell.c:2212
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4434,26 +4558,26 @@ msgstr ""
 "Rättstavningsprogrammet kunde inte byta alternativ ordlista.\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1872
 msgid "Failed: no service record found."
 msgstr "Misslyckades: ingen post för tjänsten hittades."
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1875
 msgid "Failed: network error."
 msgstr "Misslyckades: nätverksfel."
 
-#: src/gtk/gtkutils.c:1859
+#: src/gtk/gtkutils.c:1878
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "Misslyckades: okänt fel (%d)."
 
-#: src/gtk/gtkutils.c:1929
+#: src/gtk/gtkutils.c:1948
 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:646 src/prefs_matcher.c:2223 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:472
 msgid "Date"
 msgstr "Datum"
 
@@ -4462,8 +4586,8 @@ 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/prefs_matcher.c:2220 src/prefs_summaries.c:638
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:470
 msgid "From"
 msgstr "Från"
 
@@ -4484,13 +4608,13 @@ 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/prefs_matcher.c:2221 src/prefs_summaries.c:639
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:471
 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:2222 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "Kopia"
 
@@ -4499,7 +4623,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:2224 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Meddelande-ID"
 
@@ -4512,7 +4636,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:2226 src/quote_fmt.c:60
 msgid "References"
 msgstr "Referenser"
 
@@ -4521,8 +4645,8 @@ 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/prefs_matcher.c:2219 src/prefs_summaries.c:640
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:469
 msgid "Subject"
 msgstr "Ämne"
 
@@ -4620,7 +4744,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:2225 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "Diskussionsgrupper"
 
@@ -4645,9 +4769,9 @@ 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/sslcertwindow.c:189 src/prefs_summaries.c:644
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1133 src/ssl_manager.c:124
+#: src/summaryview.c:2899
 msgid "Status"
 msgstr "Status"
 
@@ -4691,7 +4815,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:341
 msgid "Content-Type:"
 msgstr "Innehållstyp:"
 
@@ -4719,7 +4843,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:1268
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4932,8 +5056,8 @@ 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"
+msgid "IMAP folder which contains subfolders only"
+msgstr "IMAP-folder som endast innehåller undermappar"
 
 #: src/gtk/icon_legend.c:93
 msgid "IMAP mailbox showing only subscribed folders"
@@ -5033,17 +5157,18 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:791
 #: src/plugins/address_keeper/address_keeper_prefs.c:273
-#: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:229
+#: src/plugins/archive/archiver_prefs.c:105
+#: src/plugins/attachwarner/attachwarner_prefs.c:233
 #: 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/keyword_warner/keyword_warner_prefs.c:233
+#: 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
@@ -5058,7 +5183,7 @@ msgstr ""
 #: 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/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:925
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
@@ -5070,7 +5195,7 @@ msgstr "_Ladda..."
 msgid "_Unload"
 msgstr "Ta bort"
 
-#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:234
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -5095,16 +5220,16 @@ msgstr "Inlästa insticksmoduler"
 msgid "Page Index"
 msgstr "Sidindex"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 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/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Konto"
 
@@ -5330,107 +5455,107 @@ 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:637
 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:699
 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:710 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr "Rekursivt"
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr "Klibbig"
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr "Sök vid inmatning"
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr "Kör vid markering"
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr "Rensa nuvarande sökning"
 
-#: src/gtk/quicksearch.c:790 src/summary_search.c:413
+#: src/gtk/quicksearch.c:787 src/summary_search.c:413
 msgid "Edit search criteria"
 msgstr "Redigera sökkriterie"
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 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:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr "_Information"
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr "_Redigera"
 
-#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
+#: src/gtk/quicksearch.c:836 src/gtk/quicksearch.c:860 src/prefs_actions.c:351
 #: 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:180 src/ssl_manager.c:301
 #, c-format
 msgid "Correct%s"
 msgstr "Korrekt%s"
 
-#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
+#: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:182
 #: src/ssl_manager.c:301 src/ssl_manager.c:305
 msgid " (expired)"
 msgstr " (utgått)"
 
-#: src/gtk/sslcertwindow.c:188
+#: src/gtk/sslcertwindow.c:187
 msgid "Owner"
 msgstr "Ägare"
 
-#: src/gtk/sslcertwindow.c:189
+#: src/gtk/sslcertwindow.c:188
 msgid "Signer"
 msgstr "Signerad av"
 
-#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
+#: src/gtk/sslcertwindow.c:195 src/gtk/sslcertwindow.c:219
 msgid "Name: "
 msgstr "Namn: "
 
-#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:203 src/gtk/sslcertwindow.c:227
 msgid "Organization: "
 msgstr "Organisation: "
 
-#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
+#: src/gtk/sslcertwindow.c:211 src/gtk/sslcertwindow.c:235
 msgid "Location: "
 msgstr "Plats: "
 
-#: src/gtk/sslcertwindow.c:244
+#: src/gtk/sslcertwindow.c:243
 msgid "Fingerprint: \n"
 msgstr "Nyckelfingeravtryck: \n"
 
-#: src/gtk/sslcertwindow.c:254
+#: src/gtk/sslcertwindow.c:253
 msgid "Signature status: "
 msgstr "Signaturstatus: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:260
 msgid "Expired on: "
 msgstr "Förfaller den: "
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:260
 msgid "Expires on: "
 msgstr "Förfaller den: "
 
-#: src/gtk/sslcertwindow.c:328
+#: src/gtk/sslcertwindow.c:327
 #, 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:343
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5441,7 +5566,7 @@ msgstr ""
 "Det kan vara en illasinnad server som du ansluter till.\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:363
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5450,39 +5575,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:373 src/gtk/sslcertwindow.c:423
+#: src/gtk/sslcertwindow.c:487
 msgid "Correct"
 msgstr "Korrekt"
 
-#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
-#: src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:375 src/gtk/sslcertwindow.c:425
+#: src/gtk/sslcertwindow.c:489
 #, c-format
 msgid "Signature status: %s"
 msgstr "Signatur skapad %s"
 
-#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:383 src/gtk/sslcertwindow.c:433
 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:389
+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:391
+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:394 src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:506
 msgid "_Cancel connection"
 msgstr "A_vbryt anslutning"
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:394 src/gtk/sslcertwindow.c:506
 msgid "_Accept and save"
 msgstr "_Acceptera och spara"
 
-#: src/gtk/sslcertwindow.c:413
+#: src/gtk/sslcertwindow.c:412
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5491,27 +5616,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:439
+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:441
+msgid "TLS certificate is expired"
+msgstr "TLS-certifikat är utgånget"
 
-#: src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:444
 msgid "_Accept"
 msgstr "_Acceptera"
 
-#: src/gtk/sslcertwindow.c:465
+#: src/gtk/sslcertwindow.c:464
 msgid "New certificate:"
 msgstr "Nytt certifikat:"
 
-#: src/gtk/sslcertwindow.c:470
+#: src/gtk/sslcertwindow.c:469
 msgid "Known certificate:"
 msgstr "Känt certifikat:"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:476
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5520,17 +5645,17 @@ msgstr ""
 "Certifikat för %s har ändrats.\n"
 "%sVill du acceptera det ändå?"
 
-#: src/gtk/sslcertwindow.c:498
+#: src/gtk/sslcertwindow.c:497
 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:502
+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:504
+msgid "TLS certificate changed"
+msgstr "TLS-certifikat förändrat"
 
 #: src/headerview.c:94
 msgid "Tags:"
@@ -5538,223 +5663,222 @@ msgstr "Etiketter:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
-#: src/summaryview.c:3517 src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3500
+#: src/summaryview.c:3518 src/summaryview.c:3557
 msgid "(No From)"
 msgstr "(Ingen avsändare)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
-#: src/summaryview.c:3571
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3569
+#: src/summaryview.c:3572
 msgid "(No Subject)"
 msgstr "(Inget ämne)"
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:101
 msgid "Error:"
 msgstr "Fel:"
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:320
 msgid "Filesize:"
 msgstr "Filstorlek:"
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:369
 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 +5890,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 +5902,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 +5914,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 +5926,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 +5938,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:884 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:885 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:891 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 +6103,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"
@@ -6032,7 +6166,7 @@ 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..."
 
@@ -6063,22 +6197,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:252 src/news_gtk.c:293
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, 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:254 src/plugins/mailmbox/plugin_gtk.c:421
+#: src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2094
 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:280 src/news_gtk.c:315
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6086,32 +6220,33 @@ 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:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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:330
+#: 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:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
+#: src/plugins/rssyl/rssyl_cb_menu.c:209
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen '%s'."
@@ -6138,7 +6273,7 @@ msgstr "_Sök"
 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:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -6172,8 +6307,8 @@ msgstr "prenumerera"
 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:568 src/prefs_folder_item.c:1610 src/prefs_folder_item.c:1638
+#: src/prefs_folder_item.c:1666
 msgid "Apply to subfolders"
 msgstr "Använd på undermappar"
 
@@ -6185,7 +6320,7 @@ msgstr "_Prenumerera"
 msgid "_Unsubscribe"
 msgstr "S_äg upp prenumeration"
 
-#: src/import.c:113 src/import.c:209
+#: src/import.c:113 src/import.c:212
 msgid "Import mbox file"
 msgstr "Importera mbox-fil"
 
@@ -6197,11 +6332,11 @@ msgstr "Specificera mbox-filen och destinationsmappen."
 msgid "Destination folder:"
 msgstr "Destinationsmapp:"
 
-#: src/import.c:204
+#: src/import.c:207
 msgid "Source mbox filename can't be left empty."
 msgstr "Mbox-filnamn kan inte vara tomt."
 
-#: src/import.c:209
+#: src/import.c:213
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6209,19 +6344,19 @@ msgstr ""
 "Destinationsmappen är inte vald.\n"
 "Vill du importer mbox-filen i Inbox-mappen?"
 
-#: src/import.c:231
+#: src/import.c:234
 msgid "Can't find the destination folder."
 msgstr "Kan inte hitta destinationsmappen."
 
-#: src/import.c:236
+#: src/import.c:239
 msgid "Importing mbox file..."
 msgstr "Importerar mbox-fil..."
 
-#: src/import.c:258
+#: src/import.c:261
 msgid "Select importing file"
 msgstr "Välj importfil"
 
-#: src/import.c:276
+#: src/import.c:279
 msgid "Select folder to import to"
 msgstr "Välj mapp att importera till"
 
@@ -6275,7 +6410,7 @@ msgstr "Välj LDIF-fil att importera."
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:710 src/summaryview.c:466
+#: src/importldif.c:710 src/summaryview.c:467
 msgid "S"
 msgstr "S"
 
@@ -6372,144 +6507,144 @@ msgstr "Välj Pine Fil"
 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:407 src/prefs_summaries.c:647
+#: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 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:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:889
+#: src/inc.c:897
 #, 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:931
 #, 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:935
 #, 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:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:1009
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "Tar emot meddelanden från %s (%s) ..."
 
-#: src/inc.c:1015
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot antal nya meddelanden (STAT)..."
 
-#: src/inc.c:1019
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot antal nya meddelanden (LAST)..."
 
-#: src/inc.c:1023
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot antal nya meddelanden (UIDL)..."
 
-#: src/inc.c:1027
+#: src/inc.c:1035
 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:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:1059
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:1072
+#: src/inc.c:1080
 #, 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:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Anslutning till %s:%d misslyckades."
 
-#: src/inc.c:1232
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod vid behandling av e-post."
 
-#: src/inc.c:1238
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6518,37 +6653,37 @@ msgstr ""
 "Fel uppstod vid behandling av post:\n"
 "%s"
 
-#: src/inc.c:1244
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1249
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "Kan inte skriva till fil."
 
-#: src/inc.c:1254
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "Socket fel."
 
-#: src/inc.c:1257
+#: src/inc.c:1265
 #, 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:1270 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:1273
 #, 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:1278
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1274
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6557,11 +6692,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6570,7 +6705,7 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1299 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 +6713,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:1304
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Anslutning till %s:%d överskred tidsgränsen."
 
-#: src/inc.c:1334
+#: src/inc.c:1342
 msgid "Incorporation cancelled\n"
 msgstr "Införlivande avbröts\n"
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
+#: src/prefs_other.c:578 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:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: src/inc.c:1639
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "timme"
 msgstr[1] "timmar"
 
-#: src/inc.c:1651
+#: src/inc.c:1662
 #, 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:1668
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sDu arbetar frånkopplad. Åsidosätta?"
 
-#: src/inc.c:1664
+#: src/inc.c:1675
 msgid "On_ly once"
 msgstr "Endast en gång"
 
@@ -6626,8 +6761,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 +6785,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:252
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6663,7 +6798,7 @@ msgstr ""
 "Filen '%s' finns redan.\n"
 "Kan inte ska skapa mapp."
 
-#: src/main.c:380
+#: src/main.c:382
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6672,7 +6807,7 @@ msgstr ""
 "Konfiguration för %s hittad.\n"
 "Vill du migrera denna konfiguration?"
 
-#: src/main.c:382
+#: src/main.c:386
 #, c-format
 msgid ""
 "\n"
@@ -6685,11 +6820,11 @@ msgstr ""
 "Dina Sylpheed-filterregler kan konverteras av ett\n"
 "skript tillgängligt på %s."
 
-#: src/main.c:394
+#: src/main.c:399
 msgid "Keep old configuration"
 msgstr "Behåll gammal konfiguration"
 
-#: src/main.c:397
+#: src/main.c:402
 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 +6834,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:410
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:416
+#: src/main.c:421
 msgid "Copying configuration... This may take a while..."
 msgstr "Kopierar konfiguration...Detta kan ta en stund..."
 
-#: src/main.c:425
+#: src/main.c:430
 msgid "Migration failed!"
 msgstr "Migrationen misslyckades!"
 
-#: src/main.c:434
+#: src/main.c:439
 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:1210 src/main.c:1214 src/main.c:1218
 msgid "(or older)"
 msgstr "(eller äldre)"
 
-#: src/main.c:1515
+#: src/main.c:1556
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6742,7 +6873,7 @@ msgstr[1] ""
 "konfiguration för mer information:\n"
 "%s"
 
-#: src/main.c:1557
+#: src/main.c:1598
 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 +6883,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:1604
 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 +6893,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:1841
 msgid "Missing filename\n"
 msgstr "Saknar filnamn\n"
 
-#: src/main.c:1811
+#: src/main.c:1848
 msgid "Cannot open filename for reading\n"
 msgstr "Kan inte öppna filnamn för läsning\n"
 
-#: src/main.c:1822
+#: src/main.c:1859
 msgid "Malformed header\n"
 msgstr "Felaktigt brevhuvud\n"
 
-#: src/main.c:1829
+#: src/main.c:1866
 msgid "Duplicated 'To:' header\n"
 msgstr "Duplicerat brevhuvud 'To:'\n"
 
-#: src/main.c:1840
+#: src/main.c:1877
 msgid "Missing required 'To:' header\n"
 msgstr "Nödvändigt brevhuvud 'To:' saknas\n"
 
-#: src/main.c:1866
+#: src/main.c:1901
 #, 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:1930 src/main.c:1993
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr "Saknar fil-argument för alternativet %s"
 
-#: src/main.c:1915
+#: src/main.c:1952
 #, 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:1955
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr "Saknar uri-argument för alternativet %s"
 
-#: src/main.c:1951
+#: src/main.c:1988
 #, 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:2057
 #, 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:2060
 #, 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:2063
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr "Saknar frågeargument för alternativet %s"
 
-#: src/main.c:2042
+#: src/main.c:2079
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [VAL]...\n"
 
-#: src/main.c:2044
+#: src/main.c:2081
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]               öppna nytt meddelandefönster"
 
-#: src/main.c:2045
+#: src/main.c:2082
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6849,13 +6980,13 @@ msgstr ""
 "krävs) tills tom rad,\n"
 "                                   sedan meddelandetexten tills filslut."
 
-#: src/main.c:2050
+#: src/main.c:2087
 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:2088
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6864,7 +6995,7 @@ msgstr ""
 "  --attach fil1 [fil2]...          öppna nytt meddelandefönster med valda "
 "filer bifogade"
 
-#: src/main.c:2054
+#: src/main.c:2091
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6873,24 +7004,24 @@ msgstr ""
 "  --insert fil1 [fil2]...          öppna nytt meddelandefönster med valda "
 "filer infogade"
 
-#: src/main.c:2057
+#: src/main.c:2094
 msgid "  --receive              receive new messages"
 msgstr "  --receive                        ta emot nya meddelanden"
 
-#: src/main.c:2058
+#: src/main.c:2095
 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:2096
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving               avbryt mottagande av meddelanden"
 
-#: src/main.c:2060
+#: src/main.c:2097
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending                 avbryt skickande av meddelanden"
 
-#: src/main.c:2061
+#: src/main.c:2098
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6910,29 +7041,29 @@ msgstr ""
 "                                   rekursivt: falskt om arg. börjar på 0, n, "
 "N, f eller F"
 
-#: src/main.c:2068
+#: src/main.c:2105
 msgid "  --send                 send all queued messages"
 msgstr "  --send                           skicka alla köade meddelanden"
 
-#: src/main.c:2069
+#: src/main.c:2106
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...               visa totalt antal meddelanden"
 
-#: src/main.c:2070
+#: src/main.c:2107
 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:2109
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics                     visa sessionsstatistik"
 
-#: src/main.c:2073
+#: src/main.c:2110
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics               återställ sessionsstatistik"
 
-#: src/main.c:2074
+#: src/main.c:2111
 msgid ""
 "  --select folder[/msg]  jump to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder', a "
@@ -6942,48 +7073,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:2113
 msgid "  --online               switch to online mode"
 msgstr "  --online                         byt till anslutet läge"
 
-#: src/main.c:2077
+#: src/main.c:2114
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline                        byt till frånkopplat läge"
 
-#: src/main.c:2078
+#: src/main.c:2115
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q                 avsluta Claws Mail"
 
-#: src/main.c:2079
+#: src/main.c:2116
 msgid "  --debug -d             debug mode"
 msgstr "  --debug -d                       avlusningsläge"
 
-#: src/main.c:2080
+#: src/main.c:2117
 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:2118
+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:2119
+msgid "  --version -v           output version information"
+msgstr "  --version -v                     skriv ut versionsinformation"
 
-#: src/main.c:2083
+#: src/main.c:2120
 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:2121
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir                     skriv ut konfigurationsmapp"
 
-#: src/main.c:2085
+#: src/main.c:2122
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
@@ -6991,7 +7120,7 @@ msgstr ""
 "  --alternate-config-dir mapp\n"
 "                                   använd angiven konfigurationsmapp"
 
-#: src/main.c:2087
+#: src/main.c:2124
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
@@ -6999,869 +7128,874 @@ msgstr ""
 "  --geometry -geometry [BxH][+X+Y]\n"
 "                                   sätt geometri för huvudfönster"
 
-#: src/main.c:2104
+#: src/main.c:2141
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr "Saknar mappargument för alternativet %s"
 
-#: src/main.c:2112
+#: src/main.c:2149
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr "Saknar geometriargument för alternativet %s"
 
-#: src/main.c:2123
+#: src/main.c:2160
 #, 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:2193 src/main.c:2196
 #, c-format
 msgid "Unknown option %s"
 msgstr "Okänt alternativ [%s]"
 
-#: src/main.c:2175
+#: src/main.c:2212
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Behandlar (%s)..."
 
-#: src/main.c:2178
+#: src/main.c:2215
 msgid "top level folder"
 msgstr "toppnivåmapp"
 
-#: src/main.c:2260
+#: src/main.c:2297
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:2261
+#: src/main.c:2298
 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:3055
 msgid "NetworkManager: network is online.\n"
 msgstr "Nätverkshanteraren: nätverket är online.\n"
 
-#: src/main.c:3025
+#: src/main.c:3061
 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:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Arkiv"
 
-#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "_Visa"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "_Konfiguration"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Ändra sorteringsordning för brevlådor..."
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "_Importera mbox-fil..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "Exportera _valda till mbox-fil..."
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
 msgstr "_Töm alla papperskorgar"
 
-#: src/mainwindow.c:545 src/messageview.c:220
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_Spara e-post som..."
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Spara del som..."
 
-#: src/mainwindow.c:549 src/messageview.c:222
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Sidinstä_llningar..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "Markera _tråd"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "_Leta i aktuellt meddelande..."
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "S_nabbsök"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "Visa eller g_öm"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "Verk_tygsraden"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Välj visade _kolumner"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "I _mapplista..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "I m_eddelandelista..."
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "La_yout"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "_Sortera"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "_Attrahera efter ämne"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "E_xpandera alla trådar"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:585 src/messageview.c:234
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "_Gå till"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "_Föregående meddelande"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Nästa meddelande"
 
-#: src/mainwindow.c:589 src/messageview.c:238
+#: src/mainwindow.c:588 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:589 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:591 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:592 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:594 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:595 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:597 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:598 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:600
+msgid "Previously opened message"
 msgstr "Föregående öppnat meddelande"
 
-#: src/mainwindow.c:602 src/messageview.c:251
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Nästa öppnade meddelande"
 
-#: src/mainwindow.c:604 src/messageview.c:253
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Överliggande meddelande"
 
-#: src/mainwindow.c:606 src/messageview.c:255
+#: src/mainwindow.c:605 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:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "Mapp..."
 
-#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:608 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:609 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:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "Meddelanderullning"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Föregående rad"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:614 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:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Föregående sida"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Nästa sida"
 
-#: src/mainwindow.c:635 src/messageview.c:282
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Avkoda"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:641
 msgid "Open in new _window"
 msgstr "_Öppna i nytt fönster"
 
-#: src/mainwindow.c:643 src/messageview.c:289
+#: src/mainwindow.c:642 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "Meddel_andets källkod"
 
-#: src/mainwindow.c:645 src/messageview.c:290
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "Meddelandedel"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:645 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:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "Öppna"
 
-#: src/mainwindow.c:649 src/messageview.c:294
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "Öppna _med..."
 
-#: src/mainwindow.c:653 src/messageview.c:297
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Citat"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "_Uppdatera sammanfatting"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "Ta emot"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "Hämta från a_ktuellt konto"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "Hämta från _alla konton"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "Avbryt hämtnin_g"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "_Skicka köade meddelanden"
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "Skriv e-postmeddela_nde"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:669
 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:671 src/messageview.c:304
+#: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "Sva_ra"
 
-#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
 msgstr "Svara t_ill"
 
-#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
 msgstr "Sänd_lista"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:676
 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:679 src/messageview.c:311 src/summaryview.c:438
+#: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
-#: src/toolbar.c:2450
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
+#: src/toolbar.c:2491
 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:681 src/messageview.c:313 src/summaryview.c:440
+#: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "Omdiri_gera"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
 msgstr "Sänd_lista"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Skicka"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "_Hjälp"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "Säg upp prenumeration"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:692
 msgid "View archive"
 msgstr "Visa arkiv"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:694
 msgid "Contact owner"
 msgstr "Kontakta ägare"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "_Flytta..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:700
 msgid "Move to _trash"
 msgstr "Fly_tta till papperskorg"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "Ta _bort..."
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
 msgstr "Flytt_a tråd till papperskorg"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "Ta bort trå_d"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Avbryt ett diskussionsgruppmeddelande"
 
-#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "_Markera"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "_Avmarkera"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "Markera som _läst"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "Markera som _oläst"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Markera alla som lästa i mappen"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:716
 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:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Ignorera tråd"
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:719
 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:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Bevaka tråd"
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Sluta bevaka tråd"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "Markera som _skräppost"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:725
 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:728 src/prefs_filtering_action.c:177 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:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Lås upp"
 
-#: src/mainwindow.c:732 src/summaryview.c:441
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "Färgm_arkera"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "_Etiketter"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "_Omredigera"
 
-#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "Kontrollera signatur"
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:743 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:745
 msgid "C_ollect addresses"
 msgstr "_Samla in adress(er)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "Från nuvarande m_app..."
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "Från markerade _meddelanden..."
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "_Filtrera alla meddelanden i mapp"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "Filtrera _markerade meddelanden"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "Kör behandlingsregler för mappen"
 
-#: src/mainwindow.c:755 src/messageview.c:320
+#: src/mainwindow.c:754 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:755 src/mainwindow.c:762 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:756 src/mainwindow.c:763 src/mainwindow.c:871
+#: 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:757 src/mainwindow.c:764 src/mainwindow.c:872
+#: 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:758 src/mainwindow.c:765 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:759 src/mainwindow.c:766 src/messageview.c:326
+#: src/messageview.c:333
+msgid "By S_ender"
+msgstr "Efter Avsändar_e"
+
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "Skapa behandlingsregel"
 
-#: src/mainwindow.c:768 src/messageview.c:333
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "Lista _webbadresser..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:776
 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:777
 msgid "Delete du_plicated messages"
 msgstr "Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "I markerad mapp"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "I alla mappar"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "Kör"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "Utplåna"
 
-#: src/mainwindow.c:785
-msgid "SSL/TLS cer_tificates"
-msgstr "SSL/TLS-certifikat"
+#: src/mainwindow.c:786
+msgid "TLS cer_tificates"
+msgstr "TLS-cer_tifikat"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Filtreringslo_gg"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Nätverks_logg"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "Debug-_logg"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "Gl_öm alla sessionslösenord"
 
-#: src/mainwindow.c:796
-msgid "Forget _master passphrase"
+#: src/mainwindow.c:797
+msgid "Forget _primary passphrase"
 msgstr "Glöm huvudlösenord"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "_Ändra aktuellt konto"
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "Egen_skaper för aktuellt konto..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "Skapa _nytt konto..."
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "R_edigera konton..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "E_genskaper..."
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "Förbehandla..."
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "Efterbehandla..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Filtrering..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "Mallar..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "_Aktiviteter..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "Etiketter..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "Insticksmoduler..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Manual"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "_FAQ med frågor från användare"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "Ikonförk_laring"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Sätt som standardklient"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "Frånkopplat _läge"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "Men_yrad"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "_Meddelandevy"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "_Statusrad"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Kolumnrubriker"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "Tr_ådvy"
 
-#: src/mainwindow.c:837 src/prefs_summaries.c:667
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Dölj lästa trådar"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "_Dölj lästa meddelanden"
 
-#: src/mainwindow.c:839 src/prefs_summaries.c:673
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Dölj borttagna meddelanden"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
-#: src/mainwindow.c:841 src/messageview.c:345
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Visa alla brev_huvuden"
 
-#: src/mainwindow.c:842 src/messageview.c:346
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "Ko_llapsa alla"
 
-#: src/mainwindow.c:843 src/messageview.c:347
+#: src/mainwindow.c:844 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:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Kollapsa från nivå _3"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Text under ikoner"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Text bredvid ikoner"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "Endast _ikoner"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "Endast _text"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "_Standard"
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "_Tre kolumner"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "_Brett meddelande"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "Bred meddelandelista"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "Liten skärm"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "Efter _Nummer"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "Efter storlek"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "Efter _datum"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "Efter Datum för tråd"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "Efter _ämne"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "Efter färgmarkering"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "Efter etikett"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "Efter _markering"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "Efter _status"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "Efter _bilaga"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "Efter poäng"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "Efter låst"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "S_ortera inte"
 
-#: src/mainwindow.c:884 src/prefs_summaries.c:654
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Stigande"
 
-#: src/mainwindow.c:885 src/prefs_summaries.c:655
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Fallande"
 
-#: src/mainwindow.c:927 src/messageview.c:390
+#: src/mainwindow.c:928 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:1306 src/summaryview.c:6511
+msgid "Modify tags..."
+msgstr "Redigera etiketter..."
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1964
 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:1979
 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:1982
 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:1996
 msgid "Select account"
 msgstr "Välj konto"
 
-#: src/mainwindow.c:2020 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Nätverkslogg"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 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:2046 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:2048 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:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: 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:1149
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:2897 src/mainwindow.c:2902
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelande från papperskorgar?"
 
-#: src/mainwindow.c:2898
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "A_vsluta inte"
 
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:2930
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7875,18 +8009,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:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: 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:2946 src/plugins/mailmbox/plugin_gtk.c:209 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:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7895,170 +8029,170 @@ msgstr ""
 "Skapande av brevlåda misslyckades.\n"
 "Några filer finns kanske redan, eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:3415
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Inte tillåtet att skicka"
 
-#: src/mainwindow.c:3997
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Fel vid import av mbox-fil."
 
-#: src/mainwindow.c:4006 src/mainwindow.c:4015
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 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:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Avsluta Claws Mail?"
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Synkronisera mappar"
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Vill du synkronisera dina mappar nu?"
 
-#: src/mainwindow.c:4259
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "_Synkronisera"
 
-#: src/mainwindow.c:4737
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/mainwindow.c:4747
+#: src/mainwindow.c:4754
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Inga meddelandedubbletter funna i vald mapp.\n"
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4760
 #, 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:4764
 #, 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:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Tar bort meddelandedubbletter i alla mappar..."
 
-#: src/mainwindow.c:4801
+#: src/mainwindow.c:4808
 #, 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:4813
 #, 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:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Välj mapp att gå till"
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 msgid "Processing rules to apply before folder rules"
 msgstr "Behandlingsregler att applicera före mappregler"
 
-#: src/mainwindow.c:5077
+#: src/mainwindow.c:5086
 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:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Filtreringskonfiguration"
 
-#: src/mainwindow.c:5200
+#: src/mainwindow.c:5207
 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:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws-Mail har blivit registrerad som standardklient."
 
-#: src/mainwindow.c:5261
+#: src/mainwindow.c:5300
 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:5314 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:5458
 #, 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/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 #: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
 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 +8201,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 +8210,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:1794 src/prefs_themes.c:601
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: src/mbox.c:561
+#: src/mbox.c:558
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -8104,7 +8238,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..."
 
@@ -8136,19 +8270,23 @@ msgstr "Slutet av meddelande nått; fortsätt från början?"
 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:272
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
+#: src/messageview.c:720 src/messageview.c:1443 src/messageview.c:1594
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - Meddelandevy"
 
-#: src/messageview.c:845
+#: src/messageview.c:850
 msgid "<No Return-Path found>"
 msgstr "<Igen Returväg hittad>"
 
-#: src/messageview.c:852
+#: src/messageview.c:857
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -8163,34 +8301,34 @@ msgstr ""
 "Returväg: %s\n"
 "Det rekommenderas att du inte skickar något läskvitto."
 
-#: src/messageview.c:859
+#: src/messageview.c:864
 msgid "_Don't Send"
 msgstr "_Skicka inte"
 
-#: src/messageview.c:1366
+#: src/messageview.c:1373
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "Hämtar meddelande (%s)..."
 
-#: src/messageview.c:1402 src/procmime.c:957
+#: src/messageview.c:1409 src/procmime.c:987
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Kunde inte dekryptera: %s"
 
-#: src/messageview.c:1483 src/messageview.c:1491
+#: src/messageview.c:1490 src/messageview.c:1498
 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:1882
 #, c-format
 msgid "Show all %s."
 msgstr "Visa alla %s."
 
-#: src/messageview.c:1870
+#: src/messageview.c:1884
 msgid "Only the first megabyte of text is shown."
 msgstr "Endast den första megabyten text visas."
 
-#: src/messageview.c:1901
+#: src/messageview.c:1915
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
@@ -8198,19 +8336,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:1918
 msgid "You asked for a return receipt in this message."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1910
+#: src/messageview.c:1924
 msgid "This message asks for a return receipt."
 msgstr "Detta meddelande begär returkvitto."
 
-#: src/messageview.c:1911
+#: src/messageview.c:1925
 msgid "Send receipt"
 msgstr "Skicka kvitto"
 
-#: src/messageview.c:1954
+#: src/messageview.c:1968
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -8218,7 +8356,7 @@ msgstr ""
 "Detta meddelande har tagits emot delvis,\n"
 "och har tagits bort från servern."
 
-#: src/messageview.c:1960
+#: src/messageview.c:1974
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8227,15 +8365,15 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s."
 
-#: src/messageview.c:1964 src/messageview.c:1986
+#: src/messageview.c:1978 src/messageview.c:2000
 msgid "Mark for download"
 msgstr "Markera för nerladdning"
 
-#: src/messageview.c:1965 src/messageview.c:1977
+#: src/messageview.c:1979 src/messageview.c:1991
 msgid "Mark for deletion"
 msgstr "Markera för borttagning"
 
-#: src/messageview.c:1970
+#: src/messageview.c:1984
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8244,12 +8382,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:1989 src/messageview.c:2002
+#: src/prefs_filtering_action.c:176 src/toolbar.c:516
 msgid "Unmark"
 msgstr "Avmarkera"
 
-#: src/messageview.c:1981
+#: src/messageview.c:1995
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8258,7 +8396,7 @@ msgstr ""
 "Detta meddelande har tagits emot delvis;\n"
 "det är %s och kommer att tas bort."
 
-#: src/messageview.c:2058
+#: src/messageview.c:2072
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8272,20 +8410,20 @@ 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:2080 src/messageview.c:2088
 msgid "Return Receipt Notification"
 msgstr "Återsänd läskvittounderrättelse"
 
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2082 src/messageview.c:2093
 #: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2082 src/messageview.c:2093
 msgid "_Send Notification"
 msgstr "_Skicka Underrättelse"
 
-#: src/messageview.c:2075
+#: src/messageview.c:2089
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8297,11 +8435,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:2185 src/messageview.c:2204
 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:2959
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8309,7 +8447,7 @@ msgstr ""
 "\n"
 "  Det finns inga meddelanden i denna mapp"
 
-#: src/messageview.c:2952
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8317,7 +8455,7 @@ msgstr ""
 "\n"
 "  Meddelandet har blivit borttaget"
 
-#: src/messageview.c:2953
+#: src/messageview.c:2968
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8325,8 +8463,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:3000 src/messageview.c:3006 src/summaryview.c:4424
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "Ett fel uppstod vid inlärning.\n"
 
@@ -8334,7 +8472,7 @@ 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..."
 
@@ -8398,32 +8536,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:1049 src/mimeview.c:1054 src/mimeview.c:1059
+#: src/mimeview.c:1064
 msgid "View full information"
 msgstr "Visa fullständig information"
 
-#: src/mimeview.c:1074
+#: src/mimeview.c:1071
 msgid "Check again"
 msgstr "Kontrollera igen"
 
-#: src/mimeview.c:1086
+#: src/mimeview.c:1084
 #, 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:1086
 #, 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:1093
 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:1095
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8431,87 +8569,98 @@ 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:1102
+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:1104
+#, 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:1223
 msgid "Checking signature..."
 msgstr "Kontrollerar signatur..."
 
-#: src/mimeview.c:1386
+#: src/mimeview.c:1278
 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:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, 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:1791
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Skriv över befintlig fil '%s'?"
 
-#: src/mimeview.c:1918
+#: src/mimeview.c:1816
 #, 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
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
 msgstr "Fel vid sparande av alla meddelandedelar"
 
-#: src/mimeview.c:1922
-msgid "Skip"
-msgstr "Hoppa över"
+#: src/mimeview.c:1820
+msgid "Ignore"
+msgstr "Ignorera"
 
-#: src/mimeview.c:1922
-msgid "Skip all"
-msgstr "Hoppa över alla"
+#: src/mimeview.c:1820
+msgid "Ignore all"
+msgstr "Ignorera alla"
 
-#: src/mimeview.c:1932
+#: src/mimeview.c:1832
 #, 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:1844
 #, 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:1849
 #, 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:1886 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:1893 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:2011 src/plugins/fancy/fancy_viewer.c:708
+#: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Spara som"
 
-#: src/mimeview.c:2232 src/mimeview.c:2239
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
 msgstr "Öppna med"
 
-#: src/mimeview.c:2233 src/mimeview.c:2240
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8520,7 +8669,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:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8531,11 +8680,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Kör icke betrodd binär?"
 
-#: src/mimeview.c:2344
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8547,22 +8696,22 @@ msgstr ""
 "\n"
 "Vill du köra denna fil?"
 
-#: src/mimeview.c:2348
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "Kör binär"
 
-#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2561
 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:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 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:2576 src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -8612,34 +8761,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,16 +8818,95 @@ 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
@@ -8686,16 +8914,16 @@ 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."
+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"
+msgid "Changing primary passphrase"
+msgstr "Ändrar primärt lösenord"
 
 #: src/password_gtk.c:165
 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"
@@ -8713,11 +8941,11 @@ msgstr "Nytt lösenord:"
 msgid "Confirm passphrase:"
 msgstr "Bekräfta lösenord:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:53
+#: src/plugins/acpi_notifier/acpi_notifier.c:52
 msgid "Acpi Notifier"
 msgstr "ACPI Meddelande"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:68
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8725,7 +8953,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:70
 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 +8961,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:72
 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:73
 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:74
 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:75
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8753,78 +8981,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:208
+#: src/plugins/acpi_notifier/acpi_notifier.c:214
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
 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:306
 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:307
 msgid " : unread mail"
 msgstr " : oläst post"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 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:310
+#: src/plugins/acpi_notifier/acpi_notifier.c:316
+#: src/plugins/acpi_notifier/acpi_notifier.c:322
 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:312
+#: src/plugins/acpi_notifier/acpi_notifier.c:318
+#: src/plugins/acpi_notifier/acpi_notifier.c:324
 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:314
+#: src/plugins/acpi_notifier/acpi_notifier.c:320
+#: src/plugins/acpi_notifier/acpi_notifier.c:326
 msgid "on"
 msgstr "på"
 
-#: 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:348
+#: src/plugins/acpi_notifier/acpi_notifier.c:357
+#: src/plugins/acpi_notifier/acpi_notifier.c:372
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:388
+#: src/plugins/acpi_notifier/acpi_notifier.c:387
 msgid "ACPI type: "
 msgstr "ACPI typ: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:397
+#: src/plugins/acpi_notifier/acpi_notifier.c:396
 msgid "ACPI file: "
 msgstr "ACPI fil: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:408
+#: src/plugins/acpi_notifier/acpi_notifier.c:407
 msgid "values - On: "
 msgstr "värde - På: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:413
+#: src/plugins/acpi_notifier/acpi_notifier.c:412
 msgid " - Off: "
 msgstr " - Av: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:435
+#: src/plugins/acpi_notifier/acpi_notifier.c:434
 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:868
 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:889
 msgid "Laptop LED"
 msgstr "Laptop LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/attachwarner/attachwarner.c:253
+#: src/plugins/keyword_warner/keyword_warner.c:231
 msgid "Failed to register check before send hook"
 msgstr ""
 "Misslyckades att registrera kopplingspunkt för registerkontroll innan sänd"
@@ -8853,7 +9082,7 @@ msgstr "Sökväg till adressboken där adresser behålls"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:123
 #: 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:466
 #: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
 #: src/prefs_matcher.c:690
@@ -8877,7 +9106,7 @@ 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 +9313,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:721 src/prefs_folder_item.c:531
+#: src/prefs_folder_item.c:1262 src/prefs_folder_item.c:1294
 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:724 src/prefs_folder_item.c:530
+#: src/prefs_folder_item.c:1261 src/prefs_folder_item.c:1293
+#: src/prefs_summaries.c:407
 msgid "No"
 msgstr "Inga"
 
@@ -9111,7 +9340,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 +9348,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 +9457,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 +9473,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 +9481,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 +9493,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,34 +9556,38 @@ 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
+#: src/plugins/managesieve/sieve_manager.c:772
 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:337
+#: src/plugins/att_remover/att_remover.c:305
+msgid "Filename"
+msgstr "Filnamn"
+
+#: src/plugins/att_remover/att_remover.c:336
 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/att_remover/att_remover.c:362
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1199
 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:370 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:79 src/summaryview.c:2883
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: src/plugins/att_remover/att_remover.c:425
+#: src/plugins/att_remover/att_remover.c:424
 msgid "Destroy attachments"
 msgstr "Förstör bilagor"
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:425
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9363,34 +9596,34 @@ msgstr ""
 "Vill du verkligen ta bort alla bilagor från de valda meddelandena?n\n"
 "Den borttagna datan kommer inte gå att återställa."
 
-#: src/plugins/att_remover/att_remover.c:469
+#: src/plugins/att_remover/att_remover.c:468
 msgid "The selected messages don't have any attachments."
 msgstr "De valda meddelandena har inga bilagor."
 
-#: src/plugins/att_remover/att_remover.c:472
+#: src/plugins/att_remover/att_remover.c:471
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr "Bilagor borttagna från %d av %d valda meddelanden."
 
-#: src/plugins/att_remover/att_remover.c:475
+#: src/plugins/att_remover/att_remover.c:474
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr "Bilagor borttagna från alla %d valda meddelanden."
 
-#: src/plugins/att_remover/att_remover.c:504
+#: src/plugins/att_remover/att_remover.c:503
 msgid "This message doesn't have any attachments."
 msgstr "Detta meddelande har inga bilagor."
 
-#: src/plugins/att_remover/att_remover.c:517
+#: src/plugins/att_remover/att_remover.c:516
 msgid "Remove attachments..."
 msgstr "Ta bort bilagor..."
 
-#: src/plugins/att_remover/att_remover.c:529
-#: src/plugins/att_remover/att_remover.c:589
+#: src/plugins/att_remover/att_remover.c:528
+#: src/plugins/att_remover/att_remover.c:588
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:594
+#: src/plugins/att_remover/att_remover.c:593
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9402,11 +9635,11 @@ msgstr ""
 "Varning: denna operation går inte att avbryta och de borttagna bilagorna "
 "kommer att vara borta för alltid."
 
-#: src/plugins/att_remover/att_remover.c:618
+#: src/plugins/att_remover/att_remover.c:617
 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,17 +9652,17 @@ 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.c:283
+#: src/plugins/attachwarner/attachwarner.c:335
+#: src/plugins/attachwarner/attachwarner_prefs.c:234
+msgid "AttachWarner"
 msgstr "Bilagevarnare"
 
-#: src/plugins/attachwarner/attachwarner.c:292
+#: src/plugins/attachwarner/attachwarner.c:293
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9442,22 +9675,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/keyword_warner/keyword_warner_prefs.c:87
 msgid "Expressions are case sensitive"
 msgstr "Uttryck är skiftlägeskänsliga"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:93
+#: src/plugins/attachwarner/attachwarner_prefs.c:94
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:94
 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:116
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:116
 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:124
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:124
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
@@ -9467,22 +9706,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:129
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:129
 msgid "Forwarded or redirected messages"
 msgstr "Vidarebefordrade eller omdirigerade meddelanden"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:132
+#: src/plugins/attachwarner/attachwarner_prefs.c:137
 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:140
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:140
+#: src/prefs_msg_colors.c:310
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:142
+#: src/plugins/attachwarner/attachwarner_prefs.c:147
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:147
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
@@ -9490,49 +9733,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:156
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:156
+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/prefs_matcher.c:2590
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1663 src/prefs_matcher.c:1670
+#: src/prefs_matcher.c:1678 src/prefs_matcher.c:1680 src/prefs_matcher.c:2592
+#: src/prefs_matcher.c:2596
 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 +9780,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 +9794,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 +9840,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/bsfilter/bsfilter_gtk.c:142
 #: src/plugins/spamassassin/spamassassin_gtk.c:419
 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/bsfilter/bsfilter_gtk.c:150
 #: src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Maximum size"
 msgstr "Maximal storlek"
 
 #: 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:386
 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:389 src/prefs_account.c:1748
+msgid "KiB"
+msgstr "KiB"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
@@ -9651,14 +9887,14 @@ 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/bsfilter/bsfilter_gtk.c:178
 #: src/plugins/spamassassin/spamassassin_gtk.c:435
 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/bsfilter/bsfilter_gtk.c:184
 #: src/plugins/spamassassin/spamassassin_gtk.c:441
 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,13 +9924,13 @@ 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/bsfilter/bsfilter_gtk.c:190
 #: src/plugins/spamassassin/spamassassin_gtk.c:456
 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/bsfilter/bsfilter_gtk.c:194
 #: src/plugins/spamassassin/spamassassin_gtk.c:460
 msgid ""
 "Messages coming from your address book contacts will be received in the "
@@ -9704,13 +9940,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/bsfilter/bsfilter_gtk.c:204
 #: src/plugins/spamassassin/spamassassin_gtk.c:470
 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 +9967,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/bsfilter/bsfilter_gtk.c:231
 #: src/plugins/spamassassin/spamassassin_gtk.c:448
 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 +9996,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 +10005,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 +10037,12 @@ msgstr ""
 "\n"
 "Alternativ finns i /Konfiguration/Egenskaper/Insticksmoduler/Bsfilter"
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:171
+#: src/plugins/bsfilter/bsfilter_gtk.c:170
 #: src/plugins/spamassassin/spamassassin_gtk.c:427
 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 +10050,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 +10083,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 +10097,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 +10120,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 +10130,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 +10171,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"
 
@@ -10048,7 +10284,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 +10293,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 +10302,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 +10390,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:4360
+#: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -10207,7 +10443,7 @@ 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/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_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Bläddra"
@@ -10216,89 +10452,90 @@ msgstr "Bläddra"
 msgid "Select stylesheet"
 msgstr "Välj stilmall"
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:421
 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:500
 msgid "Load images"
 msgstr "Ladda bilder"
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:502
 msgid "Enable remote content"
 msgstr "Tillåt externt innehåll"
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:504
 msgid "Enable Javascript"
 msgstr "Aktivera Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:506
 msgid "Enable Plugins"
 msgstr "Aktivera Insticksmoduler"
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:508
 msgid "Enable Java"
 msgstr "Aktivera Java"
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:510
 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:688
 #, 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:748
 #, 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
+#: src/plugins/fancy/fancy_viewer.c:759
 msgid "Search the Web"
 msgstr "Sök webben"
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:770
 msgid "Open in Viewer"
 msgstr "Öppna i visare"
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:779
 msgid "Open in Browser"
 msgstr "Öppna i browser"
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:789
 msgid "Open Image"
 msgstr "Öppna Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Copy Link"
 msgstr "Kopiera Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:802
 msgid "Download Link"
 msgstr "Ladda ner Länk"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:813
 msgid "Save Image As"
 msgstr "Spara Bild Som"
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:823
 msgid "Copy Image"
 msgstr "Kopiera Bild"
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:863
 msgid "Import feed"
 msgstr "Importera flöde"
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1145
 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:1173
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML-Visare"
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1178
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10311,17 +10548,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 +10577,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 +10591,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 +10599,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 +10608,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 +10617,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 +10626,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"
@@ -10526,12 +10771,12 @@ 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/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 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/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
 msgid "Username:"
 msgstr "Användarnamn:"
 
@@ -10581,10 +10826,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:261
+#: src/plugins/keyword_warner/keyword_warner.c:314
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:234
+msgid "Keyword Warner"
+msgstr "Nyckelordsvarnare"
+
+#: src/plugins/keyword_warner/keyword_warner.c:271
+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:137
+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 +10994,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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "timmar"
 
@@ -10794,11 +11076,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 +11088,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 +11112,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"
 
@@ -10857,15 +11139,15 @@ msgstr ""
 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:149
 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,15 +11163,15 @@ 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"
 
@@ -10903,74 +11185,65 @@ 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:5844
 msgid "_Filter"
 msgstr "_Filter"
 
@@ -11027,7 +11300,7 @@ 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/pdf_viewer/poppler_viewer.c:1320
 msgid "Loading..."
 msgstr "Laddar..."
 
@@ -11077,20 +11350,20 @@ msgstr "Ansluter..."
 msgid "Manage Sieve Filters"
 msgstr "Hantera Sieve-filter"
 
-#: 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 "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 +11371,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:1292
 msgid "Server information"
 msgstr "Serverinformation"
 
@@ -11149,30 +11422,30 @@ 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:1487
+#: src/prefs_account.c:2108
 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/vcalendar/vcal_prefs.c:400
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/wizard.c:1635
 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 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:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Automatiskt"
 
@@ -11222,7 +11495,7 @@ msgstr ""
 msgid "Log file"
 msgstr "Loggfil"
 
-#: src/plugins/notification/notification_banner.c:357
+#: src/plugins/notification/notification_banner.c:356
 msgid "Folder:"
 msgstr "Mapp:"
 
@@ -11239,7 +11512,7 @@ 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_plugin.c:418
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -11251,59 +11524,55 @@ msgstr "Inga nya meddelanden"
 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 +11588,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"
 
@@ -11424,7 +11693,7 @@ msgstr "Banderoll"
 msgid "Popup"
 msgstr "Popup"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:267
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr "Kommando"
@@ -11486,13 +11755,13 @@ 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/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/prefs_summaries.c:525 src/prefs_summaries.c:578
 msgid "Always"
 msgstr "Alltid"
 
@@ -11802,95 +12071,95 @@ msgstr "Format:"
 msgid "Optimized:"
 msgstr "Optimerad:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr "PDF-egenskaper"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr "Ange lösenord"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1367
+#: src/plugins/pdf_viewer/poppler_viewer.c:1372
 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:1387
 #, c-format
 msgid "%s Document"
 msgstr "%s Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr "av %d"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1404
+#: src/plugins/pdf_viewer/poppler_viewer.c:1409
 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:1781
+#: src/plugins/pdf_viewer/poppler_viewer.c:1998
 msgid "Document Index"
 msgstr "Dokumentindex"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr "Första sidan"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr "Sista sidan"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr "Zooma ut"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr "Passa Sida"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr "Passa Sidbredd"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr "Rotera Vänster"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr "Rotera Höger"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr "Skriv Ut Dokument"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr "Dokumentinfo"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr "Sidnummer"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr "Anpassad zoom"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2108
+#: src/plugins/pdf_viewer/poppler_viewer.c:2113
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11903,13 +12172,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:2119
+#: src/plugins/pdf_viewer/poppler_viewer.c:2127
+#: src/plugins/pdf_viewer/poppler_viewer.c:2147
 msgid "PDF Viewer"
 msgstr "PDF-visare"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2118
+#: src/plugins/pdf_viewer/poppler_viewer.c:2123
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11925,7 +12194,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)..."
 
@@ -11944,38 +12213,49 @@ msgid "[no user id]"
 msgstr "[inget användarid.]"
 
 #: 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:262
+msgid "Please enter the passphrase for the new key:"
+msgstr "Ange lösenfrasen för den nya nyckeln:"
+
+#: src/plugins/pgpcore/passphrase.c:266
 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:270
 msgid "Bad passphrase.\n"
 msgstr "Fel lösenfras.\n"
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/passphrase.c:271
+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 "_No"
+msgstr "_Nej"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr "från nyckelserver"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr "från Web Key Directory"
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
@@ -11983,15 +12263,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 +12279,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 vilket som av följande kommando: \n"
 "\n"
 "      "
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
@@ -12017,29 +12297,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:288
+msgid "or"
+msgstr "eller"
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: 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"
 
@@ -12099,8 +12377,8 @@ 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/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "minuter"
 
@@ -12160,69 +12438,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 +12519,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 +12699,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 +12712,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 +12720,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 +12734,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:1173 src/plugins/pgpcore/sgpgme.c:1195
 #, 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:1183
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
@@ -12470,11 +12747,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:1201
 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:1205
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12487,62 +12764,41 @@ msgstr ""
 "\n"
 "Vill du exportera det till en nyckelserver?"
 
-#: src/plugins/pgpcore/sgpgme.c:1020
+#: src/plugins/pgpcore/sgpgme.c:1209
 msgid "Key generated"
 msgstr "Nyckel genererad"
 
-#: src/plugins/pgpcore/sgpgme.c:1096
+#: src/plugins/pgpcore/sgpgme.c:1285
 msgid "Key exported."
 msgstr "Nyckel exporterad."
 
-#: src/plugins/pgpcore/sgpgme.c:1098
+#: src/plugins/pgpcore/sgpgme.c:1287
 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 +12806,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 +12868,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 +12912,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 +12937,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"
 
@@ -12724,9 +12984,9 @@ msgstr "Visa Python-konsol..."
 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:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
+#: src/wizard.c:1625
 msgid "Browse"
 msgstr "Bläddra"
 
@@ -12834,7 +13094,7 @@ msgstr ""
 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 +13158,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:285 src/plugins/rssyl/rssyl_cb_menu.c:332
 #: 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:358
 #, 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:359
 msgid "Remove feed tree"
 msgstr "Ta bort flödesmapp"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_cb_menu.c:393
 msgid "Select an OPML file"
 msgstr "Välj en OPML-fil"
 
@@ -13029,9 +13289,9 @@ msgstr ""
 "ä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/vcalendar/vcal_prefs.c:594
+msgid "Verify TLS certificate validity"
+msgstr "Verifiera TLS-certifikatets giltighet"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:380
 msgid "User name"
@@ -13046,8 +13306,8 @@ 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/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "dagar"
 
@@ -13146,8 +13406,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"
@@ -13190,13 +13450,13 @@ msgstr ""
 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 +13465,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 +13535,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 +13572,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 +13597,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 +13627,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"
 
@@ -13379,7 +13639,7 @@ msgstr "Aktiverad"
 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:185 src/wizard.c:1573
 msgid "Password:"
 msgstr "Lösenord:"
 
@@ -13423,17 +13683,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 "
@@ -13541,29 +13801,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 +13836,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:602 src/plugins/vcalendar/month-view.c:689
 msgid "Start"
 msgstr "Start"
 
-#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:702
 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:797
 msgid "Week number"
 msgstr "Veckonummer"
 
-#: src/plugins/vcalendar/month-view.c:889
+#: src/plugins/vcalendar/month-view.c:888
 msgid "Previous month"
 msgstr "Föregående månad"
 
-#: src/plugins/vcalendar/month-view.c:909
+#: src/plugins/vcalendar/month-view.c:908
 msgid "Next month"
 msgstr "Nästa månad"
 
@@ -13752,45 +14012,45 @@ msgstr "Acceptera preliminärt"
 msgid "Decline"
 msgstr "Avvisa"
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 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: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:715
 msgid "Details follow:"
 msgstr "Detaljer följer:"
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr "Du har skapat ett möte."
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 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:496
 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:505
 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:559
 msgid "(this event recurs)"
 msgstr "(denna händelse återkommer)"
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:565
 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:714
 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:718
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13799,35 +14059,35 @@ 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:799
 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:806
 msgid "Error - no calendar part found."
 msgstr "Fel - Ingen kalenderdel hittad."
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:820
 msgid "Error - Unknown calendar component type."
 msgstr "Fel - Okänd typ på kalenderkomponenten."
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:954
 msgid "Send a notification to the attendees"
 msgstr "Skicka en notifiering till alla deltagare"
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Cancel meeting"
 msgstr "Ställ in möte"
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:964
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "Är du säker på att du vill ställa in detta möte?"
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "No account found"
 msgstr "Inget konto hittat"
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1060
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13835,128 +14095,128 @@ msgstr ""
 "Du har inget konto som matchar någon deltagare.\n"
 "Vill du svara ändå ?"
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1062
 msgid "Reply anyway"
 msgstr "Svara ändå"
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Answer"
 msgstr "Svar"
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Edit meeting..."
 msgstr "Redigera möte..."
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Cancel meeting..."
 msgstr "Ställ in möte..."
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Launch website"
 msgstr "Starta webbplats"
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1198
 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:1237
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1616
 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:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 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:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1597
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1607
 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:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Starting:"
 msgstr "Startar:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1242
 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:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1599
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
 msgid "Attendees:"
 msgstr "Närvarande:"
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1246
 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 +14225,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 +14252,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 +14263,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"
 
@@ -14262,7 +14522,7 @@ 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:1090
 msgid "Free/busy retrieval failed"
 msgstr "Hämtning av ledig/upptagen misslyckades"
 
@@ -14278,22 +14538,22 @@ msgstr "Skicka ändå"
 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:1072
 #, 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:1099
 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:1112
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1119
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1127
 msgid "Everyone is available."
 msgstr "Alla är tillgängliga."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1128
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
@@ -14301,7 +14561,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:1298
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -14309,61 +14569,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:1379
 msgid "Save & Send"
 msgstr "Spara & Skicka"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1380
 msgid "Check availability"
 msgstr "Kontrollera tillgänglighet"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1474
 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:1480
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1504 src/prefs_matcher.c:771
 msgid "on:"
 msgstr "på:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1498
 msgid "Ends at:"
 msgstr "Slutar vid:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1539
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1541
 #, 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:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Time:"
 msgstr "Tid:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, 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:1745
 #, 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:1756
 #, 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:1757
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -14380,120 +14640,120 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1774
 #, 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:1900
 msgid "Empty calendar"
 msgstr "Töm kalender"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1901
 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:1941
 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:1964
 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:1981
 #, 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:2097
 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:2129
 #, 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 +14762,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 +14778,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:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 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:416 src/prefs_account.c:1804 src/prefs_account.c:3008
+#: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Server för diskussionsgrupper (NNTP)"
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Lokal mbox-fil"
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Inget (endast SMTP)"
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Använd som standard"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1256
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1262
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Auto-konfiguration"
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14614,77 +14874,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:1375
 msgid "This server requires authentication"
 msgstr "Denna server kräver autentisering"
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Autentisera vid kontakt"
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "Server för diskussionsgrupper"
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Lokal brevlåda"
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "SMTP-server (skicka)"
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1471
 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:1480
 msgid "command to send mails"
 msgstr "kommando för att skicka e-post"
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Lokal"
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 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:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 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:1661
+msgid "Authenticate before POP connection"
+msgstr "Autentisera före POP-anslutning"
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
+msgid "Select"
+msgstr "Välj"
+
+#: src/prefs_account.c:1696
 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:1707
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 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:1737
 msgid "Receive size limit"
 msgstr "Storleksgräns för mottagande"
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1740
 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 +14956,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:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal artiklar att ladda ner"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "obegränsad om 0 väljs"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Ren text"
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "Mapp på IMAP server"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(vanligtvis tom)"
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Visa enbart prenumererade mappar"
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1864
 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:1866
 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:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Kontrollera automatiskt"
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Använd globala inställningar"
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 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:1921
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1937
 msgid "Allow filtering using plugins on receiving"
 msgstr "Tillåt insticksmoduler filtrera vid mottagning"
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1941
 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:2031 src/prefs_customheader.c:210
+#: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "Generera Meddelande-ID"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2036
 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:2039
 msgid "Add user agent header"
 msgstr "Lägg till huvud för användaragent"
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentisering (SMTP AUTH)"
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14787,172 +15051,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:2174
 msgid "Authenticate with POP before sending"
 msgstr "Autentisera med POP innan avsändning"
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "POP autentiseringstimeout"
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2270
+msgid "Authorization"
+msgstr "Autentisering"
+
+#: src/prefs_account.c:2287
+msgid "Select OAuth2 Email Service Provider"
+msgstr "Välj OAuth2 e-postleverantör"
+
+#: src/prefs_account.c:2327
+msgid "Client ID"
+msgstr "KlientID"
+
+#: src/prefs_account.c:2333
+msgid "Client secret"
+msgstr "Klienthemlighet"
+
+#: src/prefs_account.c:2365
+msgid "Obtain authorization code"
+msgstr "Skaffa behörighetskod"
+
+#: src/prefs_account.c:2369
+msgid "Open default browser with request"
+msgstr "Öppna standardwebbläsare med förfrågan"
+
+#: src/prefs_account.c:2375
+msgid "Copy link"
+msgstr "Kopiera Länk"
+
+#: src/prefs_account.c:2387
+msgid "Authorization code"
+msgstr "autentiseringskod"
+
+#: src/prefs_account.c:2395
+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:2402
+msgid "Complete authorization"
+msgstr "Fullständig autentisering"
+
+#: src/prefs_account.c:2406
+msgid "Authorize"
+msgstr "Autentisera"
+
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
 msgstr "Infoga signatur automatiskt"
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Kommando utdata"
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
 msgstr "Ordlistor för stavningskontroll"
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Standardordlista"
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 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_account.c:2721 src/prefs_account.c:4222
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
+#: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 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:2736 src/prefs_folder_item.c:1640 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:2751 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Standard sekretesssystem"
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "Signera alltid meddelanden"
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "Kryptera alltid meddelanden"
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2831
 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:2834
 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:2837
 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:2839
 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:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
+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:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
+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:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 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:3039
 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:3043
+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:3054
 msgid "Client certificates"
 msgstr "Klientcertifikat"
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3062
 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:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 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:3090
 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:3130
+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:3133
+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:3145
+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:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Använd proxyserver"
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3246
 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:3248
 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:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Användarnamn"
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Använd proxyserver för att skicka"
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -14961,27 +15271,27 @@ msgstr ""
 "till konfigurerad utgående server, och förbigå eventuellt konfigurerad "
 "proxyserver."
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "POP-port"
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "IMAP-port"
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "NNTP-port"
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Domännamn"
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3468
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -14989,238 +15299,271 @@ 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:3482
 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:3491
 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:3544
 msgid "Put sent messages in"
 msgstr "Spara skickade meddelanden i"
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Spara köade meddelanden i"
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Lagra utkast i"
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Lagra bortagna meddelande i"
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "POP-server har inte angivits."
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3649
 msgid "The default Inbox folder doesn't exist."
 msgstr "Standardmapp för Inkorgen finns inte."
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "IMAP-server har inte angivits."
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3666
 msgid "local mailbox filename is not entered."
 msgstr "lokal brevlåda har inte angivits."
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "e-postkommando har inte angivits."
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3682
 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:3689
 msgid "Password cannot contain a newline character."
 msgstr "Lösenord kan inte innehålla nyradstecken."
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3726
 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:3731
 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:3826
 msgid "domain is not specified."
 msgstr "domän inte specificerad."
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "skickatmapp är inte vald."
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "kömapp är inte vald."
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "utkastmapp är inte vald."
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "skräpmapp är inte vald."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4166
 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:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Skicka"
+
+#: src/prefs_account.c:4203
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Sekretess"
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Kontoegenskaper"
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Misslyckades (fel adress)"
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4946
 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:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Välj certifikatsfil"
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (insticksmodulen kunde inte laddas)"
 
-#: src/prefs_actions.c:225
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Auktorisation slutförd"
+
+#: src/prefs_account.c:6278
+msgid "Your OAuth2 authorisation code has been received by Claws Mail"
+msgstr "Din OAuth2 autentiseringskod har mottagits av Claws Mail"
+
+#: src/prefs_account.c:6281
+msgid "Authorisation NOT completed"
+msgstr "Auktorisation INTE slutförd"
+
+#: src/prefs_account.c:6282
+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:227
 msgid "Actions configuration"
 msgstr "Aktivitetskonfiguration"
 
-#: src/prefs_actions.c:252
+#: src/prefs_actions.c:254
 msgid "Menu name"
 msgstr "Menynamn"
 
-#: src/prefs_actions.c:285
+#: src/prefs_actions.c:287
 msgid "Shell command"
 msgstr "Skalkommando"
 
-#: src/prefs_actions.c:295
+#: src/prefs_actions.c:297
 msgid "Filter action"
 msgstr "Filteraktivitet"
 
-#: src/prefs_actions.c:301
+#: src/prefs_actions.c:303
 msgid "Edit filter action"
 msgstr "Redigera filteraktivitet"
 
-#: src/prefs_actions.c:329
+#: src/prefs_actions.c:331
 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:339
 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_actions.c:341 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
+#: src/prefs_toolbar.c:1025
 msgid "D_elete"
 msgstr "Ta bort"
 
-#: src/prefs_actions.c:347
+#: src/prefs_actions.c:349
 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:359 src/prefs_filtering.c:504 src/prefs_template.c:338
 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:367
 msgid "Show information on configuring actions"
 msgstr "Visa information om konfiguration av aktiviteter"
 
-#: src/prefs_actions.c:396
+#: src/prefs_actions.c:398
+msgid "Move the selected action to the top"
+msgstr "Flytta den valda aktiviteten överst"
+
+#: src/prefs_actions.c:408
 msgid "Move the selected action up"
 msgstr "Flytta upp vald aktivitet"
 
-#: src/prefs_actions.c:404
+#: src/prefs_actions.c:416
 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_actions.c:426
+msgid "Move the selected action to the bottom"
+msgstr "Flytta den valda aktiviteten sist"
+
+#: src/prefs_actions.c:559 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:843
+#: src/prefs_filtering.c:844 src/prefs_filtering.c:954 src/prefs_matcher.c:922
 #: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(Ny)"
 
-#: src/prefs_actions.c:602
+#: src/prefs_actions.c:624
 msgid "Menu name is not set."
 msgstr "Menynamn är inte angivet."
 
-#: src/prefs_actions.c:607
+#: src/prefs_actions.c:629
 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:634
 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:653
 msgid "Menu name is too long."
 msgstr "Menynamnet är för långt."
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:662
 msgid "Command-line not set."
 msgstr "Kommandorad är inte angivet."
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:667
 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:673
 #, c-format
 msgid ""
 "The command\n"
@@ -15231,139 +15574,140 @@ msgstr ""
 "%s\n"
 "har syntax fel."
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:731
 msgid "Delete action"
 msgstr "Ta bort aktivitet"
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:732
 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:752
 msgid "Delete all actions"
 msgstr "Ta bort alla aktiviteter"
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:753
 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_actions.c:920 src/prefs_actions.c:951 src/prefs_filtering.c:1508
+#: src/prefs_filtering.c:1530 src/prefs_matcher.c:2170 src/prefs_template.c:572
 #: src/prefs_template.c:597
 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:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 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_actions.c:922 src/prefs_actions.c:927 src/prefs_actions.c:953
+#: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
+#: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
 #: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Fortsätt redigera"
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:925
 msgid "Actions list not saved"
 msgstr "Aktivitetslistan är inte sparad"
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:926
 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:996
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\">Menynamn:</span>"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:997
 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:999
 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:1000
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Börjar med:</span>"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:1001
 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:1002
 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:1003
 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:1004
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Avsluta med:</span>"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:1005
 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:1006
 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:1007
 msgid "to run command asynchronously"
 msgstr "för att köra kommando asynkront"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:1008
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Använd:</span>"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:1009
 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:1010
 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:1011
 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:1012
 msgid "for a user provided argument"
 msgstr "för ett användarinmatat argument"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:1013
 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:1014
 msgid "for the text selection"
 msgstr "för textmarkering"
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:1015
 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:1016
 msgid "for a literal %"
 msgstr "för ett bokstavligt %"
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
+#: src/prefs_actions.c:1026 src/prefs_themes.c:1190
 msgid "Actions"
 msgstr "Aktiviteter"
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1027
 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 +15715,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_actions.c:1114 src/prefs_filtering.c:1706
 #: src/prefs_template.c:1114
 msgid "D_uplicate"
 msgstr "D_uplicera"
 
-#: src/prefs_actions.c:1208
+#: src/prefs_actions.c:1234
 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:1321
+msgid "Entry was modified"
+msgstr "Posten har ändrats"
+
+#: src/prefs_actions.c:1322
+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:1332 src/prefs_filtering.c:1081
+#: src/prefs_filtering.c:1139
 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,7 +15758,7 @@ 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"
 
@@ -15451,8 +15807,8 @@ 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 "
+msgid "KiB into message body"
+msgstr "KiB i meddelandet"
 
 #: src/prefs_compose_writing.c:214
 msgid "Replying"
@@ -15487,11 +15843,11 @@ msgstr "Vid 'släpp' av filer i redigerarfönstret"
 msgid "Ask"
 msgstr "Fråga"
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:522
+#: src/prefs_compose_writing.c:243 src/toolbar.c:533
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:523
+#: src/prefs_compose_writing.c:244 src/toolbar.c:534
 msgid "Attach"
 msgstr "Bifoga"
 
@@ -15504,68 +15860,72 @@ 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_matcher.c:1639 src/prefs_matcher.c:1654
 msgid "Header name is not set."
 msgstr "Brevhuvudsnamn är inte angivet."
 
 #: src/prefs_customheader.c:514
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "Ett kolon (:) tillåts inte i ett anpassat brevhuvud."
+
+#: src/prefs_customheader.c:519
 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:566
 msgid "Choose a PNG file"
 msgstr "Välj en PNG-fil"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Välj en XBM-fil"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Välj en textfil"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Filen är inte en bild."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 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:594
 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:599
 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:608
 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:617
 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:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface-fel: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Filen innehåller radslut."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Ta bort brevhuvud"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 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:880
 msgid "Current custom headers"
 msgstr "Aktuella anpassade brevhuvuden"
 
@@ -15626,8 +15986,8 @@ 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:282 src/prefs_image_viewer.c:179
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr "Meddelandevy"
 
@@ -15650,8 +16010,8 @@ msgstr "Dölj"
 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:175 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:77 src/summaryview.c:2889 src/toolbar.c:515
 msgid "Mark"
 msgstr "Markera"
 
@@ -15672,11 +16032,11 @@ 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/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2509
 msgid "Execute"
 msgstr "Kör"
 
-#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:641
 msgid "Color label"
 msgstr "Färgmarkering"
 
@@ -15691,8 +16051,8 @@ 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_summaries.c:646 src/prefs_summary_column.c:86
+#: src/summaryview.c:475
 msgid "Score"
 msgstr "Poäng"
 
@@ -15706,7 +16066,7 @@ 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_summary_column.c:88 src/summaryview.c:477
 msgid "Tags"
 msgstr "Etiketter"
 
@@ -15734,7 +16094,7 @@ msgstr "Stoppa filter"
 msgid "Action configuration"
 msgstr "Aktivitetskonfiguration"
 
-#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
+#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1899
 #: src/prefs_matcher.c:597
 msgid "Rule"
 msgstr "Regel"
@@ -15776,25 +16136,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/prefs_filtering_action.c:1220 src/prefs_matcher.c:2218
 #: src/quote_fmt.c:79
 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:2227
 msgid "filename (should not be modified)"
 msgstr "filnamn (får inte ändras)"
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2228
 #: src/quote_fmt.c:87
 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:2229
 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:2230
 msgid "quote character"
 msgstr "citattecken"
 
@@ -15836,8 +16196,8 @@ msgstr "Aktuell aktivitetslista"
 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:266 src/prefs_filtering.c:872
+#: src/prefs_filtering.c:988
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "Alla"
@@ -15898,51 +16258,51 @@ msgstr "Flytta vald regel en sida ner"
 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:1045 src/prefs_filtering.c:1131
 msgid "Condition string is not valid."
 msgstr "Villkorssträngen är inte giltig."
 
-#: src/prefs_filtering.c:1116
+#: src/prefs_filtering.c:1118
 msgid "Condition string is empty."
 msgstr "Villkorssträngen är tom."
 
-#: src/prefs_filtering.c:1122
+#: src/prefs_filtering.c:1124
 msgid "Action string is empty."
 msgstr "Aktivitetssträngen är tom."
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1213
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1214
 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:1232
 msgid "Delete all rules"
 msgstr "Ta bort alla regler"
 
-#: src/prefs_filtering.c:1231
+#: src/prefs_filtering.c:1233
 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:1484
 msgid "Filtering rules not saved"
 msgstr "Filtreringsreglerna är inte sparade"
 
-#: src/prefs_filtering.c:1483
+#: src/prefs_filtering.c:1485
 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:1709
 msgid "Move one page up"
 msgstr "Flytta upp en sida"
 
-#: src/prefs_filtering.c:1706
+#: src/prefs_filtering.c:1710
 msgid "Move one page down"
 msgstr "Flytta ner en sida"
 
-#: src/prefs_filtering.c:1863
+#: src/prefs_filtering.c:1867
 msgid "Enable"
 msgstr "Aktivera"
 
@@ -15962,17 +16322,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_summary_column.c:347 src/prefs_toolbar.c:1033
 msgid " Use default "
 msgstr " Använd standard "
 
-#: src/prefs_folder_item.c:214
+#: src/prefs_folder_item.c:218
 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 +16343,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:299 src/prefs_folder_item.c:931
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15991,55 +16351,55 @@ msgstr ""
 "Använd på\n"
 "undermappar"
 
-#: src/prefs_folder_item.c:318
+#: src/prefs_folder_item.c:324
 msgid "Normal"
 msgstr "Normalläge"
 
-#: src/prefs_folder_item.c:320
+#: src/prefs_folder_item.c:326
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: src/prefs_folder_item.c:336
+#: src/prefs_folder_item.c:342
 msgid "Folder type"
 msgstr "Mapptyp"
 
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:354
 msgid "Simplify Subject RegExp"
 msgstr "Förenkla RegExp för ämne"
 
-#: src/prefs_folder_item.c:374
+#: src/prefs_folder_item.c:380
 msgid "Test string"
 msgstr "Teststräng"
 
-#: src/prefs_folder_item.c:391
+#: src/prefs_folder_item.c:397
 msgid "Result"
 msgstr "Resultat"
 
-#: src/prefs_folder_item.c:406
+#: src/prefs_folder_item.c:412
 msgid "Folder chmod"
 msgstr "Mapp-chmod"
 
-#: src/prefs_folder_item.c:432
+#: src/prefs_folder_item.c:438
 msgid "Folder color"
 msgstr "Mappfärg"
 
-#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
+#: src/prefs_folder_item.c:450 src/prefs_folder_item.c:1841
 msgid "Pick color for folder"
 msgstr "Välj färg för mapp"
 
-#: src/prefs_folder_item.c:462
+#: src/prefs_folder_item.c:468
 msgid "Run Processing rules at start-up"
 msgstr "Kör behandlingsregler vid uppstart"
 
-#: src/prefs_folder_item.c:477
+#: src/prefs_folder_item.c:483
 msgid "Run Processing rules when opening"
 msgstr "Kör behandlingsregler vid öppnande"
 
-#: src/prefs_folder_item.c:491
+#: src/prefs_folder_item.c:497
 msgid "Scan for new mail"
 msgstr "Leta efter ny post"
 
-#: src/prefs_folder_item.c:493
+#: src/prefs_folder_item.c:499
 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 +16407,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:519
 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:536
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
@@ -16059,69 +16419,82 @@ 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:547
+msgid "Skip folder when searching for unread or new messages"
+msgstr "Hoppa över mapp vid sökning av olästa eller nya meddelanden"
+
+#: src/prefs_folder_item.c:549
+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:585
 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:592
 msgid "0: all bodies"
 msgstr "0: alla meddelandetexter"
 
-#: src/prefs_folder_item.c:576
+#: src/prefs_folder_item.c:600
 msgid "Remove older messages bodies"
 msgstr "Ta bort äldre meddelandetext"
 
-#: src/prefs_folder_item.c:593
+#: src/prefs_folder_item.c:618
 msgid "Discard folder cache"
 msgstr "Överge mapp-cache"
 
-#: src/prefs_folder_item.c:905
+#: src/prefs_folder_item.c:940
 msgid "Request Return Receipt"
 msgstr "Begär läskvitto"
 
-#: src/prefs_folder_item.c:920
+#: src/prefs_folder_item.c:955
 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:970 src/prefs_folder_item.c:996
+#: src/prefs_folder_item.c:1048 src/prefs_folder_item.c:1074
+#: src/prefs_folder_item.c:1100
 #, 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:1022
 #, 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:1125
 msgid "Default account"
 msgstr "Standardkonto"
 
-#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+#: src/prefs_folder_item.c:1267 src/prefs_folder_item.c:1299
 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:1854
 msgid "Discard cache"
 msgstr "Överge cache"
 
-#: src/prefs_folder_item.c:1782
+#: src/prefs_folder_item.c:1855
 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:1980
 msgid "General"
 msgstr "Allmänt"
 
-#: src/prefs_folder_item.c:1986
+#: src/prefs_folder_item.c:2059
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Egenskaper för mapp %s"
@@ -16130,7 +16503,7 @@ msgstr "Egenskaper för mapp %s"
 msgid "Folder and Message Lists"
 msgstr "Mapp- och meddelandelistor"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2091
 msgid "Message"
 msgstr "Meddelande"
 
@@ -16156,8 +16529,8 @@ msgstr "Använd ett annat typsnitt för utskrift"
 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:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:876
+#: src/prefs_themes.c:427
 msgid "Display"
 msgstr "Visa"
 
@@ -16165,31 +16538,47 @@ msgstr "Visa"
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:895 src/toolbar.c:260 src/toolbar.c:528
 msgid "Preferences"
 msgstr "Egenskaper"
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:75
 msgid "Automatically display attached images"
 msgstr "Visa bifogade bilder automatiskt"
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:81
 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:84
 msgid "Clicking image toggles scaling"
 msgstr "Klicka på bild för att skala"
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:95
+msgid "Fit image"
+msgstr "Passa bild"
+
+#: src/prefs_image_viewer.c:98
+msgid "Right-clicking image toggles fitting height/width"
+msgstr "Högerklick på bild växlar anpassning av höjd/bredd"
+
+#: src/prefs_image_viewer.c:101
+msgid "Height"
+msgstr "Höjd"
+
+#: src/prefs_image_viewer.c:106
+msgid "Width"
+msgstr "Bredd"
+
+#: src/prefs_image_viewer.c:113
 msgid "Display images inline"
 msgstr "Visa bilder i meddelandet"
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:119
 msgid "Print images"
 msgstr "Skriv ut bilder"
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:180
 msgid "Image Viewer"
 msgstr "Bildvisare"
 
@@ -16364,12 +16753,12 @@ msgid "bytes"
 msgstr "byte"
 
 #: src/prefs_matcher.c:364
-msgid "kilobytes"
-msgstr "kilobyte"
+msgid "kibibytes"
+msgstr "kibibytes"
 
 #: src/prefs_matcher.c:365
-msgid "megabytes"
-msgstr "megabyte"
+msgid "mebibytes"
+msgstr "mebibytes"
 
 #: src/prefs_matcher.c:369
 msgid "contains"
@@ -16395,11 +16784,11 @@ msgstr "meddelandedel"
 msgid "whole message"
 msgstr "hela meddelandet"
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6575
 msgid "Marked"
 msgstr "Markerad"
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6573
 msgid "Deleted"
 msgstr "Borttagen"
 
@@ -16407,12 +16796,12 @@ msgstr "Borttagen"
 msgid "Replied"
 msgstr "Besvarat"
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6567
 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:408 src/summaryview.c:6557 src/toolbar.c:526
+#: src/toolbar.c:1005 src/toolbar.c:2383
 msgid "Spam"
 msgstr "Skräppost"
 
@@ -16420,7 +16809,7 @@ msgstr "Skräppost"
 msgid "Has attachment"
 msgstr "Har bilaga"
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6593
 msgid "Signed"
 msgstr "Signerat"
 
@@ -16528,8 +16917,8 @@ 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:2583
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1660 src/prefs_matcher.c:1675
+#: src/prefs_matcher.c:2589
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "Alla"
@@ -16554,32 +16943,32 @@ msgstr "alla"
 msgid "of above rules"
 msgstr "ovanstående regler"
 
-#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
+#: src/prefs_matcher.c:1565 src/prefs_matcher.c:1644
 msgid "Search pattern is not set."
 msgstr "Sökmönster är inte angivet."
 
-#: src/prefs_matcher.c:1578
+#: src/prefs_matcher.c:1579
 msgid "Invalid hour."
 msgstr "Ogiltig timme."
 
-#: src/prefs_matcher.c:1587
+#: src/prefs_matcher.c:1589
 msgid "Test command is not set."
 msgstr "Testkommando är inte angivet."
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1661
 msgid "all addresses in all headers"
 msgstr "alla e-postadresser i alla brevhuvud"
 
-#: src/prefs_matcher.c:1662
+#: src/prefs_matcher.c:1664
 msgid "any address in any header"
 msgstr "någon e-postadress i något brevhuvud"
 
-#: src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1666
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "adressen(erna) i brevhuvudet '%s'"
 
-#: src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1667
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -16592,99 +16981,91 @@ msgstr ""
 "Om du vill matcha %s mot hela adressboken, så måste du välja '%s' från "
 "adressbokens/adressmapens rullgardinsmeny."
 
-#: src/prefs_matcher.c:1884
+#: src/prefs_matcher.c:1889
 msgid "Headers part"
 msgstr "Brevhuvudsdel"
 
-#: src/prefs_matcher.c:1888
+#: src/prefs_matcher.c:1893
 msgid "Headers values"
 msgstr "Värden i Brevhuvud"
 
-#: src/prefs_matcher.c:1892
+#: src/prefs_matcher.c:1897
 msgid "Body part"
 msgstr "Meddelandedel"
 
-#: src/prefs_matcher.c:1896
+#: src/prefs_matcher.c:1901
 msgid "Whole message"
 msgstr "Hela meddelandet"
 
-#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
+#: src/prefs_matcher.c:2018 src/prefs_matcher.c:2064
 msgid "in"
 msgstr "i"
 
-#: src/prefs_matcher.c:2015
+#: src/prefs_matcher.c:2020
 msgid "content is"
 msgstr "innehåll är"
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2024
 msgid "Date is"
 msgstr "Datum är"
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2035
 msgid "Age is"
 msgstr "Ålder är"
 
-#: src/prefs_matcher.c:2035
+#: src/prefs_matcher.c:2040
 msgid "Flag"
 msgstr "Flagga"
 
-#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
+#: src/prefs_matcher.c:2041 src/prefs_matcher.c:2055
 msgid "is"
 msgstr "är"
 
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2046
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/prefs_matcher.c:2049
+#: src/prefs_matcher.c:2054
 msgid "Label"
 msgstr "Etikett"
 
-#: src/prefs_matcher.c:2054
+#: src/prefs_matcher.c:2059
 msgid "Value:"
 msgstr "Värde:"
 
-#: src/prefs_matcher.c:2069
+#: src/prefs_matcher.c:2074
 msgid "Score is"
 msgstr "Poäng är"
 
-#: src/prefs_matcher.c:2070
+#: src/prefs_matcher.c:2075
 msgid "points"
 msgstr "poäng"
 
-#: src/prefs_matcher.c:2080
+#: src/prefs_matcher.c:2085
 msgid "Size is"
 msgstr "Storlek är"
 
-#: src/prefs_matcher.c:2085
+#: src/prefs_matcher.c:2090
 msgid "Scope:"
 msgstr "Omfattning:"
 
-#: src/prefs_matcher.c:2087
+#: src/prefs_matcher.c:2092
 msgid "tags"
 msgstr "etiketter"
 
-#: src/prefs_matcher.c:2092
+#: src/prefs_matcher.c:2097
 msgid "type is"
 msgstr "typ är"
 
-#: src/prefs_matcher.c:2096
+#: src/prefs_matcher.c:2101
 msgid "Program returns"
 msgstr "Programmet returnerar"
 
-#: src/prefs_matcher.c:2166
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"Posten sparades inte.\n"
-"Stäng ändå?"
-
-#: src/prefs_matcher.c:2233
+#: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Matchningstyp: 'Test'"
 
-#: src/prefs_matcher.c:2234
+#: src/prefs_matcher.c:2240
 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 +17078,95 @@ msgstr ""
 "\n"
 "Följande symboler kan användas:"
 
-#: src/prefs_matcher.c:2333
+#: src/prefs_matcher.c:2339
 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"
 
-#: src/prefs_message.c:129
+#: 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: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"
 
@@ -16926,7 +17315,7 @@ msgstr "Välj färg för hunkrader"
 msgid "Hunk lines"
 msgstr "Hunkrader"
 
-#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:378
 msgid "Folder list"
 msgstr "Mapplista"
 
@@ -17176,30 +17565,30 @@ 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"
+msgid "Primary passphrase"
+msgstr "Primärt lösenord"
 
 #: src/prefs_other.c:618
-msgid "Use a master passphrase"
-msgstr "Använd ett huvudlösenord"
+msgid "Use a primary passphrase"
+msgstr "Använd ett primärt lösenord"
 
 #: src/prefs_other.c:621
 msgid ""
-"If checked, your saved account passwords will be protected by a master "
-"passphrase. If no master passphrase is set, you will be prompted to set one."
+"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"
+msgid "Change primary passphrase"
+msgstr "Ändra primärt lösenord"
 
 #: src/prefs_other.c:816
 msgid "Miscellaneous"
 msgstr "Blandat"
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+#: src/prefs_proxy.c:242 src/prefs_receive.c:415 src/prefs_send.c:419
 msgid "Mail Handling"
 msgstr "Posthantering"
 
@@ -17440,8 +17829,8 @@ 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:420 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Skickar"
 
@@ -17493,204 +17882,212 @@ msgstr "Välj färg för felstavat ord. Använd svart för att understryka"
 msgid "Spell Checking"
 msgstr "Rättstavning"
 
-#: src/prefs_summaries.c: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 +18095,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:539
 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"
 
@@ -17919,29 +18316,29 @@ msgstr "Befintliga mallar"
 msgid "Template"
 msgstr "Mall"
 
-#: src/prefs_themes.c:401 src/prefs_themes.c:841
+#: src/prefs_themes.c:406 src/prefs_themes.c:939
 msgid "Default internal theme"
 msgstr "Internt standardtema"
 
-#: src/prefs_themes.c:423
+#: src/prefs_themes.c:428
 msgid "Themes"
 msgstr "Teman"
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:505
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "Ta bort systemtema '%s'"
 
-#: src/prefs_themes.c:502
+#: src/prefs_themes.c:507
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "Ta bort tema '%s'"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:512
 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:522
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17950,24 +18347,24 @@ msgstr ""
 "Fil %s misslyckades\n"
 "när temat togs bort."
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:526
 msgid "Removing theme directory failed."
 msgstr "Borttagning av temakatalogen misslyckades."
 
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:529
 msgid "Theme removed successfully"
 msgstr "Lyckades ta bort tema"
 
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:549
 msgid "Select theme folder"
 msgstr "Välj temamapp"
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:564
 #, c-format
 msgid "Install theme '%s'"
 msgstr "Installera tema '%s'"
 
-#: src/prefs_themes.c:562
+#: src/prefs_themes.c:567
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
@@ -17975,15 +18372,15 @@ msgstr ""
 "Denna mapp verkar inte vara en temamapp.\n"
 "Installera ändå?"
 
-#: src/prefs_themes.c:572
+#: src/prefs_themes.c:577
 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:597
 msgid "Theme exists"
 msgstr "Temat finns redan"
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:598
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17995,25 +18392,25 @@ msgstr ""
 "\n"
 "Vill du skriva över det?"
 
-#: src/prefs_themes.c:600
+#: src/prefs_themes.c:605
 #, 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:614
 #, 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:628
 msgid "Theme installed successfully."
 msgstr "Temat installerades utan fel."
 
-#: src/prefs_themes.c:630
+#: src/prefs_themes.c:635
 msgid "Failed installing theme"
 msgstr "Misslyckades med att installera tema"
 
-#: src/prefs_themes.c:633
+#: src/prefs_themes.c:638
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -18022,74 +18419,82 @@ msgstr ""
 "Fil %s misslyckades\n"
 "när temat installerades."
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:691
+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:1082
 msgid "Information"
 msgstr "Information"
 
-#: src/prefs_themes.c:998
+#: src/prefs_themes.c:1097
 msgid "Author"
 msgstr "Författare"
 
-#: src/prefs_themes.c:1006
+#: src/prefs_themes.c:1105
 msgid "URL"
 msgstr "URL"
 
-#: src/prefs_themes.c:1048
+#: src/prefs_themes.c:1147
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: src/prefs_themes.c:1105
+#: src/prefs_themes.c:1204
+msgid "View all"
+msgstr "Visa allla"
+
+#: src/prefs_themes.c:1209
 msgid "SVG rendering"
 msgstr "SVG-rendering"
 
-#: src/prefs_themes.c:1112
+#: src/prefs_themes.c:1216
 msgid "Enable alpha channel"
 msgstr "Aktivera alfakanal"
 
-#: src/prefs_themes.c:1113
+#: src/prefs_themes.c:1217
 msgid "Force scaling"
 msgstr "Tvinga skalning"
 
-#: src/prefs_themes.c:1119
+#: src/prefs_themes.c:1223
 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,75 +18502,75 @@ 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:913
 msgid "Item type"
 msgstr "Typ av objekt"
 
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:923
 msgid "Internal Function"
 msgstr "Intern funktion"
 
-#: src/prefs_toolbar.c:923
+#: src/prefs_toolbar.c:924
 msgid "User Action"
 msgstr "Användaraktivitet"
 
-#: src/prefs_toolbar.c:925 src/toolbar.c:279
+#: src/prefs_toolbar.c:926 src/toolbar.c:283
 msgid "Separator"
 msgstr "Separator"
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:933
 msgid "Event executed on click"
 msgstr "Aktivitet vid klick"
 
-#: src/prefs_toolbar.c:959
+#: src/prefs_toolbar.c:960
 msgid "Toolbar text"
 msgstr "Text på verktygsraden"
 
-#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
+#: src/prefs_toolbar.c:975 src/prefs_toolbar.c:1353
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/prefs_toolbar.c:1010
+#: src/prefs_toolbar.c:1011
 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:1231 src/prefs_toolbar.c:1245 src/prefs_toolbar.c:1259
 msgid "Toolbars"
 msgstr "Verktygsrader"
 
-#: src/prefs_toolbar.c:1231
+#: src/prefs_toolbar.c:1232
 msgid "Main Window"
 msgstr "Huvudfönster"
 
-#: src/prefs_toolbar.c:1245
+#: src/prefs_toolbar.c:1246
 msgid "Message Window"
 msgstr "Meddelandefönster"
 
-#: src/prefs_toolbar.c:1259
+#: src/prefs_toolbar.c:1260
 msgid "Compose Window"
 msgstr "Skriv Meddelandefönster"
 
-#: src/prefs_toolbar.c:1374
+#: src/prefs_toolbar.c:1376
 msgid "Icon text"
 msgstr "Ikontext"
 
-#: src/prefs_toolbar.c:1383
+#: src/prefs_toolbar.c:1385
 msgid "Mapped event"
 msgstr "Tilldelad händelse"
 
-#: src/prefs_toolbar.c:1690
+#: src/prefs_toolbar.c:1692
 msgid "Toolbar item icon"
 msgstr "Ikon för verktygsraden"
 
@@ -18226,40 +18631,40 @@ msgstr "Zooma ut"
 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:2797
 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 +18672,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,23 +18680,23 @@ 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"
 
@@ -18603,88 +19008,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 +19114,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,14 +19128,14 @@ 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:448
 msgid "Delete certificate"
 msgstr "Ta bort certifikat"
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:449
 msgid "Do you really want to delete this certificate?"
 msgstr "Vill du verkligen ta bort detta certifikat?"
 
@@ -18758,7 +19163,7 @@ msgstr "Villkor:"
 msgid "Find _all"
 msgstr "Hitta _alla"
 
-#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
+#: src/summary_search.c:692 src/summaryview.c:1154 src/summaryview.c:1417
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Söker i %s... \n"
@@ -18771,304 +19176,304 @@ msgstr "Början av lista nådd; fortsätt från slutet?"
 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:431
 msgid "Re-edit"
 msgstr "Omredigera"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:444
 msgid "Create _filter rule"
 msgstr "Skapa filter_regel"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:457
 msgid "_Set displayed columns"
 msgstr "Välj vi_sade kolumner"
 
-#: src/summaryview.c:461
+#: src/summaryview.c:462
 msgid "_Lock column headers"
 msgstr "Lås kolumnhuvuden"
 
-#: src/summaryview.c:598
+#: src/summaryview.c:599
 msgid "Toggle quick search bar"
 msgstr "Visa/Dölj snabbsöksfält"
 
-#: src/summaryview.c:635
+#: src/summaryview.c:636
 msgid "Toggle multiple selection"
 msgstr "Slå av/på multipla markeringar"
 
-#: src/summaryview.c:1339
+#: src/summaryview.c:1345
 msgid "Process mark"
 msgstr "Behandlingsmarkering"
 
-#: src/summaryview.c:1340
+#: src/summaryview.c:1346
 msgid "Some marks are left. Process them?"
 msgstr "Några markeringar finns kvar. Behandla dem?"
 
-#: src/summaryview.c:1390
+#: src/summaryview.c:1396
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Genomsöker mapp (%s)..."
 
-#: src/summaryview.c:1950 src/summaryview.c:1998
+#: src/summaryview.c:1951 src/summaryview.c:1999
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1951
+#: src/summaryview.c:1952
 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:1964 src/summaryview.c:2012 src/summaryview.c:2049
+#: src/summaryview.c:2097 src/summaryview.c:2164
 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:1976
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1999
+#: src/summaryview.c:2000
 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:2036 src/summaryview.c:2084
 msgid "No more new messages"
 msgstr "Inga fler nya meddelande"
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2037
 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:2061
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2085
 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:2118 src/summaryview.c:2151
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2119
 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:2128
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:2151
+#: src/summaryview.c:2152
 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:2185 src/summaryview.c:2214
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:2185
+#: src/summaryview.c:2186
 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:2195 src/summaryview.c:2228
 msgid "No labeled messages."
 msgstr "Inga färgmarkerade meddelanden."
 
-#: src/summaryview.c:2214
+#: src/summaryview.c:2215
 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:2538
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2723
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:2726
+#: src/summaryview.c:2727
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:2727 src/summaryview.c:2734
+#: src/summaryview.c:2728 src/summaryview.c:2735
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2732
+#: src/summaryview.c:2733
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2747
 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:2765 src/summaryview.c:2810
 #, 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:2785
 msgid "Message summary"
 msgstr "Meddelandesammanfattning"
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2786
 msgid "New:"
 msgstr "Nytt:"
 
-#: src/summaryview.c:2786
+#: src/summaryview.c:2787
 msgid "Unread:"
 msgstr "Oläst(a):"
 
-#: src/summaryview.c:2787
+#: src/summaryview.c:2788
 msgid "Total:"
 msgstr "Totalt:"
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2790
 msgid "Marked:"
 msgstr "Markerad:"
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2791
 msgid "Replied:"
 msgstr "Besvarat:"
 
-#: src/summaryview.c:2791
+#: src/summaryview.c:2792
 msgid "Forwarded:"
 msgstr "Vidarebefordrad:"
 
-#: src/summaryview.c:2792
+#: src/summaryview.c:2793
 msgid "Locked:"
 msgstr "Låst:"
 
-#: src/summaryview.c:2793
+#: src/summaryview.c:2794
 msgid "Ignored:"
 msgstr "Ignorerad:"
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2795
 msgid "Watched:"
 msgstr "Bevakad:"
 
-#: src/summaryview.c:2804
+#: src/summaryview.c:2805
 #, 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:3098
 msgid "Sorting summary..."
 msgstr "Sorterar sammanfattning..."
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3266
 msgid "Setting summary from message data..."
 msgstr "Skapar sammanfattning från meddelandedata..."
 
-#: src/summaryview.c:3471
+#: src/summaryview.c:3472
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
-#: src/summaryview.c:3528
+#: src/summaryview.c:3529
 msgid "(No Recipient)"
 msgstr "(Ingen mottagare)"
 
-#: src/summaryview.c:3576
+#: src/summaryview.c:3577
 #, c-format
 msgid "From: %s, on %s"
 msgstr "Från: %s, på %s"
 
-#: src/summaryview.c:3585
+#: src/summaryview.c:3586
 #, c-format
 msgid "To: %s, on %s"
 msgstr "Till: %s, på %s"
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4485
 msgid "You're not the author of the article."
 msgstr "Du är inte artikelns författare."
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4575
 #, 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:4578
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "Ta bort meddelande"
 msgstr[1] "Ta bort meddelanden"
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4742
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4797
 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:4848
 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:4882
 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:5046
 msgid "Append or Overwrite"
 msgstr "Lägg till eller Skriv över"
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5047
 msgid "Append or overwrite existing file?"
 msgstr "Lägg till eller skriv över befintlig fil?"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5048
 msgid "_Append"
 msgstr "_Bifoga"
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5048
 msgid "_Overwrite"
 msgstr "_Skriv över"
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5059 src/summaryview.c:5062 src/summaryview.c:5077
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Kan inte spara filen '%s'."
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5100
 #, 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:5558
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5806
 msgid "Skip these rules"
 msgstr "Hoppa över dessa regler"
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5809
 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:5812
 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:5841
 msgid "Filtering"
 msgstr "Filtrerar"
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5842
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -19076,72 +19481,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:5874
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5957
 msgid "Processing configuration"
 msgstr "Behandlar konfiguration"
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6105
 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:6107
 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:6108
 msgid "Reset color label"
 msgstr "Återställ färgetikett"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6108
 msgid "Set color label"
 msgstr "Sätt färgmarkering"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6553
 msgid "Ignored thread"
 msgstr "Ignorera tråd"
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6555
 msgid "Watched thread"
 msgstr "Bevakad tråd"
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6563
 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:6565
 msgid "Replied - click to see reply"
 msgstr "Svarat på - klicka för att se svar"
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6577
 msgid "To be moved"
 msgstr "Att flyttas"
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6579
 msgid "To be copied"
 msgstr "Att bli kopierad"
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6591
 msgid "Signed, has attachment(s)"
 msgstr "Signerat, har bilaga(or)"
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6595
 msgid "Encrypted, has attachment(s)"
 msgstr "Krypterad, har bilaga(or)"
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6597
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6599
 msgid "Has attachment(s)"
 msgstr "Har bilaga(or)"
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19150,45 +19555,45 @@ msgstr ""
 "Fel i reguljärt uttryck (regexp):\n"
 "%s"
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8428
 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:8433
 msgid "Go back to the folder list"
 msgstr "Gå tillbaka till mapplistan"
 
-#: src/textview.c:242
+#: src/textview.c:265
 msgid "_Open in web browser"
 msgstr "_Öppna i webbläsare"
 
-#: src/textview.c:243
+#: src/textview.c:266
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:250
+#: src/textview.c:273
 msgid "_Reply to this address"
 msgstr "Svara till denna ad_ress"
 
-#: src/textview.c:251
+#: src/textview.c:274
 msgid "Add to _Address book"
 msgstr "Lägg till i _adressbok"
 
-#: src/textview.c:252
+#: src/textview.c:275
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:702
+#: src/textview.c:729
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d byte)]"
 
-#: src/textview.c:705
+#: src/textview.c:732
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d byte)]"
 
-#: src/textview.c:875
+#: src/textview.c:902
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -19202,67 +19607,68 @@ msgstr ""
 "\n"
 "  Använd "
 
-#: src/textview.c:880
+#: src/textview.c:907
 msgid "'Network Log'"
 msgstr "'Nätverkslogg'"
 
-#: src/textview.c:881
+#: src/textview.c:908
 msgid " in the Tools menu for more information."
 msgstr " i Verktygs-menyn för mer information."
 
-#: src/textview.c:947
+#: src/textview.c:974
 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:976
 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:980
 msgid "     - To save, select "
 msgstr "     - För att spara, välj "
 
-#: src/textview.c:954
+#: src/textview.c:981
 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:983 src/textview.c:995 src/textview.c:1007
+#: src/textview.c:1017
 msgid " (Shortcut key: '"
 msgstr " (Tangentbordsgenväg: '"
 
-#: src/textview.c:964
+#: src/textview.c:991
 msgid "     - To display as text, select "
 msgstr "     - För att visa som text, välj "
 
-#: src/textview.c:965
+#: src/textview.c:992
 msgid "'Display as text'"
 msgstr "'Visa som text'"
 
-#: src/textview.c:976
+#: src/textview.c:1003
 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:1004
 msgid "'Open'"
 msgstr "'Öppna'"
 
-#: src/textview.c:985
+#: src/textview.c:1012
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativt dubbelklicka, eller mittklicka "
 
-#: src/textview.c:986
+#: src/textview.c:1013
 msgid "mouse button)\n"
 msgstr "musknapp)\n"
 
-#: src/textview.c:988
+#: src/textview.c:1015
 msgid "     - Or use "
 msgstr "     - Eller använd "
 
-#: src/textview.c:989
+#: src/textview.c:1016
 msgid "'Open with...'"
 msgstr "'Öppna _med...'"
 
-#: src/textview.c:1111
+#: src/textview.c:1139
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -19273,432 +19679,464 @@ msgstr ""
 "    %s\n"
 "Slutstatus %d\n"
 
-#: src/textview.c:2195
+#: src/textview.c:2235
 msgid "Tags: "
 msgstr "Etiketter: "
 
-#: src/textview.c:2914
+#: src/textview.c:2716
+msgid "Zoom _In"
+msgstr "Zooma _In"
+
+#: src/textview.c:2727
+msgid "Zoom _Out"
+msgstr "Z_ooma Ut"
+
+#: src/textview.c:2738
+msgid "Reset _zoom"
+msgstr "Återställ _zoom"
+
+#: src/textview.c:3105
+msgid "Copy it anyway?"
+msgstr "Kopiera den ändå?"
+
+#: src/textview.c:3105
+msgid "Open it anyway?"
+msgstr "Öppna ändå?"
+
+#: src/textview.c:3106
+msgid "Co_py URL"
+msgstr "K_opiera URL"
+
+#: src/textview.c:3106
+msgid "_Open URL"
+msgstr "_Öppna URL"
+
+#: src/textview.c:3112
 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:3113
 msgid "Displayed URL:"
 msgstr "Visad URL:"
 
-#: src/textview.c:2916
+#: src/textview.c:3114
 msgid "Real URL:"
 msgstr "Verklig URL:"
 
-#: src/textview.c:2917
-msgid "Open it anyway?"
-msgstr "Öppna ändå?"
-
-#: src/textview.c:2918
+#: src/textview.c:3116
 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:2335
 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:2340
 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:2344
 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:2362 src/toolbar.c:2373
 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:2417 src/toolbar.c:2427
 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:2434 src/toolbar.c:2444
 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:2451 src/toolbar.c:2461
 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:2468 src/toolbar.c:2478
 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:2356
 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:2485 src/toolbar.c:2496
 msgid "Forward Message"
 msgstr "Vidarebefordra meddelande"
 
-#: src/toolbar.c:235 src/toolbar.c:2460
+#: src/toolbar.c:238 src/toolbar.c:2501
 msgid "Trash Message"
 msgstr "Flytta till papperskorg"
 
-#: src/toolbar.c:236 src/toolbar.c:2464
+#: src/toolbar.c:239 src/toolbar.c:2505
 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:2513
 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:2517
 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:2523
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: src/toolbar.c:259 src/toolbar.c:2486
+#: src/toolbar.c:263 src/toolbar.c:2527
 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:2531
 msgid "Save to draft folder"
 msgstr "Spara till utkastsmapp"
 
-#: src/toolbar.c:261 src/toolbar.c:2494
+#: src/toolbar.c:265 src/toolbar.c:2535
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/toolbar.c:262 src/toolbar.c:2498
+#: src/toolbar.c:266 src/toolbar.c:2539
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#: src/toolbar.c:263 src/toolbar.c:2502
+#: src/toolbar.c:267 src/toolbar.c:2543
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/toolbar.c:264 src/toolbar.c:2506
+#: src/toolbar.c:268 src/toolbar.c:2547
 msgid "Replace signature"
 msgstr "Ersätt signatur"
 
-#: src/toolbar.c:265 src/toolbar.c:2510
+#: src/toolbar.c:269 src/toolbar.c:2551
 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:2555
 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:2559
 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:2568
 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:2573
 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:2581
 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:2600
 msgid "Cancel receiving"
 msgstr "Avbryt hämtning"
 
-#: src/toolbar.c:277 src/toolbar.c:2567
+#: src/toolbar.c:281 src/toolbar.c:2608
 msgid "Cancel receiving/sending"
 msgstr "Avbryt mottagning/sändning"
 
-#: src/toolbar.c:278 src/toolbar.c:2307
+#: src/toolbar.c:282 src/toolbar.c:2348
 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:2401 src/toolbar.c:2410
 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:2330
 msgid "Go to folder list"
 msgstr "Gå till mapplista"
 
-#: src/toolbar.c:2295
+#: src/toolbar.c:2336
 msgid "Receive Mail from selected Account"
 msgstr "Ta emot e-post från valt konto"
 
-#: src/toolbar.c:2311
+#: src/toolbar.c:2352
 msgid "Open preferences"
 msgstr "Öppna egenskaper"
 
-#: src/toolbar.c:2322
+#: src/toolbar.c:2363
 msgid "Compose with selected Account"
 msgstr "Skriv nytt från valt konto"
 
-#: src/toolbar.c:2343
+#: src/toolbar.c:2384
 msgid "Learn as..."
 msgstr "Markera som..."
 
-#: src/toolbar.c:2353
+#: src/toolbar.c:2394
 msgid "Learn as _Spam"
 msgstr "Markera som _skräp"
 
-#: src/toolbar.c:2354
+#: src/toolbar.c:2395
 msgid "Learn as _Ham"
 msgstr "Markera som _ej skräp"
 
-#: src/toolbar.c:2361
+#: src/toolbar.c:2402
 msgid "Delete duplicates options"
 msgstr "Alternativ för borttagning av dubbletter"
 
-#: src/toolbar.c:2365
+#: src/toolbar.c:2406
 msgid "Delete duplicates in selected folder"
 msgstr "Ta bort meddelandedubbletter i vald mapp"
 
-#: src/toolbar.c:2366
+#: src/toolbar.c:2407
 msgid "Delete duplicates in all folders"
 msgstr "Ta bort meddelandedubbletter i alla mappar"
 
-#: src/toolbar.c:2377
+#: src/toolbar.c:2418
 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:2422 src/toolbar.c:2439 src/toolbar.c:2456 src/toolbar.c:2473
 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:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "Reply without _quote"
 msgstr "Svara utan _citat"
 
-#: src/toolbar.c:2394
+#: src/toolbar.c:2435
 msgid "Reply to Sender options"
 msgstr "Alternativ för Svara till avsändare"
 
-#: src/toolbar.c:2411
+#: src/toolbar.c:2452
 msgid "Reply to All options"
 msgstr "Alternativ för Svara till Alla"
 
-#: src/toolbar.c:2428
+#: src/toolbar.c:2469
 msgid "Reply to Mailing-list options"
 msgstr "Alternativ för Svara till sändlista"
 
-#: src/toolbar.c:2445
+#: src/toolbar.c:2486
 msgid "Forward Message options"
 msgstr "Alternativ för vidarebefordra meddelande"
 
-#: src/uri_opener.c:87
+#: src/uri_opener.c:71
+msgid "C_opy URL"
+msgstr "K_opiera URL"
+
+#: src/uri_opener.c:102
 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:130
+msgid "Included URLs:"
+msgstr "Inkluderade URLer:"
 
-#: src/uri_opener.c:189
+#: src/uri_opener.c:210
 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:238
+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:225
+#: src/uri_opener.c:246
 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 +20227,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:975
 msgid "Your name:"
 msgstr "Ditt namn:"
 
-#: src/wizard.c:987
+#: src/wizard.c:986
 msgid "Your email address:"
 msgstr "Din e-postadress:"
 
-#: src/wizard.c:998
+#: src/wizard.c:997
 msgid "Your organization:"
 msgstr "Din organisation:"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1031
 msgid "Mailbox name:"
 msgstr "Brevlådenamn:"
 
-#: src/wizard.c:1040
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
@@ -19837,7 +20275,7 @@ msgstr ""
 "Du kan också ange en absolut sökväg, till exempel: \"/home/john/Documents/"
 "Mail\""
 
-#: src/wizard.c:1111
+#: src/wizard.c:1110
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
@@ -19845,51 +20283,51 @@ msgstr ""
 "Du kan ange portnummer genom att lägga till det på slutet: \"mail.example."
 "com:25\""
 
-#: src/wizard.c:1114
+#: src/wizard.c:1113
 msgid "SMTP server address:"
 msgstr "SMTP-serveradress:"
 
-#: src/wizard.c:1129
+#: src/wizard.c:1128
 msgid "(empty to use the same as receive)"
 msgstr "(tomt för samma som vid mottagning)"
 
-#: src/wizard.c:1143
+#: src/wizard.c:1142
 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:1166
+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:1177 src/wizard.c:1597
 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:1189 src/wizard.c:1609
+msgid "Client TLS certificate (optional)"
+msgstr "Klient TLS-certifikat (frivilligt)"
 
-#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
+#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
 msgid "Server address:"
 msgstr "Serveradress:"
 
-#: src/wizard.c:1322
+#: src/wizard.c:1321
 msgid "Local mailbox:"
 msgstr "Lokal brevlåda:"
 
-#: src/wizard.c:1491
+#: src/wizard.c:1490
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: src/wizard.c:1500
+#: src/wizard.c:1499
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1556
+#: src/wizard.c:1555
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
@@ -19897,19 +20335,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:1586
+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:1651
 msgid "IMAP server directory:"
 msgstr "IMAP-serverkatalog:"
 
-#: src/wizard.c:1663
+#: src/wizard.c:1662
 msgid "Show only subscribed folders"
 msgstr "Visa endast prenumererade mappar"
 
-#: src/wizard.c:1671
+#: src/wizard.c:1670
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19917,15 +20355,15 @@ msgstr ""
 "Varning: denna version av Claws-Mail\n"
 "har byggts utan IMAP-stöd."
 
-#: src/wizard.c:1789
+#: src/wizard.c:1788
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws-Mails konfigurationsguide"
 
-#: src/wizard.c:1822
+#: src/wizard.c:1821
 msgid "Welcome to Claws Mail"
 msgstr "Välkommen till Claws-Mail"
 
-#: src/wizard.c:1829
+#: src/wizard.c:1828
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19939,31 +20377,31 @@ 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:1841
 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:1849 src/wizard.c:1864 src/wizard.c:1879 src/wizard.c:1895
 msgid "Bold fields must be completed"
 msgstr "Fetmarkerade fält måste fyllas i"
 
-#: src/wizard.c:1857
+#: src/wizard.c:1856
 msgid "Receiving mail"
 msgstr "Tar emot post"
 
-#: src/wizard.c:1872
+#: src/wizard.c:1871
 msgid "Sending mail"
 msgstr "Skickar post"
 
-#: src/wizard.c:1888
+#: src/wizard.c:1887
 msgid "Saving mail on disk"
 msgstr "Sparar brev på disk"
 
-#: src/wizard.c:1904
+#: src/wizard.c:1903
 msgid "Configuration finished"
 msgstr "Konfigurationen är klar"
 
-#: src/wizard.c:1911
+#: src/wizard.c:1910
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
diff --git a/po/tr.po b/po/tr.po
index 02d7075ea..68779c14d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: claws-mail 3.17.4git18\n"
+"Project-Id-Version: claws-mail 3.19.0git72\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-03-29 23:32+0300\n"
-"PO-Revision-Date: 2022-03-29 23:36+0300\n"
+"POT-Creation-Date: 2022-10-11 10:32+0100\n"
+"PO-Revision-Date: 2022-10-13 22:27+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"
@@ -111,13 +111,13 @@ msgstr "'Posta Al' seçilen hesaplardan posta alır"
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
 #: src/plugins/pdf_viewer/poppler_viewer.c:1851
-#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:385
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:385
 #: src/prefs_filtering.c:1879 src/prefs_summaries.c:479 src/prefs_template.c:79
 #: src/prefs_themes.c:1089
 msgid "Name"
 msgstr "İsim"
 
-#: src/account.c:1637 src/prefs_account.c:1271 src/prefs_account.c:5015
+#: src/account.c:1637 src/prefs_account.c:1298 src/prefs_account.c:5073
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -176,10 +176,10 @@ msgstr ""
 #: src/compose.c:9783 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"
 
@@ -379,7 +379,7 @@ msgid "Duplicate email addresses"
 msgstr "Mükerrer e-posta adresleri"
 
 #: src/addrduplicates.c:443 src/addressadd.c:235
-#: 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"
@@ -440,12 +440,12 @@ msgid "_Book"
 msgstr "_Defter"
 
 #: src/addressbook.c:401 src/addressbook.c:431 src/addressbook.c:456
-#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:524
+#: src/addressbook.c:473 src/compose.c:620 src/mainwindow.c:522
 #: src/messageview.c:213 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:527
+#: src/addressbook.c:402 src/compose.c:625 src/mainwindow.c:525
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr "_Araçlar"
@@ -500,7 +500,7 @@ msgid "C_ut"
 msgstr "K_es"
 
 #: src/addressbook.c:428 src/addressbook.c:464 src/addressbook.c:480
-#: src/compose.c:649 src/mainwindow.c:558 src/messageview.c:229
+#: src/compose.c:649 src/mainwindow.c:556 src/messageview.c:229
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "_Kopyala"
@@ -559,7 +559,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:411
 #: src/plugins/vcalendar/month-view.c:427 src/prefs_themes.c:917
 #: src/prefs_themes.c:949 src/prefs_themes.c:950
@@ -716,7 +716,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:332 src/plugins/rssyl/rssyl_cb_menu.c:193
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -828,7 +828,7 @@ msgid "Person"
 msgstr "Kişi"
 
 #: src/addressbook.c:5019 src/exporthtml.c:881 src/folderview.c:362
-#: src/folderview.c:450 src/prefs_account.c:3470 src/prefs_folder_column.c:77
+#: src/folderview.c:450 src/prefs_account.c:3508 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "Dizin"
 
@@ -952,18 +952,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:141 src/compose.c:9857
+#: src/alertpanel.c:141 src/compose.c:9866 src/mimeview.c:1836
 msgid "Notice"
 msgstr "Not"
 
 #: src/alertpanel.c:154 src/compose.c:5895 src/compose.c:6444
-#: src/compose.c:12266 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:863 src/plugins/pgpcore/sgpgme.c:1000
+#: src/compose.c:12282 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:863 src/mimeview.c:1853 src/plugins/pgpcore/sgpgme.c:1000
 #: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5105
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:731
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:5836 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr "Hata"
@@ -1082,63 +1082,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"
@@ -1483,7 +1483,7 @@ msgstr "_Kaldır"
 msgid "_Properties..."
 msgstr "_Özellikler..."
 
-#: src/compose.c:619 src/mainwindow.c:526 src/messageview.c:215
+#: src/compose.c:619 src/mainwindow.c:524 src/messageview.c:215
 msgid "_Message"
 msgstr "_İleti"
 
@@ -1495,7 +1495,7 @@ msgstr "_İmlâ"
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: src/compose.c:626 src/mainwindow.c:529 src/messageview.c:217
+#: src/compose.c:626 src/mainwindow.c:527 src/messageview.c:217
 msgid "_Help"
 msgstr "_Yardım"
 
@@ -1555,7 +1555,7 @@ msgstr "_Katlanmış"
 msgid "_Unwrapped"
 msgstr "_Katlanmamış"
 
-#: src/compose.c:657 src/mainwindow.c:559
+#: src/compose.c:657 src/mainwindow.c:557
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "Hepsini _seç"
@@ -1665,47 +1665,47 @@ msgstr "Gizlilik _Sistemi"
 msgid "_Priority"
 msgstr "_Öncelik"
 
-#: src/compose.c:703 src/mainwindow.c:621 src/messageview.c:268
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:268
 msgid "Character _encoding"
 msgstr "Karakter _kodlaması"
 
-#: src/compose.c:708 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:273
 msgid "Western European"
 msgstr "Batı Avrupa"
 
-#: src/compose.c:709 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:274
 msgid "Baltic"
 msgstr "Baltık"
 
-#: src/compose.c:710 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:275
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: src/compose.c:711 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:276
 msgid "Arabic"
 msgstr "Arapça"
 
-#: src/compose.c:712 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:712 src/mainwindow.c:628 src/messageview.c:277
 msgid "Cyrillic"
 msgstr "Kiril"
 
-#: src/compose.c:713 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:713 src/mainwindow.c:629 src/messageview.c:278
 msgid "Japanese"
 msgstr "Japonca"
 
-#: src/compose.c:714 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:714 src/mainwindow.c:630 src/messageview.c:279
 msgid "Chinese"
 msgstr "Çince"
 
-#: src/compose.c:715 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:715 src/mainwindow.c:631 src/messageview.c:280
 msgid "Korean"
 msgstr "Korece"
 
-#: src/compose.c:716 src/mainwindow.c:634 src/messageview.c:281
+#: src/compose.c:716 src/mainwindow.c:632 src/messageview.c:281
 msgid "Thai"
 msgstr "Tayca"
 
-#: src/compose.c:719 src/mainwindow.c:744 src/messageview.c:317
+#: src/compose.c:719 src/mainwindow.c:742 src/messageview.c:317
 msgid "_Address book"
 msgstr "_Adres defteri"
 
@@ -1713,11 +1713,11 @@ msgstr "_Adres defteri"
 msgid "_Template"
 msgstr "Şab_lon"
 
-#: src/compose.c:723 src/mainwindow.c:774 src/messageview.c:339
+#: src/compose.c:723 src/mainwindow.c:772 src/messageview.c:339
 msgid "Actio_ns"
 msgstr "_Eylemler"
 
-#: src/compose.c:727 src/mainwindow.c:828 src/messageview.c:343
+#: src/compose.c:727 src/mainwindow.c:826 src/messageview.c:343
 msgid "_About"
 msgstr "_Hakkında"
 
@@ -1753,12 +1753,12 @@ msgstr "Cetveli _göster"
 msgid "_Normal"
 msgstr "_Normal"
 
-#: src/compose.c:744 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:744 src/mainwindow.c:673 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_All"
 msgstr "_Hepsini"
 
-#: src/compose.c:745 src/mainwindow.c:676 src/messageview.c:307
+#: src/compose.c:745 src/mainwindow.c:674 src/messageview.c:307
 #: src/summaryview.c:435
 msgid "_Sender"
 msgstr "_Gönderene"
@@ -1783,27 +1783,27 @@ msgstr "_Düşük"
 msgid "_Lowest"
 msgstr "En _düşük"
 
-#: src/compose.c:760 src/mainwindow.c:893 src/messageview.c:356
+#: src/compose.c:760 src/mainwindow.c:891 src/messageview.c:356
 msgid "_Automatic"
 msgstr "_Otomatik"
 
-#: src/compose.c:761 src/mainwindow.c:894 src/messageview.c:357
+#: src/compose.c:761 src/mainwindow.c:892 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:762 src/mainwindow.c:895 src/messageview.c:358
+#: src/compose.c:762 src/mainwindow.c:893 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
-#: src/compose.c:766 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:766 src/mainwindow.c:897 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr "Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:769 src/mainwindow.c:902 src/messageview.c:365
+#: src/compose.c:769 src/mainwindow.c:900 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr "Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:774 src/mainwindow.c:907 src/messageview.c:370
+#: src/compose.c:774 src/mainwindow.c:905 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr "Türkçe (ISO-8859-_9)"
 
@@ -1927,7 +1927,7 @@ msgstr ""
 msgid "Are you sure?"
 msgstr "Emin misiniz?"
 
-#: src/compose.c:3717 src/compose.c:10846 src/compose.c:11746
+#: src/compose.c:3717 src/compose.c:10862 src/compose.c:11762
 msgid "_Insert"
 msgstr "_Ekle"
 
@@ -1988,7 +1988,7 @@ msgstr ""
 "Alıcı olarak tek öntanımlı '%s' adresi girilmiş. Yine de gönderilsin mi?"
 
 #: src/compose.c:5153 src/compose.c:5190 src/compose.c:5228 src/compose.c:5271
-#: src/prefs_account.c:4130 src/toolbar.c:497 src/toolbar.c:530
+#: src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr "Gönder"
 
@@ -2152,7 +2152,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:6445 src/mainwindow.c:666 src/toolbar.c:280 src/toolbar.c:2604
+#: src/compose.c:6445 src/mainwindow.c:664 src/toolbar.c:280 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr "Göndermeyi iptal et"
 
@@ -2181,9 +2181,11 @@ msgstr "Adres defterinden otomatik tamamlamak için <tab> kullanın"
 msgid "Mime type"
 msgstr "Mime türü"
 
-#: src/compose.c:7517 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:635
-#: src/prefs_summary_column.c:84 src/summaryview.c:473
+#: src/compose.c:7517 src/mimeview.c:303
+#: src/plugins/att_remover/att_remover.c:304
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:641
+#: src/prefs_summaries.c:635 src/prefs_summary_column.c:84
+#: src/summaryview.c:473
 msgid "Size"
 msgstr "Boyut"
 
@@ -2312,11 +2314,11 @@ msgstr "Haricî editörle socket iletişimi kurmak Windows'ta desteklenmemekte."
 #: src/compose.c:9742
 #, 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"
 
@@ -2325,29 +2327,39 @@ msgstr ""
 msgid "External editor stopped with an error: %s"
 msgstr "Harici metin düzenleyici çalışmayı durdurdu: %s"
 
-#: src/compose.c:9854
+#: src/compose.c:9856
+msgid "process id: %"
+msgstr "işlem id: %"
+
+#: src/compose.c:9858
+#, c-format
+msgid "process id: %d"
+msgstr "işlem id: %d"
+
+#: src/compose.c:9863
+#, 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:10260 src/messageview.c:1095
+#: src/compose.c:10273 src/messageview.c:1095
 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:10463
+#: src/compose.c:10476
 msgid "Could not save draft."
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10467
+#: src/compose.c:10480
 msgid "Could not save draft"
 msgstr "Taslak kaydedilemedi."
 
-#: src/compose.c:10468
+#: src/compose.c:10481
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2355,24 +2367,24 @@ msgstr ""
 "Taslak kaydedilemedi.\n"
 "Çıkmaktan ya da bu e-postadan vaz geçmek ister misiniz?"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Cancel exit"
 msgstr "Çıkmaktan _vazgeç"
 
-#: src/compose.c:10470
+#: src/compose.c:10483
 msgid "_Discard email"
 msgstr "E-postadan _vaz geç"
 
-#: src/compose.c:10658 src/compose.c:10672
+#: src/compose.c:10674 src/compose.c:10688
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:10686
+#: src/compose.c:10702
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "'%s' dosyası okunamadı."
 
-#: src/compose.c:10688
+#: src/compose.c:10704
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2381,50 +2393,50 @@ msgstr ""
 "'%s' dosyası mevcut karakter kodlaması için\n"
 "geçersiz karakterler barındırıyor, eklemek yanlış olabilir."
 
-#: src/compose.c:10765
+#: src/compose.c:10781
 msgid "Discard message"
 msgstr "İletiden vaz geç"
 
-#: src/compose.c:10766
+#: src/compose.c:10782
 msgid "This message has been modified. Discard it?"
 msgstr "Bu ileti değiştirilmiş. Vaz geç?"
 
-#: src/compose.c:10767 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10783 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "_Vaz geç"
 
-#: src/compose.c:10767 src/compose.c:10772
+#: src/compose.c:10783 src/compose.c:10788
 msgid "_Save to Drafts"
 msgstr "_Taslaklara Kaydet"
 
-#: src/compose.c:10770 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10786 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: src/compose.c:10771
+#: src/compose.c:10787
 msgid "This message has been modified. Save the latest changes?"
 msgstr "Bu ileti değiştirilmiş. Son değişiklikleri kaydet?"
 
-#: src/compose.c:10772
+#: src/compose.c:10788
 msgid "_Don't save"
 msgstr "_Kaydetme"
 
-#: src/compose.c:10843
+#: src/compose.c:10859
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "'%s' şablonunun uygulanmasını istiyor musunuz?"
 
-#: src/compose.c:10845
+#: src/compose.c:10861
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:10846 src/prefs_actions.c:333 src/prefs_filtering_action.c:583
+#: src/compose.c:10862 src/prefs_actions.c:333 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:1019
 msgid "_Replace"
 msgstr "_Yer Değiştir"
 
-#: src/compose.c:10922
+#: src/compose.c:10938
 #, c-format
 msgid ""
 "Size of pasted text exceeds limit (%dKiB) for paste.\n"
@@ -2433,7 +2445,7 @@ msgstr ""
 "Yapıştırılan metin yapıştırma limitini (%dKiB) aşıyor.\n"
 "Dosya olarak ekleyin."
 
-#: src/compose.c:11739
+#: src/compose.c:11755
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2445,20 +2457,20 @@ msgstr[0] ""
 "%d adet dosya içeriğinin ileti gövdesine eklenmesini ya da e-postaya "
 "iliştirilmesini istiyor musunuz?"
 
-#: src/compose.c:11745
+#: src/compose.c:11761
 msgid "Insert or attach?"
 msgstr "Ekle ya da iliştir"
 
-#: src/compose.c:11746
+#: src/compose.c:11762
 msgid "_Attach"
 msgstr "_İliştir"
 
-#: src/compose.c:11964
+#: src/compose.c:11980
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "%d. satırda alıntı biçimi hatası."
 
-#: src/compose.c:12260
+#: src/compose.c:12276
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2675,7 +2687,7 @@ msgid " Check File "
 msgstr " Dosyayı Denetle "
 
 #: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2478
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2516
 #: src/wizard.c:1197 src/wizard.c:1617
 msgid "File"
 msgstr "Dosya"
@@ -2690,7 +2702,7 @@ msgstr "Bir Grup Adı sağlanmalı."
 
 #: src/editgroup.c:296
 msgid "Edit Group Data"
-msgstr "Grub Verisini Düzenle"
+msgstr "Grub verisini düzenle"
 
 #: src/editgroup.c:326 src/exporthtml.c:594
 msgid "Group Name"
@@ -2706,15 +2718,15 @@ msgstr "Mevcut Adresler"
 
 #: src/editgroup.c:453
 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"
+msgstr "Oklarla E-posta Adreslerini Grub içine ya da dışına taşı"
 
 #: src/editgroup.c:501
 msgid "Edit Group Details"
-msgstr "Grup Ayrıntılarını Düzenle"
+msgstr "Grup ayrıntılarını düzenle"
 
 #: src/editgroup.c:504
 msgid "Add New Group"
-msgstr "Yeni Grup Ekle"
+msgstr "Yeni grup ekle"
 
 #: src/editgroup.c:553
 msgid "Edit folder"
@@ -2758,13 +2770,13 @@ msgstr "Yeni JPilot Girdisi Ekleyin"
 msgid "Edit LDAP - Select Search Base"
 msgstr "LDAP Düzenle - Arama Tabanını Seç"
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3230
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3268
 #: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr "Makine Adı"
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3237
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3275
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr "Port"
@@ -2825,7 +2837,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTSSL"
 
-#: src/editldap.c:470 src/prefs_account.c:4221
+#: src/editldap.c:470 src/prefs_account.c:4277
 msgid "TLS"
 msgstr "TLS"
 
@@ -2952,11 +2964,11 @@ msgstr "Arama koşulunu 'içeren' isimlerle eşleş"
 
 #: src/editldap.c:647
 msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"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 "
@@ -2988,8 +3000,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:739 src/prefs_account.c:1477 src/prefs_account.c:2108
-#: src/prefs_account.c:3042 src/prefs_account.c:3070 src/prefs_account.c:3275
+#: src/editldap.c:739 src/prefs_account.c:1504 src/prefs_account.c:2144
+#: src/prefs_account.c:3080 src/prefs_account.c:3108 src/prefs_account.c:3313
 #: src/prefs_proxy.c:148
 msgid "Show password"
 msgstr "Şifreyi göster"
@@ -3011,7 +3023,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:793 src/prefs_account.c:4094
+#: src/editldap.c:793 src/prefs_account.c:4148
 msgid "Basic"
 msgstr "Temel"
 
@@ -3098,11 +3110,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"
 
@@ -3166,9 +3178,9 @@ msgid "Stylesheet"
 msgstr "Stil"
 
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:370 src/gtk/gtkaspell.c:1579
-#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1184
+#: src/gtk/gtkaspell.c:2234 src/gtk/menu.c:127 src/mainwindow.c:1182
 #: src/plugins/archive/archiver_prefs.c:312
-#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1139
 #: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1437 src/summaryview.c:6285
 msgid "None"
 msgstr "Hiçbiri"
@@ -3179,7 +3191,7 @@ msgstr "Hiçbiri"
 msgid "Default"
 msgstr "Öntanımlı Ayar"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr "Tam"
@@ -3408,7 +3420,7 @@ msgstr "Adres Defterini LDIF Olarak Kaydet"
 msgid "Distinguished Name"
 msgstr "Ayırt Edici İsim (dn):"
 
-#: src/export.c:113 src/summaryview.c:8508
+#: src/export.c:113 src/summaryview.c:8512
 msgid "Export to mbox file"
 msgstr "mbox olarak kaydet"
 
@@ -3493,147 +3505,164 @@ 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:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+"kural hesaba bağlı, iletileri almak için kullanılan şu anki hesapla "
+"eşleşmiyor\n"
 
-#: src/filtering.c:610
+#: 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 "
-"kullanılan hesapla eşleşiyor\n"
+"kural hesaba bağlı [id=%d, name='%s'], iletileri almak için 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 kullanılan su anki 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 "
-"kullanılan hesapla eşleşmiyor [id=%d, name='%s']\n"
+"kural hesaba bağlı [id=%d, name='%s'], iletileri almak için 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 tüm kurallar isteğiniz üzere uygulanıyor\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 "kural hesaba bağlı, yine de tüm kurallar isteğiniz üzere uygulanıyor\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 ""
-"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:670
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
+msgstr "kural hesaba bağlı, isteğiniz üzere es geçiliyor\n"
+
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
-msgstr "kural hesap temelli [id=%d, name='%s'],  istek üzerine es geçiliyor\n"
+msgstr "kural hesaba bağlı [id=%d, name='%s'],  isteğiniz üzere es geçiliyor\n"
 
-#: src/filtering.c: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"
@@ -3650,11 +3679,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"
@@ -3736,17 +3765,17 @@ msgstr "Ana dizinden özellikleri ve işleme kurallarını devral"
 
 #: src/foldersel.c:585 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:302
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:239
-#: src/plugins/vcalendar/vcal_folder.c:2103
+#: src/plugins/vcalendar/vcal_folder.c:2101
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' dizin isminde kullanılamaz."
 
 #: src/foldersel.c:600 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:251
-#: src/plugins/vcalendar/vcal_folder.c:2110
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/vcalendar/vcal_folder.c:2108
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "`%s' dizini zaten var."
@@ -3778,7 +3807,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:563
+#: src/folderview.c:254 src/mainwindow.c:561
 msgid "_Search folder..."
 msgstr "Dizini _ara..."
 
@@ -3831,7 +3860,7 @@ msgstr "Hepsini okunmuş say"
 
 #: src/folderview.c:870
 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 "
@@ -3848,10 +3877,10 @@ msgstr "Hepsini okunmamış say"
 
 #: src/folderview.c:876
 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 "
+"Bu ve bunun alt dizinlerindeki tüm e-postaları okunmamış olarak işaretlemek "
 "istiyor musunuz?"
 
 #: src/folderview.c:878 src/summaryview.c:4339
@@ -3859,12 +3888,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:1074 src/imap.c:4693
+#: src/folderview.c:1074 src/imap.c:4703
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "%s/%s dizini taranıyor..."
 
-#: src/folderview.c:1077 src/imap.c:4697 src/mainwindow.c:5321 src/setup.c:96
+#: src/folderview.c:1077 src/imap.c:4707 src/mainwindow.c:5319 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "%s dizini taranıyor..."
@@ -3911,7 +3940,7 @@ msgstr "%s dizini açılıyor..."
 msgid "Folder could not be opened."
 msgstr "Dizin açılamadı."
 
-#: src/folderview.c:2493 src/mainwindow.c:2901 src/mainwindow.c:2906
+#: src/folderview.c:2493 src/mainwindow.c:2899 src/mainwindow.c:2904
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
@@ -3923,7 +3952,7 @@ msgstr "Çöpteki tüm iletiler silinsin mi?"
 msgid "_Empty trash"
 msgstr "Çöpü _boşalt"
 
-#: src/folderview.c:2539 src/inc.c:1669 src/toolbar.c:3085
+#: src/folderview.c:2539 src/inc.c:1672 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr "Çevrimdışı uyarı"
 
@@ -4037,7 +4066,7 @@ msgstr "Haber grubu adı"
 msgid "Messages"
 msgstr "İletiler"
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:206 src/plugins/att_remover/att_remover.c:303
 msgid "Type"
 msgstr "Tür"
 
@@ -4092,7 +4121,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:857
+#: src/gtk/about.c:164 src/gtk/about.c:866
 msgid ""
 "Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
@@ -4181,46 +4210,51 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr "sunuculara şifrelenmiş bağlantı desteğini sağlar.\n"
 
 #: src/gtk/about.c:461
-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:472
 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:482
+#: src/gtk/about.c:471
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr "IPv6 adres desteğini sağlar\n"
+
+#: src/gtk/about.c:481
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "PalmOS adres defteri desteğini sağlar\n"
 
-#: src/gtk/about.c:492
+#: src/gtk/about.c:491
 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:502
+#: src/gtk/about.c:501
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "IMAP ve NNTP sunucuları desteğini ekler\n"
 
-#: src/gtk/about.c:512
+#: src/gtk/about.c:511
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr "SVG tema desteğini sağlar\n"
+
+#: src/gtk/about.c:521
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "oturum yönetimi desteğini sağlar\n"
 
-#: src/gtk/about.c:522
+#: src/gtk/about.c:531
 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:532
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
-msgstr "SVG tema desteğini sağlar\n"
+#: src/gtk/about.c:541
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
+msgstr "OAuth2 yetkilendirme desteğini sağlar\n"
 
-#: src/gtk/about.c:564
+#: src/gtk/about.c:573
 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 "
@@ -4231,7 +4265,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:571
+#: src/gtk/about.c:580
 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 "
@@ -4243,7 +4277,7 @@ msgstr ""
 "GARANTİSİ dahi ima edilmeden. Daha fazla ayrıntı için GNU Genel Kamu "
 "Lisansına bakın."
 
-#: src/gtk/about.c:590
+#: src/gtk/about.c:599
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4251,73 +4285,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:723 src/main.c:2749
+#: src/gtk/about.c:732 src/main.c:2749
 msgid "Session statistics\n"
 msgstr "Oturum istatistikleri\n"
 
-#: src/gtk/about.c:733 src/gtk/about.c:736 src/main.c:2759 src/main.c:2762
+#: src/gtk/about.c:742 src/gtk/about.c:745 src/main.c:2759 src/main.c:2762
 #, c-format
 msgid "Started: %s\n"
 msgstr "Başlatıldı: %s\n"
 
-#: src/gtk/about.c:743 src/main.c:2768
+#: src/gtk/about.c:752 src/main.c:2768
 msgid "Incoming traffic\n"
 msgstr "Gelen trafik\n"
 
-#: src/gtk/about.c:746 src/main.c:2771
+#: src/gtk/about.c:755 src/main.c:2771
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "Alınan iletiler: %d\n"
 
-#: src/gtk/about.c:753 src/main.c:2777
+#: src/gtk/about.c:762 src/main.c:2777
 msgid "Outgoing traffic\n"
 msgstr "Giden trafik\n"
 
-#: src/gtk/about.c:756 src/main.c:2780
+#: src/gtk/about.c:765 src/main.c:2780
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "Yeni/yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:761 src/main.c:2784
+#: src/gtk/about.c:770 src/main.c:2784
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "Cevaplanan iletiler: %d\n"
 
-#: src/gtk/about.c:766 src/main.c:2788
+#: src/gtk/about.c:775 src/main.c:2788
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "Yönlendirilmiş iletiler: %d\n"
 
-#: src/gtk/about.c:771 src/main.c:2792
+#: src/gtk/about.c:780 src/main.c:2792
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "Giden toplam ileti: %d\n"
 
-#: src/gtk/about.c:798
+#: src/gtk/about.c:807
 msgid "About Claws Mail"
 msgstr "Claws Mail Hakkında"
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:880
 msgid "_Info"
 msgstr "_Bilgi"
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:886
 msgid "_Authors"
 msgstr "_Yazarlar"
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:892
 msgid "_Features"
 msgstr "Ö_zellikler"
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:898
 msgid "_License"
 msgstr "_Lisans"
 
-#: src/gtk/about.c:897
+#: src/gtk/about.c:906
 msgid "_Release Notes"
 msgstr "_Sürüm Notları"
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:912
 msgid "_Statistics"
 msgstr "İ_statistikler"
 
@@ -4793,7 +4827,7 @@ msgstr "Öncelik"
 msgid "Precedence:"
 msgstr "Öncelik:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1241
+#: src/gtk/headers.h:46 src/prefs_account.c:1268
 msgid "Organization"
 msgstr "Kurum"
 
@@ -5006,8 +5040,8 @@ msgid "Folder contains marked messages"
 msgstr "İşaretlenmiş iletiler barındıran dizin"
 
 #: src/gtk/icon_legend.c:92
-msgid "IMAP folder which contains sub-folders only"
-msgstr "Sadece alt dizinleri içeren IMAP dizini"
+msgid "IMAP folder which contains subfolders only"
+msgstr "Sadece alt dizinler içeren IMAP dizini"
 
 #: src/gtk/icon_legend.c:93
 msgid "IMAP mailbox showing only subscribed folders"
@@ -5169,15 +5203,15 @@ msgstr "Yüklenmiş eklentiler"
 msgid "Page Index"
 msgstr "Sayfa Fihristi"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:856
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:854
 msgid "_Hide"
 msgstr "_Gizle"
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4093 src/prefs_account.c:4111 src/prefs_account.c:4129
 #: src/prefs_account.c:4147 src/prefs_account.c:4165 src/prefs_account.c:4183
-#: src/prefs_account.c:4201 src/prefs_account.c:4220 src/prefs_account.c:4303
-#: src/prefs_account.c:4321 src/prefs_filtering_action.c:1380
+#: src/prefs_account.c:4202 src/prefs_account.c:4221 src/prefs_account.c:4239
+#: src/prefs_account.c:4257 src/prefs_account.c:4276 src/prefs_account.c:4359
+#: src/prefs_account.c:4377 src/prefs_filtering_action.c:1380
 #: src/prefs_filtering.c:398 src/prefs_filtering.c:1888
 msgid "Account"
 msgstr "Hesap"
@@ -5626,8 +5660,7 @@ msgstr "(Başlık yok)"
 msgid "Error:"
 msgstr "Hata:"
 
-#: src/image_viewer.c:313 src/mimeview.c:2564
-#: src/plugins/att_remover/att_remover.c:305
+#: src/image_viewer.c:313 src/mimeview.c:2576
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "Dosya adı:"
@@ -5640,193 +5673,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"
@@ -5838,7 +5871,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"
@@ -5850,7 +5883,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"
@@ -5862,7 +5895,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"
@@ -5874,7 +5907,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"
@@ -5886,7 +5919,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"
@@ -5896,37 +5929,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:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1186 src/inc.c:884 src/news.c:402 src/send_message.c:293
 msgid "Insecure connection"
 msgstr "Güvensiz bağlantı"
 
-#: src/imap.c:1177 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1187 src/inc.c:885 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"
@@ -5940,108 +5973,108 @@ msgstr ""
 "Bu sunucuya bağlanmaya devam etmek istiyor musunuz? İletişim güvenli "
 "olmayacak."
 
-#: src/imap.c:1183 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1193 src/inc.c:891 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 "
@@ -6050,20 +6083,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"
@@ -6113,7 +6146,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..."
 
@@ -6145,21 +6178,21 @@ msgstr ""
 "istemiyorsanız; dizin sonuna '/' ekleyin)"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:293
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:233
-#: src/plugins/vcalendar/vcal_folder.c:2095
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:233
+#: src/plugins/vcalendar/vcal_folder.c:2093
 #, 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:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
 #: src/plugins/rssyl/rssyl_cb_menu.c:234
-#: src/plugins/vcalendar/vcal_folder.c:2096
+#: src/plugins/vcalendar/vcal_folder.c:2094
 msgid "Rename folder"
 msgstr "Dizin adını değiştir"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:315
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:257
-#: src/plugins/vcalendar/vcal_folder.c:2116
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:257
+#: src/plugins/vcalendar/vcal_folder.c:2114
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6167,32 +6200,33 @@ msgstr ""
 "Dizin adı değiştirilemedi.\n"
 "Yeni dizin ismine izin verilmiyor."
 
-#: 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:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, 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:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, 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/plugins/rssyl/rssyl_cb_menu.c:190
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:330
+#: 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:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:209
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/plugins/vcalendar/vcal_folder.c:2047
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "'%s' dizini kaldırılamıyor."
@@ -6219,7 +6253,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:536 src/mainwindow.c:690
+#: src/imap_gtk.c:536 src/mainwindow.c:688
 msgid "Subscribe"
 msgstr "Abone ol"
 
@@ -6456,139 +6490,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:407 src/prefs_summaries.c:647
+#: src/inc.c:727 src/prefs_matcher.c:407 src/prefs_summaries.c:647
 #: src/prefs_summary_column.c:87 src/summaryview.c:2895 src/summaryview.c:6585
 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:865
+#: src/inc.c:868
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:894
+#: src/inc.c:897
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "'%s' hesabı: POP3 sunucusuna bağlanıyor: %s:%d..."
 
-#: src/inc.c:928
+#: src/inc.c:931
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3 sunucusuna bağlanılamıyor: %s:%d"
 
-#: src/inc.c:932
+#: src/inc.c:935
 #, 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:1012 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1015 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:1014
+#: src/inc.c:1017
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "İletiler %s hesabından alınıyor (%s)..."
 
-#: src/inc.c:1020
+#: src/inc.c:1023
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti sayısı alınıyor (STAT)..."
 
-#: src/inc.c:1024
+#: src/inc.c:1027
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti sayısı alınıyor (LAST)..."
 
-#: src/inc.c:1028
+#: src/inc.c:1031
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti sayısı alınıyor (UIDL)..."
 
-#: src/inc.c:1032
+#: src/inc.c:1035
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1042 src/send_message.c:540
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:1064
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İleti alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1077
+#: src/inc.c:1080
 #, 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:1232
+#: src/inc.c:1235
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "%s:%d bağlantısı başarısız oldu."
 
-#: src/inc.c:1237
+#: src/inc.c:1240
 msgid "Error occurred while processing mail."
 msgstr "E-posta işlenirken bir hata oluştu."
 
-#: src/inc.c:1243
+#: src/inc.c:1246
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6597,37 +6631,37 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1249
+#: src/inc.c:1252
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1254
+#: src/inc.c:1257
 msgid "Can't write file."
 msgstr "Dosya yazılamıyor."
 
-#: src/inc.c:1259
+#: src/inc.c:1262
 msgid "Socket error."
 msgstr "soket hatası"
 
-#: src/inc.c:1262
+#: src/inc.c:1265
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "%s:%d bağlantısında soket hatası meydana geldi."
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1270 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:1270
+#: src/inc.c:1273
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "%s:%d bağlantısı karşı taraftan kesildi."
 
-#: src/inc.c:1275
+#: src/inc.c:1278
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli."
 
-#: src/inc.c:1279
+#: src/inc.c:1282
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6636,11 +6670,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1288 src/send_message.c:699
 msgid "Authentication failed."
 msgstr "Kimlik doğrulaması başarısız oldu."
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1294 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6649,7 +6683,7 @@ msgstr ""
 "Kimlik doğrulaması başarısız oldu:\n"
 "%s"
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1299 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
@@ -6657,44 +6691,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:1301
+#: src/inc.c:1304
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "%s:%d bağlantısı zaman aşımına uğradı."
 
-#: src/inc.c:1339
+#: src/inc.c:1342
 msgid "Incorporation cancelled\n"
 msgstr "Birleştirme iptal edildi\n"
 
-#: src/inc.c:1634 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1637 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/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1902
 #: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr "saniye"
 
-#: src/inc.c:1644 src/inc.c:1654
+#: src/inc.c:1647 src/inc.c:1657
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "dakikada"
 
-#: src/inc.c:1647
+#: src/inc.c:1650
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "saat"
 
-#: src/inc.c:1659
+#: src/inc.c:1662
 #, 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:1665
+#: src/inc.c:1668
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%sÇevrim dışı çalışıyorsunuz. Geçersiz kıl?"
 
-#: src/inc.c:1672
+#: src/inc.c:1675
 msgid "On_ly once"
 msgstr "_Bir kereliğine"
 
@@ -6973,8 +7007,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"
@@ -7114,829 +7148,829 @@ msgstr "NetworkManager: ağ devrede.\n"
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager: ağ devre dışı.\n"
 
-#: src/mainwindow.c:523 src/messageview.c:212
+#: src/mainwindow.c:521 src/messageview.c:212
 msgid "_File"
 msgstr "_Dosya"
 
-#: src/mainwindow.c:525 src/messageview.c:214 src/summaryview.c:448
+#: src/mainwindow.c:523 src/messageview.c:214 src/summaryview.c:448
 msgid "_View"
 msgstr "_Görünüm"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:526
 msgid "_Configuration"
 msgstr "_Yapılandırma"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:530
 msgid "_Add mailbox"
 msgstr "_Posta kutusu ekle"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:531
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:534
 msgid "Change mailbox order..."
 msgstr "Posta kutusu sırasını değiştir..."
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:537
 msgid "_Import mbox file..."
 msgstr "_Mbox dosyasını içe aktar..."
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:538
 msgid "_Export to mbox file..."
 msgstr "_Mbox olarak dışa aktar..."
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:539
 msgid "_Export selected to mbox file..."
 msgstr "_Seçileni mbox dosyasına aktar..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:541
 msgid "Empty all _Trash folders"
 msgstr "Tüm Çöp dizinlerini _boşalt"
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:544 src/messageview.c:221
 msgid "_Save email as..."
 msgstr "_E-postayı farklı kaydet..."
 
-#: src/mainwindow.c:547 src/messageview.c:222
+#: src/mainwindow.c:545 src/messageview.c:222
 msgid "_Save part as..."
 msgstr "_Bir bölümünü farklı kaydet..."
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:548 src/messageview.c:223
 msgid "Page setup..."
 msgstr "Sayfa düzeni..."
 
-#: src/mainwindow.c:551 src/messageview.c:224
+#: src/mainwindow.c:549 src/messageview.c:224
 msgid "_Print..."
 msgstr "_Yazdır...."
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:551
 msgid "Synchronise folders"
 msgstr "Dizinleri eşle"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:553
 msgid "E_xit"
 msgstr "Çı_k"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:558
 msgid "Select _thread"
 msgstr "Zİncirleme konu _seç"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:560
 msgid "_Find in current message..."
 msgstr "_Mevcut ileti içinde bul..."
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:562
 msgid "_Quick search"
 msgstr "_Hızlı arama"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:565
 msgid "Show or hi_de"
 msgstr "Göster ya da _sakla"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:566
 msgid "_Toolbar"
 msgstr "_Araç çubuğu"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:568
 msgid "Set displayed _columns"
 msgstr "Gösterilen _sütünları ayarla"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:569
 msgid "In _folder list..."
 msgstr "_Dizin listesi içinde..."
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:570
 msgid "In _message list..."
 msgstr "İ_leti listesi içinde..."
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:575
 msgid "La_yout"
 msgstr "_Yerleşim"
 
-#: src/mainwindow.c:579
+#: src/mainwindow.c:577
 msgid "_Sort"
 msgstr "_Sırala"
 
-#: src/mainwindow.c:581
+#: src/mainwindow.c:579
 msgid "_Attract by subject"
 msgstr "_Başlığa göre çek"
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:581
 msgid "E_xpand all threads"
 msgstr "Zincirleme konuları _genişlet"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:582
 msgid "Co_llapse all threads"
 msgstr "Zincirleme konuları _küçült"
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:584 src/messageview.c:235
 msgid "_Go to"
 msgstr "İletiye _git"
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:585 src/messageview.c:236
 msgid "_Previous message"
 msgstr "Ö_nceki ileti"
 
-#: src/mainwindow.c:588 src/messageview.c:237
+#: src/mainwindow.c:586 src/messageview.c:237
 msgid "_Next message"
 msgstr "_Sonraki ileti"
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:588 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr "Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:591 src/messageview.c:240
+#: src/mainwindow.c:589 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr "_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:591 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr "Önceki _yeni ileti"
 
-#: src/mainwindow.c:594 src/messageview.c:243
+#: src/mainwindow.c:592 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr "_Sonraki yeni ileti"
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:594 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr "Önceki _işaretli ileti"
 
-#: src/mainwindow.c:597 src/messageview.c:246
+#: src/mainwindow.c:595 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr "Sonraki _işaretli ileti"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:597 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Önceki _etiketli ileti"
 
-#: src/mainwindow.c:600 src/messageview.c:249
+#: src/mainwindow.c:598 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Sonraki _etiketli ileti"
 
-#: src/mainwindow.c:602
+#: src/mainwindow.c:600
 msgid "Previously opened message"
 msgstr "Önceki açılmış ileti"
 
-#: src/mainwindow.c:603 src/messageview.c:252
+#: src/mainwindow.c:601 src/messageview.c:252
 msgid "Next opened message"
 msgstr "Sonraki açılmış ileti"
 
-#: src/mainwindow.c:605 src/messageview.c:254
+#: src/mainwindow.c:603 src/messageview.c:254
 msgid "Parent message"
 msgstr "Ana ileti"
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:605 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr "Sonraki okunmamış _dizin"
 
-#: src/mainwindow.c:608 src/messageview.c:257
+#: src/mainwindow.c:606 src/messageview.c:257
 msgid "F_older..."
 msgstr "D_izin"
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:608 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr "Sonraki bölüm"
 
-#: src/mainwindow.c:611 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:609 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr "Önckei bölüm"
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:612 src/messageview.c:261
 msgid "Message scroll"
 msgstr "İleti kaydırma"
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:613 src/messageview.c:262
 msgid "Previous line"
 msgstr "Önceki satır"
 
-#: src/mainwindow.c:616 src/messageview.c:263
+#: src/mainwindow.c:614 src/messageview.c:263
 msgid "Next line"
 msgstr "Sonraki satır"
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:476
+#: src/mainwindow.c:615 src/messageview.c:264 src/printing.c:476
 msgid "Previous page"
 msgstr "Önceki sayfa"
 
-#: src/mainwindow.c:618 src/messageview.c:265 src/printing.c:482
+#: src/mainwindow.c:616 src/messageview.c:265 src/printing.c:482
 msgid "Next page"
 msgstr "Sonraki sayfa"
 
-#: src/mainwindow.c:636 src/messageview.c:283
+#: src/mainwindow.c:634 src/messageview.c:283
 msgid "Decode"
 msgstr "Çöz"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:641
 msgid "Open in new _window"
 msgstr "Yeni _pencerede aç"
 
-#: src/mainwindow.c:644 src/messageview.c:290
+#: src/mainwindow.c:642 src/messageview.c:290
 msgid "Mess_age source"
 msgstr "İl_etinin kaynağı"
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:644 src/messageview.c:291
 msgid "Message part"
 msgstr "İleti bölümü"
 
-#: src/mainwindow.c:647 src/messageview.c:292
+#: src/mainwindow.c:645 src/messageview.c:292
 msgid "View as text"
 msgstr "Metin olarak görüntüle"
 
-#: src/mainwindow.c:648 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:646 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr "_Aç"
 
-#: src/mainwindow.c:650 src/messageview.c:295
+#: src/mainwindow.c:648 src/messageview.c:295
 msgid "Open with..."
 msgstr "_Birlikte aç..."
 
-#: src/mainwindow.c:654 src/messageview.c:298
+#: src/mainwindow.c:652 src/messageview.c:298
 msgid "Quotes"
 msgstr "Alıntılar"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:654
 msgid "_Update summary"
 msgstr "Özeti _güncelle"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:657
 msgid "Recei_ve"
 msgstr "İleti _al"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:658
 msgid "Get from _current account"
 msgstr "_Seçilmiş hesaptan al"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:659
 msgid "Get from _all accounts"
 msgstr "_Tüm hesaplardan al"
 
-#: src/mainwindow.c:662
+#: src/mainwindow.c:660
 msgid "Cancel receivin_g"
 msgstr "_Almaktan vaz geç"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:663
 msgid "_Send queued messages"
 msgstr "Kuyruktaki iletileri _gönder"
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:668
 msgid "Compose a_n email message"
 msgstr "Yeni _bir e-posta oluştur"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:669
 msgid "Compose a news message"
 msgstr "Yeni bir haber oluştur"
 
-#: src/mainwindow.c:673 src/messageview.c:304
+#: src/mainwindow.c:671 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:94 src/summaryview.c:432
 msgid "_Reply"
 msgstr "_Yanıtla"
 
-#: src/mainwindow.c:674 src/messageview.c:305 src/summaryview.c:433
+#: src/mainwindow.c:672 src/messageview.c:305 src/summaryview.c:433
 msgid "Repl_y to"
 msgstr "_Yanıtla"
 
-#: src/mainwindow.c:677 src/messageview.c:308 src/summaryview.c:436
+#: src/mainwindow.c:675 src/messageview.c:308 src/summaryview.c:436
 msgid "Mailing _list"
 msgstr "E-posta _listesi"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:676
 msgid "Follow-up and reply to"
 msgstr "Takiben ve cevaben"
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:679 src/messageview.c:311 src/summaryview.c:438
 #: src/toolbar.c:2490
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:680 src/messageview.c:312 src/summaryview.c:439
 #: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr "Ek olarak _yönlendir"
 
-#: src/mainwindow.c:683 src/messageview.c:313 src/summaryview.c:440
+#: src/mainwindow.c:681 src/messageview.c:313 src/summaryview.c:440
 #: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr "_Yeniden yönlendir"
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:683
 msgid "Mailing-_List"
 msgstr "E-posta-_Listesi"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:684
 msgid "Post"
 msgstr "Posta"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:686
 msgid "Help"
 msgstr "Yardım"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:690
 msgid "Unsubscribe"
 msgstr "Abonelikten çık"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:692
 msgid "View archive"
 msgstr "Arşivi göster"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:694
 msgid "Contact owner"
 msgstr "Kişi listesi sahibi"
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:698
 msgid "M_ove..."
 msgstr "_Taşı..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:699
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:700
 msgid "Move to _trash"
 msgstr "Çöpe _taşı"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:701
 msgid "_Delete..."
 msgstr "_Sil..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:702
 msgid "Move thread to tr_ash"
 msgstr "Zincirleme konuyu çöpe t_aşı"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:703
 msgid "Delete t_hread"
 msgstr "Zincirleme konuyu _sil"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:704
 msgid "Cancel a news message"
 msgstr "Haber iletisini iptal et"
 
-#: src/mainwindow.c:709 src/mainwindow.c:710 src/summaryview.c:441
+#: src/mainwindow.c:707 src/mainwindow.c:708 src/summaryview.c:441
 msgid "_Mark"
 msgstr "İşa_retle"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "_Unmark"
 msgstr "İşareti _kaldır"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:712
 msgid "Mark as rea_d"
 msgstr "_Okunmuş olarak işaretle"
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Mark as unr_ead"
 msgstr "_Okunmamış olarak işaretle"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Mark all read in folder"
 msgstr "Dizindekileri okunmuş olarak işaretle"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:716
 msgid "Mark all unread in folder"
 msgstr "Dizindekileri okunmamış olarak işaretle"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:193 src/toolbar.c:245
+#: src/mainwindow.c:718 src/prefs_filtering_action.c:193 src/toolbar.c:245
 #: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr "Zincirleme konuyu dikkate alma"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Unignore thread"
 msgstr "Zincirleme konuyu dikkate al"
 
-#: src/mainwindow.c:722 src/prefs_filtering_action.c:194 src/toolbar.c:246
+#: src/mainwindow.c:720 src/prefs_filtering_action.c:194 src/toolbar.c:246
 #: src/toolbar.c:514
 msgid "Watch thread"
 msgstr "Zincirleme konuyu takip et"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:721
 msgid "Unwatch thread"
 msgstr "Zincirleme konu takibini kaldır"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:724
 msgid "Mark as _spam"
 msgstr "İstenmeyen olarak işaretle"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:725
 msgid "Mark as _ham"
 msgstr "Zararsız olarak işaretle"
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:177 src/toolbar.c:517
+#: src/mainwindow.c:728 src/prefs_filtering_action.c:177 src/toolbar.c:517
 msgid "Lock"
 msgstr "Kilitle"
 
-#: src/mainwindow.c:731 src/prefs_filtering_action.c:178 src/toolbar.c:518
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:178 src/toolbar.c:518
 msgid "Unlock"
 msgstr "Kilidi aç"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:731 src/summaryview.c:442
 msgid "Color la_bel"
 msgstr "Renk _etiketi"
 
-#: src/mainwindow.c:734 src/summaryview.c:443
+#: src/mainwindow.c:732 src/summaryview.c:443
 msgid "Ta_gs"
 msgstr "Etiketler"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:735
 msgid "Re-_edit"
 msgstr "Yeniden _düzenle"
 
-#: src/mainwindow.c:740 src/messageview.c:314 src/mimeview.c:1044
+#: src/mainwindow.c:738 src/messageview.c:314 src/mimeview.c:1044
 msgid "Check signature"
 msgstr "İmzayı denetle"
 
-#: src/mainwindow.c:745 src/messageview.c:318
+#: src/mainwindow.c:743 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr "Göndereni adres _defterine ekle"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "C_ollect addresses"
 msgstr "Adresleri topla"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "From current _folder..."
 msgstr "Mevcut _dizinden..."
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:747
 msgid "From selected _messages..."
 msgstr "Seçilmiş _iletilerden..."
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:750
 msgid "_Filter all messages in folder"
 msgstr "Dizindeki tüm iletileri _süz"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:751
 msgid "Filter _selected messages"
 msgstr "_Seçilen iletileri süz"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:752
 msgid "Run folder pr_ocessing rules"
 msgstr "Dizin işleme kurallarını yürüt"
 
-#: src/mainwindow.c:756 src/messageview.c:321
+#: src/mainwindow.c:754 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr "Süzgeç kuralı _oluştur"
 
-#: src/mainwindow.c:757 src/mainwindow.c:764 src/messageview.c:322
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr "_Otomatik olarak"
 
-#: src/mainwindow.c:758 src/mainwindow.c:765 src/mainwindow.c:873
+#: src/mainwindow.c:756 src/mainwindow.c:763 src/mainwindow.c:871
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr "_Gönderene göre"
 
-#: src/mainwindow.c:759 src/mainwindow.c:766 src/mainwindow.c:874
+#: src/mainwindow.c:757 src/mainwindow.c:764 src/mainwindow.c:872
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr "_Alıcıya göre"
 
-#: src/mainwindow.c:760 src/mainwindow.c:767 src/messageview.c:325
+#: src/mainwindow.c:758 src/mainwindow.c:765 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr "_Başlığa göre"
 
-#: src/mainwindow.c:761 src/mainwindow.c:768 src/messageview.c:326
+#: src/mainwindow.c:759 src/mainwindow.c:766 src/messageview.c:326
 #: src/messageview.c:333
 msgid "By S_ender"
 msgstr "Gön_derene Göre"
 
-#: src/mainwindow.c:763 src/messageview.c:328 src/summaryview.c:446
+#: src/mainwindow.c:761 src/messageview.c:328 src/summaryview.c:446
 msgid "Create processing rule"
 msgstr "İşleme kuralı oluştur"
 
-#: src/mainwindow.c:771 src/messageview.c:336
+#: src/mainwindow.c:769 src/messageview.c:336
 msgid "List _URLs..."
 msgstr "_URL'leri listele..."
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "Ch_eck for new messages in all folders"
 msgstr "Tüm dizinlerde yeni ileti olup olmadığına _bak"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Delete du_plicated messages"
 msgstr "Mükerrer iletileri sil"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:778
 msgid "In selected folder"
 msgstr "Seçilen dizinde"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:779
 msgid "In all folders"
 msgstr "Tüm dizinler"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:782
 msgid "E_xecute"
 msgstr "Çalış_tır"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Exp_unge"
 msgstr "_Sil"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "TLS cer_tificates"
 msgstr "TLS ser_tifikaları"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "Filtering Lo_g"
 msgstr "Süzme Ka_yıtları"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:790
 msgid "Network _Log"
 msgstr "Ağ K_ayıtları"
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:792
 msgid "Debug _Log"
 msgstr "Debug _Kaydı"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "_Forget all session passwords"
 msgstr "Tüm oturum şifrelerini _unut"
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "Forget _primary passphrase"
 msgstr "A_na şifreyi unut"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:801
 msgid "C_hange current account"
 msgstr "Kullanılan hesabı _değiştir"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "_Preferences for current account..."
 msgstr "Kullanılan hesap için tercihler..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Create _new account..."
 msgstr "_Yeni hesap oluştur..."
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Edit accounts..."
 msgstr "Hesapları _düzenle..."
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "P_references..."
 msgstr "_Tercihler..."
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:809
 msgid "Pre-pr_ocessing..."
 msgstr "Ön _işlem..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Post-pro_cessing..."
 msgstr "Son _işlem..."
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:811
 msgid "_Filtering..."
 msgstr "_Süzme..."
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:812
 msgid "_Templates..."
 msgstr "Şab_lonlar..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Actions..."
 msgstr "_Eylemler..."
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "Tag_s..."
 msgstr "_Etiketler..."
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:816
 msgid "Plu_gins..."
 msgstr "_Eklentiler..."
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:819
 msgid "_Manual"
 msgstr "_Kullanım kılavuzu"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:820
 msgid "_Online User-contributed FAQ"
 msgstr "Çevrimiçi _SSS"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:821
 msgid "Icon _Legend"
 msgstr "Simge _Açıklamaları"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:823
 msgid "Set as default client"
 msgstr "Öntanımlı istemci olarak ata"
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Offline _mode"
 msgstr "Çevrimdışı _mod"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Men_ubar"
 msgstr "_Menü çubuğu"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:832
 msgid "_Message view"
 msgstr "_Posta içeriği"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:834
 msgid "Status _bar"
 msgstr "_Durum çubuğu"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:836
 msgid "Column headers"
 msgstr "Sütun başlıkları"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:837
 msgid "Th_read view"
 msgstr "_Zİncirleme konuları göster"
 
-#: src/mainwindow.c:840 src/prefs_summaries.c:669
+#: src/mainwindow.c:838 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr "Okunmuş zincirleme konuları gizle"
 
-#: src/mainwindow.c:841
+#: src/mainwindow.c:839
 msgid "_Hide read messages"
 msgstr "Okunmuş iletileri _gizle"
 
-#: src/mainwindow.c:842 src/prefs_summaries.c:675
+#: src/mainwindow.c:840 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr "Silinen iletileri gizle"
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:841
 msgid "_Fullscreen"
 msgstr "_Tam ekran"
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:842 src/messageview.c:348
 msgid "Show all _headers"
 msgstr "Tüm üst_bilgileri göster"
 
-#: src/mainwindow.c:845 src/messageview.c:349
+#: src/mainwindow.c:843 src/messageview.c:349
 msgid "_Collapse all"
 msgstr "_Hepsini gizle"
 
-#: src/mainwindow.c:846 src/messageview.c:350
+#: src/mainwindow.c:844 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr "İkinci seviyeyi _gizle"
 
-#: src/mainwindow.c:847 src/messageview.c:351
+#: src/mainwindow.c:845 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr "Üçüncü seviyeyi _gizle"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:849
 msgid "Text _below icons"
 msgstr "Simge _altında metin"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:850
 msgid "Text be_side icons"
 msgstr "Simge _yanında metin"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:851
 msgid "_Icons only"
 msgstr "Sadece _simge"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:852
 msgid "_Text only"
 msgstr "Sadece _metin"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:859
 msgid "_Standard"
 msgstr "_Standart"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:860
 msgid "_Three columns"
 msgstr "Üçlü _sütun"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "_Wide message"
 msgstr "İleti bölümünü _genişlet"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "W_ide message list"
 msgstr "İleti listesini _genişlet"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "S_mall screen"
 msgstr "Küçük _ekran"
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By _number"
 msgstr "_Numaraya göre"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By s_ize"
 msgstr "_Boyuta göre"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By _date"
 msgstr "_Tarihe göre"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By thread date"
 msgstr "Zincirleme konu tarihine göre"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By s_ubject"
 msgstr "Başlığa göre"
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By _color label"
 msgstr "_Renk etiketine göre"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "By tag"
 msgstr "Etikete göre"
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:876
 msgid "By _mark"
 msgstr "İşaret_e göre"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:877
 msgid "By _status"
 msgstr "_Duruma göre"
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:878
 msgid "By a_ttachment"
 msgstr "_Eke göre"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:879
 msgid "By score"
 msgstr "Öneme göre"
 
-#: src/mainwindow.c:882
+#: src/mainwindow.c:880
 msgid "By locked"
 msgstr "Kilide göre"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:881
 msgid "D_on't sort"
 msgstr "Tasnif _etme"
 
-#: src/mainwindow.c:887 src/prefs_summaries.c:656
+#: src/mainwindow.c:885 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr "Artan sırada"
 
-#: src/mainwindow.c:888 src/prefs_summaries.c:657
+#: src/mainwindow.c:886 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr "Azalan sırada"
 
-#: src/mainwindow.c:930 src/messageview.c:393
+#: src/mainwindow.c:928 src/messageview.c:393
 msgid "_Auto detect"
 msgstr "_Otomatik sapta"
 
-#: src/mainwindow.c:1308 src/summaryview.c:6511
+#: src/mainwindow.c:1306 src/summaryview.c:6511
 msgid "Modify tags..."
 msgstr "Etiketleri düzenle..."
 
-#: src/mainwindow.c:1966
+#: src/mainwindow.c:1964
 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:1981
+#: src/mainwindow.c:1979
 msgid "You are online. Click the icon to go offline"
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın"
 
-#: src/mainwindow.c:1984
+#: src/mainwindow.c:1982
 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:1998
+#: src/mainwindow.c:1996
 msgid "Select account"
 msgstr "Hesap seç"
 
-#: src/mainwindow.c:2025 src/prefs_logging.c:136
+#: src/mainwindow.c:2023 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "Ağ kaydı"
 
-#: src/mainwindow.c:2029
+#: src/mainwindow.c:2027
 msgid "Filtering/Processing debug log"
 msgstr "Süzme/İşlem debug kaydı"
 
-#: src/mainwindow.c:2048 src/prefs_logging.c:378
+#: src/mainwindow.c:2046 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "Süzme kaydı açık\n"
 
-#: src/mainwindow.c:2050 src/prefs_logging.c:380
+#: src/mainwindow.c:2048 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "Süzme kaydı kapalı\n"
 
-#: src/mainwindow.c:2484 src/mainwindow.c:2491 src/mainwindow.c:2534
-#: src/mainwindow.c:2567 src/mainwindow.c:2599 src/mainwindow.c:2644
+#: src/mainwindow.c:2482 src/mainwindow.c:2489 src/mainwindow.c:2532
+#: src/mainwindow.c:2565 src/mainwindow.c:2597 src/mainwindow.c:2642
 #: src/plugins/notification/notification_trayicon.c:372
 #: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1149
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:2645 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2643 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:2902 src/mainwindow.c:2907
+#: src/mainwindow.c:2900 src/mainwindow.c:2905
 msgid "Delete all messages in trash folders?"
 msgstr "Çöp dizinlerindeki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:2903
+#: src/mainwindow.c:2901
 msgid "Don't quit"
 msgstr "Çıkma"
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2932 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2933
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7949,18 +7983,18 @@ msgstr ""
 "Mevcut bir mailbox belirtildiyse, doğrudan\n"
 "taranacaktır."
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
 #: 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:2948 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:2953 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7969,108 +8003,108 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar zaten mevcut olabilir ya da buraya yazma izniniz olmayabilir."
 
-#: src/mainwindow.c:3420
+#: src/mainwindow.c:3418
 msgid "No posting allowed"
 msgstr "Posta göndermeye izin yok"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:4000
 msgid "Mbox import has failed."
 msgstr "Mbox içe aktarılamadı."
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4009 src/mainwindow.c:4018
 msgid "Export to mbox has failed."
 msgstr "Mbox'a aktarılamadı."
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4059 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "Claws Mail'i kapat?"
 
-#: src/mainwindow.c:4262
+#: src/mainwindow.c:4260
 msgid "Folder synchronisation"
 msgstr "Dizin eşleştirme"
 
-#: src/mainwindow.c:4263
+#: src/mainwindow.c:4261
 msgid "Do you want to synchronise your folders now?"
 msgstr "Dizinleri şimdi eşleştirmek istiyor musunuz?"
 
-#: src/mainwindow.c:4264
+#: src/mainwindow.c:4262
 msgid "_Synchronise"
 msgstr "_Eşleştir"
 
-#: src/mainwindow.c:4746
+#: src/mainwindow.c:4744
 msgid "Deleting duplicated messages..."
 msgstr "Mükerrer iletiler siliniyor..."
 
-#: src/mainwindow.c:4756
+#: src/mainwindow.c:4754
 msgid "No duplicate message found in selected folder.\n"
 msgstr "Seçilen dizinde mükerrer ileti bulunamadı.\n"
 
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4760
 #, 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:4766
+#: src/mainwindow.c:4764
 #, 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:4804
+#: src/mainwindow.c:4802
 msgid "Deleting duplicated messages in all folders..."
 msgstr "Tüm dizinlerdeki mükerrer iletiler siliniyor..."
 
-#: src/mainwindow.c:4810
+#: src/mainwindow.c:4808
 #, 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:4815
+#: src/mainwindow.c:4813
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "%d adet dizinde mükerrer ileti bulunamadı.\n"
 
-#: src/mainwindow.c:4977 src/messageview.c:2648
+#: src/mainwindow.c:4975 src/messageview.c:2648
 msgid "Select folder to go to"
 msgstr "Gidilecek dizini seçin"
 
-#: src/mainwindow.c:5080 src/summaryview.c:5952
+#: src/mainwindow.c:5078 src/summaryview.c:5952
 msgid "Processing rules to apply before folder rules"
 msgstr "Dizin kurallarından önce uygulanacak işlem kuralları"
 
-#: src/mainwindow.c:5088
+#: src/mainwindow.c:5086
 msgid "Processing rules to apply after folder rules"
 msgstr "Dizin kurallarından sonra uygulanacak işlem kuralları"
 
-#: src/mainwindow.c:5096 src/summaryview.c:5963
+#: src/mainwindow.c:5094 src/summaryview.c:5963
 msgid "Filtering configuration"
 msgstr "Süzme ayarları"
 
-#: src/mainwindow.c:5209
+#: src/mainwindow.c:5207
 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:5300
+#: src/mainwindow.c:5298
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail öntanımlı istemci olarak atandı."
 
-#: src/mainwindow.c:5302
+#: src/mainwindow.c:5300
 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:5316 src/setup.c:91
+#: src/mainwindow.c:5314 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/mainwindow.c:5460
+#: src/mainwindow.c:5458
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8392,7 +8426,7 @@ msgstr ""
 "  İleti silindi ya da başka bir dizine taşındı"
 
 #: src/messageview.c:3000 src/messageview.c:3006 src/summaryview.c:4424
-#: src/summaryview.c:7314
+#: src/summaryview.c:7318
 msgid "An error happened while learning.\n"
 msgstr "Öğrenirken bir sorun meydana geldi.\n"
 
@@ -8515,8 +8549,8 @@ msgstr "İmza denetleniyor..."
 msgid "Go back to email"
 msgstr "E-postaya geri dön"
 
-#: src/mimeview.c:1712 src/mimeview.c:1804 src/mimeview.c:2046
-#: src/mimeview.c:2082 src/mimeview.c:2194 src/plugins/fancy/fancy_viewer.c:452
+#: src/mimeview.c:1712 src/mimeview.c:1805 src/mimeview.c:2058
+#: src/mimeview.c:2094 src/mimeview.c:2206 src/plugins/fancy/fancy_viewer.c:452
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "Çok bölümlü iletinin bir bölümü kaydedilemedi: %s"
@@ -8526,65 +8560,65 @@ 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:1815
+#: src/mimeview.c:1816
 #, 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?"
+"İleti bölümü %d kaydedilirken bir hata meydana geldi. İşlemi sonlandır ya da "
+"hatayı atlayıp devam et?"
 
-#: src/mimeview.c:1818
+#: src/mimeview.c:1819
 msgid "Error saving all message parts"
-msgstr "İleti bölümünün hepsi kaydedilemedi"
+msgstr "ileti bölümlerinin kaydında hata"
 
-#: src/mimeview.c:1819
-msgid "Skip"
-msgstr "Atla"
+#: src/mimeview.c:1820
+msgid "Ignore"
+msgstr "Dikkate alma"
 
-#: src/mimeview.c:1819
-msgid "Skip all"
-msgstr "Hepsini atla"
+#: src/mimeview.c:1820
+msgid "Ignore all"
+msgstr "Tümünü dikkate alma"
 
-#: src/mimeview.c:1829
+#: src/mimeview.c:1832
 #, 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:1837
+#: src/mimeview.c:1844
 #, 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:1842
+#: src/mimeview.c:1849
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s, %d adet dosya kaydedilemedi."
 
-#: src/mimeview.c:1875 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1886 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "Hedef dizini seç"
 
-#: src/mimeview.c:1882 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1893 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' bir dizin değil."
 
-#: src/mimeview.c:1999 src/plugins/fancy/fancy_viewer.c:708
+#: src/mimeview.c:2011 src/plugins/fancy/fancy_viewer.c:708
 #: src/summaryview.c:5037
 msgid "Save as"
 msgstr "Farklı kaydet"
 
-#: src/mimeview.c:2129 src/mimeview.c:2136
+#: src/mimeview.c:2141 src/mimeview.c:2148
 msgid "Open with"
 msgstr "Birlikte aç"
 
-#: src/mimeview.c:2130 src/mimeview.c:2137
+#: src/mimeview.c:2142 src/mimeview.c:2149
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8593,7 +8627,7 @@ msgstr ""
 "Dosyayı açmak için komut satırını aç:\n"
 "('%s' dosya adıyla değiştirilecek)"
 
-#: src/mimeview.c:2232
+#: src/mimeview.c:2244
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8604,11 +8638,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2240
+#: src/mimeview.c:2252
 msgid "Execute untrusted binary?"
 msgstr "Güvenilmeyen ikilik çalıştırılsın mı?"
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2253
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8620,20 +8654,20 @@ msgstr ""
 "\n"
 "Bu dosyayı çalıştırmak istiyor musunuz?"
 
-#: src/mimeview.c:2245
+#: src/mimeview.c:2257
 msgid "Run binary"
 msgstr "İkiliği çalıştır"
 
-#: src/mimeview.c:2549 src/plugins/att_remover/att_remover.c:303
+#: src/mimeview.c:2561
 msgid "Type:"
 msgstr "Tür:"
 
-#: src/mimeview.c:2550 src/plugins/att_remover/att_remover.c:304
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2789
+#: src/mimeview.c:2562 src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/summaryview.c:2789
 msgid "Size:"
 msgstr "Boyut:"
 
-#: src/mimeview.c:2564 src/plugins/vcalendar/vcalendar.c:1243
+#: src/mimeview.c:2576 src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
 msgid "Description:"
@@ -8744,77 +8778,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"
@@ -9311,7 +9345,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ç"
 
@@ -9485,6 +9519,10 @@ 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:305
+msgid "Filename"
+msgstr "Dosya adı"
+
 #: src/plugins/att_remover/att_remover.c:336
 msgid "Remove attachments"
 msgstr "Ekleri kaldır"
@@ -9785,7 +9823,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:389 src/prefs_account.c:1718
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1748
 msgid "KiB"
 msgstr "KiB"
 
@@ -10301,7 +10339,7 @@ msgstr "Görüntüleyicide aç (uzak içerik etkin)"
 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:4304
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4360
 #: src/prefs_proxy.c:243
 msgid "Proxy"
 msgstr "Vekil (Proxy)"
@@ -10344,7 +10382,7 @@ msgstr "Öntanımlı olarak, bağlantıya tıklandığında"
 
 #: src/plugins/fancy/fancy_prefs.c:285
 msgid "Open in External Browser"
-msgstr "Harici Tarayıcı İle Aç"
+msgstr "Harici Tarayıcı ile Aç"
 
 #: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
@@ -10353,7 +10391,7 @@ msgstr "Bu dosyadaki CSS tüm HTML parçalarına uygulanacak"
 #: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
 #: 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:2510
+#: src/prefs_account.c:1649 src/prefs_account.c:1771 src/prefs_account.c:2548
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "Göz_at"
@@ -10402,7 +10440,7 @@ msgstr "%s kusurlu ya da desteklenmeyen bir besleme"
 
 #: src/plugins/fancy/fancy_viewer.c:759
 msgid "Search the Web"
-msgstr "Webde Ara"
+msgstr "İnternette Ara"
 
 #: src/plugins/fancy/fancy_viewer.c:770
 msgid "Open in Viewer"
@@ -10676,7 +10714,7 @@ msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData eklentisi: Kimlik denetimi yenileniyor\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2058
 msgid "Authentication"
 msgstr "Kimlik Doğrulama"
 
@@ -10888,8 +10926,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: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:1727
+#: src/prefs_account.c:1888 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "saat"
 
@@ -11077,15 +11115,6 @@ msgstr ""
 "Mevcut bir posta kutusu belirtildiyse, doğrudan\n"
 "taranacaktır."
 
-#: 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' 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"
@@ -11273,7 +11302,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr "Sieve'yi aç"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1292
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
@@ -11324,28 +11353,28 @@ 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:1460
-#: src/prefs_account.c:2072
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1487
+#: src/prefs_account.c:2108
 msgid "User ID"
 msgstr "Kullanıcı ID"
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:400
-#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1466
-#: src/prefs_account.c:2095 src/prefs_account.c:3038 src/prefs_account.c:3066
-#: src/prefs_account.c:3263 src/prefs_proxy.c:136 src/wizard.c:1215
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1493
+#: src/prefs_account.c:2131 src/prefs_account.c:3076 src/prefs_account.c:3104
+#: src/prefs_account.c:3301 src/prefs_proxy.c:136 src/wizard.c:1215
 #: src/wizard.c:1635
 msgid "Password"
 msgstr "Parola"
 
-#: 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:1676
+#: src/prefs_account.c:1810 src/prefs_account.c:2076
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
-#: 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/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1820
+#: src/prefs_account.c:2085 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1218
 msgid "Automatic"
 msgstr "Otomatik"
@@ -11362,20 +11391,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 "
@@ -11392,7 +11421,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ı"
 
@@ -11640,7 +11669,7 @@ msgid "Show banner"
 msgstr "Banner'ı göster"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: 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"
@@ -12255,8 +12284,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: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/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1895
+#: src/prefs_account.c:2197 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "dakikada"
 
@@ -12320,64 +12349,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"
@@ -12858,8 +12887,8 @@ msgstr "Python uçbirimini göster..."
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3027
-#: src/prefs_account.c:3055 src/prefs_account.c:3493 src/wizard.c:1205
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3065
+#: src/prefs_account.c:3093 src/prefs_account.c:3531 src/wizard.c:1205
 #: src/wizard.c:1625
 msgid "Browse"
 msgstr "Gözat"
@@ -13178,7 +13207,7 @@ msgstr "Şu tarihten daha yeni tarihli iletilerdeki yorumları al"
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:623 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1687 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
+#: src/prefs_account.c:1717 src/prefs_folder_item.c:595 src/prefs_matcher.c:341
 msgid "days"
 msgstr "gün"
 
@@ -13327,7 +13356,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)"
 
@@ -13336,7 +13365,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ı)"
 
@@ -14026,63 +14055,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"
@@ -14092,21 +14121,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"
@@ -14119,7 +14148,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"
@@ -14130,47 +14159,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"
 
@@ -14639,95 +14668,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:396 src/prefs_account.c:1631 src/prefs_account.c:2955
+#: src/prefs_account.c:415 src/prefs_account.c:1658 src/prefs_account.c:2993
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2970
+#: src/prefs_account.c:416 src/prefs_account.c:1804 src/prefs_account.c:3008
 #: src/wizard.c:1500
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:398
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr "Haberler (NNTP)"
 
-#: src/prefs_account.c:399 src/wizard.c:1501
+#: src/prefs_account.c:418 src/wizard.c:1501
 msgid "Local mbox file"
 msgstr "Yerel mbox dosyası"
 
-#: src/prefs_account.c:400
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr "Hiç biri (sadece SMTP)"
 
-#: src/prefs_account.c:1203
+#: src/prefs_account.c:1230
 msgid "Name of account"
 msgstr "Hesabın adı"
 
-#: src/prefs_account.c:1212
+#: src/prefs_account.c:1239
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1247
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1256
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1262
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account.c:1298 src/wizard.c:1524
+#: src/prefs_account.c:1325 src/wizard.c:1524
 msgid "Auto-configure"
 msgstr "Kendiliğinden ayarla"
 
-#: src/prefs_account.c:1300 src/wizard.c:1525
+#: src/prefs_account.c:1327 src/wizard.c:1525
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/prefs_account.c:1317
+#: src/prefs_account.c:1344
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14735,81 +14764,81 @@ msgstr ""
 "Uyarı: Claws Mail'in bu sürümü\n"
 "IMAP ve Haberler desteği olmadan derlenmiş."
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1375
 msgid "This server requires authentication"
 msgstr "Bu sunucu kimlik doğrulaması istiyor"
 
-#: src/prefs_account.c:1355
+#: src/prefs_account.c:1382
 msgid "Authenticate on connect"
 msgstr "Bağlanırken kimlik denetimi yap"
 
-#: src/prefs_account.c:1417
+#: src/prefs_account.c:1444
 msgid "News server"
 msgstr "Haberler sunucusu"
 
-#: src/prefs_account.c:1423
+#: src/prefs_account.c:1450
 msgid "Server for receiving"
 msgstr "Alımın yapılacağı sunucu"
 
-#: src/prefs_account.c:1429
+#: src/prefs_account.c:1456
 msgid "Local mailbox"
 msgstr "Yerel posta kutusu"
 
-#: src/prefs_account.c:1436
+#: src/prefs_account.c:1463
 msgid "SMTP server (send)"
 msgstr "SMTP sunucu (gönder)"
 
-#: src/prefs_account.c:1444
+#: src/prefs_account.c:1471
 msgid "Use mail command rather than SMTP server"
 msgstr "SMTP sunucu yerine mail komutunu kullan"
 
-#: src/prefs_account.c:1453
+#: src/prefs_account.c:1480
 msgid "command to send mails"
 msgstr "postaları gönderecek komut"
 
-#: src/prefs_account.c:1526
+#: src/prefs_account.c:1553
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1632
 msgid "Local"
 msgstr "Yerel"
 
-#: src/prefs_account.c:1611 src/prefs_account.c:1730
+#: src/prefs_account.c:1638 src/prefs_account.c:1760
 msgid "Default Inbox"
 msgstr "Öntanımlı Gelen Kutusu"
 
-#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
-#: src/prefs_account.c:1744
+#: src/prefs_account.c:1645 src/prefs_account.c:1652 src/prefs_account.c:1767
+#: src/prefs_account.c:1774
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Süzülmemiş iletiler bu dizinde tutulacak"
 
-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1661
 msgid "Authenticate before POP connection"
 msgstr "POP bağlantısından önce kimlik denetimi yap"
 
-#: src/prefs_account.c:1658 src/prefs_account.c:2259
+#: src/prefs_account.c:1685 src/prefs_account.c:2296
 msgid "Select"
 msgstr "Seç"
 
-#: src/prefs_account.c:1666
+#: src/prefs_account.c:1696
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1707
 msgid "Remove after"
 msgstr "Sonra sil"
 
-#: src/prefs_account.c:1684 src/prefs_account.c:1694
+#: src/prefs_account.c:1714 src/prefs_account.c:1724
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 gün ve 0 saat : derhal sil"
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1737
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1740
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -14817,94 +14846,94 @@ msgstr ""
 "Bu boyutun üstündeki iletiler tamamen indirilmeyecek. Seçtiğiniz zaman "
 "tamamen indirebilecek ya da silebileceksiniz."
 
-#: src/prefs_account.c:1750 src/prefs_account.c:2985
+#: src/prefs_account.c:1780 src/prefs_account.c:3023
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1787
 msgid "Maximum number of articles to download"
 msgstr "Azamî indirilecek yazı sayısı"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1797
 msgid "unlimited if 0 is specified"
 msgstr "0 girildiyse sonsuz"
 
-#: src/prefs_account.c:1792
+#: src/prefs_account.c:1822
 msgid "Plain text"
 msgstr "Düz metin"
 
-#: src/prefs_account.c:1806
+#: src/prefs_account.c:1839
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843
 msgid "(usually empty)"
 msgstr "(genellikle boş)"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1857
 msgid "Show subscribed folders only"
 msgstr "Sadece abone olunan dizinleri göster"
 
-#: src/prefs_account.c:1831
+#: src/prefs_account.c:1864
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "Verimli ağ kullanımı yöntemi (etiketlerin alınmasını önler)"
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1866
 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:1840 src/prefs_receive.c:164
+#: src/prefs_account.c:1873 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr "Otomatik denetle"
 
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1876
 msgid "Use global settings"
 msgstr "Genel ayarları kullan"
 
-#: src/prefs_account.c:1849 src/prefs_receive.c:171
+#: src/prefs_account.c:1882 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr "Yeni iletileri denetle"
 
-#: src/prefs_account.c:1888
+#: src/prefs_account.c:1921
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken süz"
 
-#: src/prefs_account.c:1904
+#: src/prefs_account.c:1937
 msgid "Allow filtering using plugins on receiving"
 msgstr "İletileri alırken eklenti kullanarak süzmeye izin ver"
 
-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1941
 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:1998 src/prefs_customheader.c:210
+#: src/prefs_account.c:2031 src/prefs_customheader.c:210
 #: src/prefs_matcher.c:634 src/prefs_matcher.c:2019 src/prefs_matcher.c:2047
 msgid "Header"
 msgstr "Üstbilgi"
 
-#: src/prefs_account.c:2000
+#: src/prefs_account.c:2033
 msgid "Generate Message-ID"
 msgstr "İleti-ID Oluştur"
 
-#: src/prefs_account.c:2003
+#: src/prefs_account.c:2036
 msgid "Send account mail address in Message-ID"
 msgstr "İleti-ID içinde hesap posta adresini gönder"
 
-#: src/prefs_account.c:2006
+#: src/prefs_account.c:2039
 msgid "Add user agent header"
 msgstr "Uygulama adı üstbilgisini ekle"
 
-#: src/prefs_account.c:2013
+#: src/prefs_account.c:2046
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı üstbilgi ekle"
 
-#: src/prefs_account.c:2028
+#: src/prefs_account.c:2061
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Doğrulama (SMTP AUTH)"
 
-#: src/prefs_account.c:2127
+#: src/prefs_account.c:2163
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -14912,217 +14941,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:2138
+#: src/prefs_account.c:2174
 msgid "Authenticate with POP before sending"
 msgstr "Göndermeden önce POP ile kimlik denetimi yap"
 
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2189
 msgid "POP authentication timeout"
 msgstr "POP kimlik doğrulaması zaman aşımı"
 
-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2270
 msgid "Authorization"
 msgstr "Yetkilendirme"
 
-#: src/prefs_account.c:2250
+#: src/prefs_account.c:2287
 msgid "Select OAuth2 Email Service Provider"
 msgstr "OAuth2 E-posta Servis Sunucusu Seç"
 
-#: src/prefs_account.c:2290
+#: src/prefs_account.c:2327
 msgid "Client ID"
 msgstr "İstemci ID"
 
-#: src/prefs_account.c:2296
+#: src/prefs_account.c:2333
 msgid "Client secret"
 msgstr "İstemci gizli değeri"
 
-#: src/prefs_account.c:2328
+#: src/prefs_account.c:2365
 msgid "Obtain authorization code"
 msgstr "Yetkilendirme kodunu al"
 
-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2369
 msgid "Open default browser with request"
 msgstr "İsteği öntanımlı tarayıcı ile aç"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2375
 msgid "Copy link"
 msgstr "Bağlantıyı Kopyala"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2387
 msgid "Authorization code"
 msgstr "Yetkilendirme kodu"
 
-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2395
 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:2365
+#: src/prefs_account.c:2402
 msgid "Complete authorization"
 msgstr "Yetkilendirmeyi tamamla"
 
-#: src/prefs_account.c:2369
+#: src/prefs_account.c:2406
 msgid "Authorize"
 msgstr "Yetkilendir"
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2502
+#: src/prefs_account.c:2494 src/prefs_account.c:2540
 msgid "Signature"
 msgstr "İmza"
 
-#: src/prefs_account.c:2459
+#: src/prefs_account.c:2497
 msgid "Automatically insert signature"
 msgstr "İmzayı kendiliğinden ekle"
 
-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2502
 msgid "Signature separator"
 msgstr "İmza ayracı"
 
-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2527
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2560
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri kendiliğinden ata"
 
-#: src/prefs_account.c:2574
+#: src/prefs_account.c:2612
 msgid "Spell check dictionaries"
 msgstr "İmlâ denetim sözlükleri"
 
-#: src/prefs_account.c:2584 src/prefs_folder_item.c:1176
+#: src/prefs_account.c:2622 src/prefs_folder_item.c:1176
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "Öntanımlı sözlük"
 
-#: src/prefs_account.c:2597 src/prefs_folder_item.c:1210
+#: src/prefs_account.c:2635 src/prefs_folder_item.c:1210
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "Öntanımlı diğer sözlük"
 
-#: src/prefs_account.c:2683 src/prefs_account.c:4166
+#: src/prefs_account.c:2721 src/prefs_account.c:4222
 #: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1612
 #: src/prefs_folder_item.c:1997 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "Yaz"
 
-#: src/prefs_account.c:2698 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
+#: src/prefs_account.c:2736 src/prefs_folder_item.c:1640 src/prefs_quote.c:134
 #: src/toolbar.c:500
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/prefs_account.c:2713 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2751 src/prefs_filtering_action.c:185
 #: src/prefs_folder_item.c:1668 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/prefs_account.c:2760
+#: src/prefs_account.c:2798
 msgid "Default privacy system"
 msgstr "Öntanımlı gizlilik sistemi"
 
-#: src/prefs_account.c:2789 src/prefs_folder_item.c:1250
+#: src/prefs_account.c:2827 src/prefs_folder_item.c:1250
 msgid "Always sign messages"
 msgstr "İletileri her zaman imzala"
 
-#: src/prefs_account.c:2791 src/prefs_folder_item.c:1282
+#: src/prefs_account.c:2829 src/prefs_folder_item.c:1282
 msgid "Always encrypt messages"
 msgstr "İletileri her zaman şifrele"
 
-#: src/prefs_account.c:2793
+#: src/prefs_account.c:2831
 msgid "Always sign messages when replying to a signed message"
 msgstr "İmzalı bir iletiyi yanıtlarken iletileri her zaman imzala"
 
-#: src/prefs_account.c:2796
+#: src/prefs_account.c:2834
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Şifrelenmiş bir iletiyi yanıtlarken iletileri her zaman şifrele"
 
-#: src/prefs_account.c:2799
+#: src/prefs_account.c:2837
 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:2801
+#: src/prefs_account.c:2839
 msgid "Save sent encrypted messages as clear text"
 msgstr "Şifrelenmiş iletileri metin dosyası olarak kaydet"
 
-#: src/prefs_account.c:2959 src/prefs_account.c:2974 src/prefs_account.c:2988
+#: src/prefs_account.c:2997 src/prefs_account.c:3012 src/prefs_account.c:3026
 msgid "Don't use TLS"
 msgstr "TLS kullanma"
 
-#: src/prefs_account.c:2962 src/prefs_account.c:2977 src/prefs_account.c:2997
-#: src/prefs_account.c:3008
+#: src/prefs_account.c:3000 src/prefs_account.c:3015 src/prefs_account.c:3035
+#: src/prefs_account.c:3046
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: src/prefs_account.c:2965 src/prefs_account.c:2980 src/prefs_account.c:3011
+#: src/prefs_account.c:3003 src/prefs_account.c:3018 src/prefs_account.c:3049
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "Şifreli oturumuna başlamak için STARTTLS komutunu kullan"
 
-#: src/prefs_account.c:3001
+#: src/prefs_account.c:3039
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account.c:3005
+#: src/prefs_account.c:3043
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr "TLS kullanma (fakat, gerekliyse, STARTTLS kullan)"
 
-#: src/prefs_account.c:3016
+#: src/prefs_account.c:3054
 msgid "Client certificates"
 msgstr "İstemci sertifikaları"
 
-#: src/prefs_account.c:3024
+#: src/prefs_account.c:3062
 msgid "Certificate for receiving"
 msgstr "Alım için sertifika"
 
-#: src/prefs_account.c:3029 src/prefs_account.c:3031 src/prefs_account.c:3057
-#: src/prefs_account.c:3059
+#: src/prefs_account.c:3067 src/prefs_account.c:3069 src/prefs_account.c:3095
+#: src/prefs_account.c:3097
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "PKCS12 ya da PEM olarak istemci sertifikası"
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3090
 msgid "Certificate for sending"
 msgstr "Gönderim için sertifika"
 
-#: src/prefs_account.c:3092
+#: src/prefs_account.c:3130
 msgid "Automatically accept valid TLS certificates"
 msgstr "Geçerli TLS sertifikaları doğrudan kabul et"
 
-#: src/prefs_account.c:3095
+#: src/prefs_account.c:3133
 msgid "Use non-blocking TLS"
 msgstr "Bloklanmamış TLS Kullan"
 
-#: src/prefs_account.c:3107
+#: src/prefs_account.c:3145
 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:3199 src/prefs_proxy.c:75
+#: src/prefs_account.c:3237 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr "Vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:3208
+#: src/prefs_account.c:3246
 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:3210
+#: src/prefs_account.c:3248
 msgid "Use global proxy server settings"
 msgstr "Genel vekil sunucu (proxy) ayarlarını kullan"
 
-#: src/prefs_account.c:3247 src/prefs_proxy.c:117 src/wizard.c:1119
+#: src/prefs_account.c:3285 src/prefs_proxy.c:117 src/wizard.c:1119
 msgid "Use authentication"
 msgstr "Kimlik doğrulaması kullan"
 
-#: src/prefs_account.c:3252 src/prefs_proxy.c:125
+#: src/prefs_account.c:3290 src/prefs_proxy.c:125
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account.c:3286
+#: src/prefs_account.c:3324
 msgid "Use proxy server for sending"
 msgstr "Göndermek için vekil sunucu (proxy) kullan"
 
-#: src/prefs_account.c:3288
+#: src/prefs_account.c:3326
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
@@ -15130,27 +15159,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:3400
+#: src/prefs_account.c:3438
 msgid "SMTP port"
 msgstr "SMTP portu"
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3445
 msgid "POP port"
 msgstr "POP portu"
 
-#: src/prefs_account.c:3414
+#: src/prefs_account.c:3452
 msgid "IMAP port"
 msgstr "IMAP portu"
 
-#: src/prefs_account.c:3421
+#: src/prefs_account.c:3459
 msgid "NNTP port"
 msgstr "NNTP portu"
 
-#: src/prefs_account.c:3427
+#: src/prefs_account.c:3465
 msgid "Domain name"
 msgstr "Alan adı"
 
-#: src/prefs_account.c:3430
+#: src/prefs_account.c:3468
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
@@ -15158,156 +15187,177 @@ msgstr ""
 "Alan adı, oluşturulan İleti-ID'sinde ve SMTP sunuculara bağlanırken "
 "kullanılacak."
 
-#: src/prefs_account.c:3444
+#: src/prefs_account.c:3482
 msgid "Use command to communicate with server"
 msgstr "Sunucuyla iletişim kurmak için komut kullan"
 
-#: src/prefs_account.c:3453
+#: src/prefs_account.c:3491
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mükerrer iletileri okundu olarak ve renkle işaretle:"
 
-#: src/prefs_account.c:3506
+#: src/prefs_account.c:3544
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri buraya koy"
 
-#: src/prefs_account.c:3508
+#: src/prefs_account.c:3546
 msgid "Put queued messages in"
 msgstr "Kuyruktaki iletileri buraya koy"
 
-#: src/prefs_account.c:3510
+#: src/prefs_account.c:3548
 msgid "Put draft messages in"
 msgstr "Taslak iletilerini buraya koy"
 
-#: src/prefs_account.c:3512
+#: src/prefs_account.c:3550
 msgid "Put deleted messages in"
 msgstr "Silinen iletileri buraya koy"
 
-#: src/prefs_account.c:3569
+#: src/prefs_account.c:3607
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account.c:3573
+#: src/prefs_account.c:3611
 msgid "Mail address is not entered."
 msgstr "Posta adresi girilmemiş."
 
-#: src/prefs_account.c:3581
+#: src/prefs_account.c:3619
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3586
+#: src/prefs_account.c:3624
 msgid "User ID is not entered."
 msgstr "Kullanıcı ID girilmemiş."
 
-#: src/prefs_account.c:3591
+#: src/prefs_account.c:3629
 msgid "POP server is not entered."
 msgstr "POP sunucu girilmemiş."
 
-#: src/prefs_account.c:3611
+#: src/prefs_account.c:3649
 msgid "The default Inbox folder doesn't exist."
 msgstr "Öntanımlı Gelen Kutusu yok."
 
-#: src/prefs_account.c:3617
+#: src/prefs_account.c:3655
 msgid "IMAP server is not entered."
 msgstr "IMAP sunucu girilmemiş."
 
-#: src/prefs_account.c:3622
+#: src/prefs_account.c:3660
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account.c:3628
+#: src/prefs_account.c:3666
 msgid "local mailbox filename is not entered."
 msgstr "yerel posta kutusunun adı girilmemiş."
 
-#: src/prefs_account.c:3634
+#: src/prefs_account.c:3672
 msgid "mail command is not entered."
 msgstr "mail komutu girilmemiş"
 
-#: src/prefs_account.c:3644
+#: src/prefs_account.c:3682
 msgid "User ID cannot contain a newline character."
 msgstr "Kullanıcı ID'si yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3651
+#: src/prefs_account.c:3689
 msgid "Password cannot contain a newline character."
 msgstr "Şifre yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3686
+#: src/prefs_account.c:3726
 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:3691
+#: src/prefs_account.c:3731
 msgid "SMTP password cannot contain a newline character."
 msgstr "SMTP şifresi yeni satır karakteri içeremez."
 
-#: src/prefs_account.c:3783
+#: src/prefs_account.c:3826
 msgid "domain is not specified."
 msgstr "alan aldı belirtilmedi."
 
-#: src/prefs_account.c:3788
+#: src/prefs_account.c:3831
 msgid "sent folder is not selected."
 msgstr "gönderilen dizini seçilmedi."
 
-#: src/prefs_account.c:3793
+#: src/prefs_account.c:3836
 msgid "queue folder is not selected."
 msgstr "kuyruk dizini seçilmedi."
 
-#: src/prefs_account.c:3798
+#: src/prefs_account.c:3841
 msgid "draft folder is not selected."
 msgstr "taslak dizini seçilmedi."
 
-#: src/prefs_account.c:3803
+#: src/prefs_account.c:3846
 msgid "trash folder is not selected."
 msgstr "çöp dizini seçilmedi."
 
-#: src/prefs_account.c:4112
+#: src/prefs_account.c:4166
 msgid "Receive"
-msgstr "Al"
+msgstr "Alma"
+
+#: src/prefs_account.c:4184
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr "Gönderme"
 
-#: src/prefs_account.c:4148
+#: src/prefs_account.c:4203
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: src/prefs_account.c:4184 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
+#: src/prefs_account.c:4240 src/prefs_folder_item.c:2013 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/prefs_account.c:4202
+#: src/prefs_account.c:4258
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account.c:4322
+#: src/prefs_account.c:4378
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account.c:4682
+#: src/prefs_account.c:4740
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account.c:4684
+#: src/prefs_account.c:4742
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Hesap tercihleri"
 
-#: src/prefs_account.c:4803 src/wizard.c:1389
+#: src/prefs_account.c:4861 src/wizard.c:1389
 msgid "Failed (wrong address)"
 msgstr "Başarısız oldu (yanlış adres)"
 
-#: src/prefs_account.c:4888
+#: src/prefs_account.c:4946
 msgid "Select signature file"
 msgstr "İmza dosyasını seç"
 
-#: src/prefs_account.c:4906 src/prefs_account.c:4923 src/wizard.c:1066
+#: src/prefs_account.c:4964 src/prefs_account.c:4981 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr "Sertifika dosyasını seç"
 
-#: src/prefs_account.c:5019
+#: src/prefs_account.c:5077
 msgid "Protocol:"
 msgstr "Protokol"
 
-#: src/prefs_account.c:5336
+#: src/prefs_account.c:5418
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (eklenti yüklü değil)"
 
+#: src/prefs_account.c:6277
+msgid "Authorisation complete"
+msgstr "Yetkilendirme tamamlandı"
+
+#: src/prefs_account.c:6278
+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:6281
+msgid "Authorisation NOT completed"
+msgstr "Yetkilendirme tamamlanmadı"
+
+#: src/prefs_account.c:6282
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr "OAuth2 yetkilendirme kodunuz Claws Mail tarafından alınmadı"
+
 #: src/prefs_actions.c:227
 msgid "Actions configuration"
 msgstr "Eylem ayarları"
@@ -15435,15 +15485,15 @@ msgid "Entry not saved"
 msgstr "Girdi kaydedilmesi"
 
 #: src/prefs_actions.c:921 src/prefs_actions.c:952 src/prefs_filtering.c:1509
-#: src/prefs_filtering.c:1531 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_filtering.c:1531 src/prefs_matcher.c:2171 src/prefs_template.c:573
+#: src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "Girdi kaydedilmesi. Yine de kapat?"
 
 #: src/prefs_actions.c:922 src/prefs_actions.c:927 src/prefs_actions.c:953
-#: src/prefs_actions.c:1324 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1510 src/prefs_filtering.c:1532
-#: src/prefs_matcher.c:2173 src/prefs_template.c:574 src/prefs_template.c:599
-#: src/prefs_template.c:604
+#: src/prefs_filtering.c:1486 src/prefs_filtering.c:1510
+#: src/prefs_filtering.c:1532 src/prefs_matcher.c:2173 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "_Düzenlemeye devam et"
 
@@ -15586,8 +15636,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"
@@ -15641,8 +15691,8 @@ msgid "Warn when inserting a file larger than"
 msgstr "şu boyuttan büyük dosya eklerken uyar"
 
 #: src/prefs_compose_writing.c:208
-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:214
 msgid "Replying"
@@ -15699,64 +15749,68 @@ msgid "Header name is not set."
 msgstr "Üstbilgi adı atanmadı."
 
 #: src/prefs_customheader.c:514
+msgid "A colon (:) is not allowed in a custom header."
+msgstr "İki nokta üst üste (:) üstbilgide kullanılamaz."
+
+#: src/prefs_customheader.c:519
 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:561
+#: src/prefs_customheader.c:566
 msgid "Choose a PNG file"
 msgstr "Bir PNG dosyası seç"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:568
 msgid "Choose an XBM file"
 msgstr "Bir XBM dosyası seç"
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:570
 msgid "Choose a text file"
 msgstr "Bir metin dosyası seç"
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:583
 msgid "This file isn't an image."
 msgstr "Bu dosya bir görüntü değil."
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:588
 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:589
+#: src/prefs_customheader.c:594
 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:594
+#: src/prefs_customheader.c:599
 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:603
+#: src/prefs_customheader.c:608
 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:612
+#: src/prefs_customheader.c:617
 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:618
+#: src/prefs_customheader.c:623
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface hatası: %s"
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:676
 msgid "This file contains newlines."
 msgstr "Bu dosya yeni satırlar içeriyor."
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:706
 msgid "Delete header"
 msgstr "Üstbilgiyi sil"
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:707
 msgid "Do you really want to delete this header?"
 msgstr "Bu üstbilgiyi silmek istiyor musunuz?"
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:880
 msgid "Current custom headers"
 msgstr "Mevcut kişisel üstbilgiler:"
 
@@ -16889,14 +16943,6 @@ msgstr "tür"
 msgid "Program returns"
 msgstr "Uygulama cevap veriyor"
 
-#: src/prefs_matcher.c:2171
-msgid ""
-"The entry was not saved.\n"
-"Close anyway?"
-msgstr ""
-"Girdi kaydedilmedi.\n"
-"Yine de kapatılsın mı?"
-
 #: src/prefs_matcher.c:2239
 msgid "Match Type: 'Test'"
 msgstr "Tür Eşleştir: 'Test'"
@@ -17160,8 +17206,8 @@ msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Hedef dizin için renk seçin. 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:362
 msgid "Target folder"
@@ -17194,52 +17240,52 @@ msgstr "'color %d' için etiket seçin"
 #: src/prefs_msg_colors.c:529
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
-msgstr "1. seviye metin için renk seçin"
+msgstr "1. seviye metni için renk seç"
 
 #: src/prefs_msg_colors.c:531
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
-msgstr "2. seviye metin için renk seçin"
+msgstr "2. seviye metni için renk seç"
 
 #: src/prefs_msg_colors.c:533
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
-msgstr "3. seviye metin için renk seçin"
+msgstr "3. seviye metni için renk seç"
 
 #: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
-msgstr "1. seviye metnin arka planı için renk seçin"
+msgstr "1. seviye metnin arka planı için renk seç"
 
 #: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
-msgstr "2. seviye metnin arka planı için renk seçin"
+msgstr "2. seviye metnin arka planı için renk seç"
 
 #: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
-msgstr "3. seviye metnin arka planı için renk seçin"
+msgstr "3. seviye metnin arka planı için renk seç"
 
 #: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
 msgid "Pick color for links"
-msgstr "Bağlantılar için renk seçin"
+msgstr "Bağlantılar için renk seç"
 
 #: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
-msgstr "Hedef dizin için renk seçin"
+msgstr "Hedef dizin için renk seç"
 
 #: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
-msgstr "İmzalar için renk seçin"
+msgstr "İmzalar için renk seç"
 
 #: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for folder"
-msgstr "Dizin için renk seçin"
+msgstr "Dizin için renk seç"
 
 #: src/prefs_msg_colors.c:549
 msgctxt "Dialog title"
@@ -17274,15 +17320,15 @@ msgstr "Mevcut klavye kısayollarını seçin"
 
 #: src/prefs_other.c:124
 msgid "Select preset:"
-msgstr "Ön ayarı seç:"
+msgstr "Öntanımlıyı seç:"
 
 #: 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 ""
-"Her bir menü kısayolunu fare işaretçisiyle üzerindeyken\n"
-"herhangi bir tuşa basarak değiştirebilirsiniz."
+"Ayrıca, fare işaretçisini öğeye odaklarken herhangi\n"
+"bir tuşa basarak her menü kısayolunu değiştirebilirsiniz."
 
 #: src/prefs_other.c:497
 msgid "Add address to destination when double-clicked"
@@ -17314,7 +17360,7 @@ msgstr "Klavye kısayollarını aç"
 
 #: src/prefs_other.c:521
 msgid "Enable customisable keyboard shortcuts"
-msgstr "İsteğe göre uyarlanabilen klavye kısayollarını aç"
+msgstr "Değiştirilebilir klavye kısayollarını aç"
 
 #: src/prefs_other.c:524
 msgid ""
@@ -17322,9 +17368,9 @@ msgid ""
 "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 ""
-"Seçildiğinde, menü ögesine odaklanıp bir tuş terkibine basarak menü "
-"ögelerinin çoğunun klavye kısayollarını değiştirebilirsiniz.\n"
-"Var olan klavye kısayollarının değişmemesini istiyorsanız, seçimi kaldırın."
+"Seçilirse, menü öğesine odaklanarak ve bir tuş kombinasyonuna basarak "
+"menü öğelerinin çoğunun klavye kısayolunu değiştirebilirsiniz.\n"
+"Mevcut tüm klavye kısayollarını kilitlemek istiyorsanız işareti kaldırın."
 
 #: src/prefs_other.c:531
 msgid " Choose preset keyboard shortcuts... "
@@ -17664,8 +17710,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:420 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:420 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr "Gönderme"
 
@@ -18381,7 +18427,7 @@ msgstr "Simge"
 
 #: src/prefs_toolbar.c:1011
 msgid "A_dd"
-msgstr "E_kle"
+msgstr "Ek_le"
 
 #: src/prefs_toolbar.c:1231 src/prefs_toolbar.c:1245 src/prefs_toolbar.c:1259
 msgid "Toolbars"
@@ -18842,88 +18888,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"
@@ -19379,7 +19425,7 @@ msgstr "Şifrelenmiş"
 msgid "Has attachment(s)"
 msgstr "Eklentisi olan"
 
-#: src/summaryview.c:8321
+#: src/summaryview.c:8325
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -19388,11 +19434,11 @@ msgstr ""
 "Düzenli ifade (regexp) hatası:\n"
 "%s"
 
-#: src/summaryview.c:8424
+#: src/summaryview.c:8428
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "Dizin listesine geri dön (Okunmamış iletileriniz var)"
 
-#: src/summaryview.c:8429
+#: src/summaryview.c:8433
 msgid "Go back to the folder list"
 msgstr "Dizin listesine geri dön"
 
@@ -20237,3 +20283,67 @@ msgid ""
 msgstr ""
 "Claws Mail hizmete hazır.\n"
 "Başlamak için Kaydet tuşuna basın."
+
+#~ msgid "_New"
+#~ msgstr "_Yeni"
+
+#~ msgid "_Down"
+#~ msgstr "_Aşağı"
+
+#~ msgid "_Up"
+#~ msgstr "_Yukarı"
+
+#~ msgid "_Execute"
+#~ msgstr "Ç_alıştır"
+
+#~ msgid "_Stop"
+#~ msgstr "_Dur"
+
+#~ msgid "_Yes"
+#~ msgstr "_Evet"
+
+#~ msgid "_Add"
+#~ msgstr "_Ekle"
+
+#~ msgid "_Previous"
+#~ msgstr "Ö_nceki"
+
+#~ msgid "_Next"
+#~ msgstr "_Sonraki"
+
+#~ msgid "_Refresh"
+#~ msgstr "_Yenile"
+
+#~ msgid "_Apply"
+#~ msgstr "_Uygula"
+
+#~ msgid "_Quit"
+#~ msgstr "Çı_k"
+
+#~ msgid "Find and _Replace"
+#~ msgstr "Bul ve _Değiştir"
+
+#~ msgid "_Rename"
+#~ msgstr "_Yeniden adlandır"
+
+#~ msgid "_Top"
+#~ msgstr "_En üst"
+
+#~ msgid "_Bottom"
+#~ msgstr "En alt"
+
+#~ msgid ""
+#~ "The entry was not saved.\n"
+#~ "Close anyway?"
+#~ msgstr ""
+#~ "Girdi kaydedilmedi.\n"
+#~ "Yine de kapatılsın mı?"
+
+#~ msgid "Select preset keyboard shortcuts:"
+#~ msgstr "Mevcut klavye kısayollarını seçin:"
+
+#~ msgid "Open in browser"
+#~ msgstr "Tarayıcıda Aç"
+
+#~ msgid "File:"
+#~ msgstr "Dosya:"

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list